From fc7227dde96f99af327026598362130c6e4d4a08 Mon Sep 17 00:00:00 2001 From: Jeff Klukas Date: Mon, 21 May 2012 12:12:30 -0500 Subject: [PATCH 1/6] fancyhdr conditional on memoir --- sphinx/texinputs/sphinx.sty | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty index 08adec9e8..2deb1c8a0 100644 --- a/sphinx/texinputs/sphinx.sty +++ b/sphinx/texinputs/sphinx.sty @@ -8,8 +8,9 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{sphinx}[2010/01/15 LaTeX package (Sphinx markup)] +\@ifclassloaded{memoir}{}{\RequirePackage{fancyhdr}} + \RequirePackage{textcomp} -\RequirePackage{fancyhdr} \RequirePackage{fancybox} \RequirePackage{titlesec} \RequirePackage{tabulary} From 4f08d04800a58efc4962612222dc993c0f048859 Mon Sep 17 00:00:00 2001 From: Jeff Klukas Date: Mon, 21 May 2012 15:31:40 -0500 Subject: [PATCH 2/6] Added extraclassoptions to latex_elements --- sphinx/writers/latex.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py index e5ef3a619..4281b6545 100644 --- a/sphinx/writers/latex.py +++ b/sphinx/writers/latex.py @@ -134,6 +134,7 @@ class LaTeXTranslator(nodes.NodeVisitor): 'papersize': 'letterpaper', 'pointsize': '10pt', 'classoptions': '', + 'extraclassoptions': '', 'inputenc': '\\usepackage[utf8]{inputenc}', 'utf8extra': '\\DeclareUnicodeCharacter{00A0}{\\nobreakspace}', 'fontenc': '\\usepackage[T1]{fontenc}', @@ -214,8 +215,11 @@ class LaTeXTranslator(nodes.NodeVisitor): r'\AtBeginDvi{\special{pdf:tounicode EUC-UCS2}}' else: self.elements['classoptions'] += ',english' + print self.elements # allow the user to override them all self.elements.update(builder.config.latex_elements) + if self.elements['extraclassoptions']: + self.elements['classoptions'] += ',' + self.elements['extraclassoptions'] self.highlighter = highlighting.PygmentsBridge('latex', builder.config.pygments_style, builder.config.trim_doctest_flags) From 230bdbc21a2c48aa71c11039667d71e4e672fad6 Mon Sep 17 00:00:00 2001 From: Jeff Klukas Date: Tue, 22 May 2012 11:11:52 -0500 Subject: [PATCH 3/6] Added \noindent calls to prevent weird spacing of admonitions --- sphinx/texinputs/sphinx.sty | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty index 2deb1c8a0..b8697fdb5 100644 --- a/sphinx/texinputs/sphinx.sty +++ b/sphinx/texinputs/sphinx.sty @@ -244,7 +244,7 @@ \addtolength{\py@noticelength}{-2\fboxsep} \addtolength{\py@noticelength}{-2\fboxrule} %\setlength{\shadowsize}{3pt} - \Sbox + \noindent\Sbox \minipage{\py@noticelength} } \newcommand{\py@endheavybox}{ @@ -255,12 +255,12 @@ \newcommand{\py@lightbox}{{% \setlength\parskip{0pt}\par - \rule[0ex]{\linewidth}{0.5pt}% - \par\vspace{-0.5ex}% + \noindent\rule[0ex]{\linewidth}{0.5pt}% + \par\noindent\vspace{-0.5ex}% }} \newcommand{\py@endlightbox}{{% \setlength{\parskip}{0pt}% - \par\rule[0.5ex]{\linewidth}{0.5pt}% + \par\noindent\rule[0.5ex]{\linewidth}{0.5pt}% \par\vspace{-0.5ex}% }} From 840183b53909c677bb122ae7ab7bfe3a31cd0c8e Mon Sep 17 00:00:00 2001 From: Jeff Klukas Date: Fri, 1 Jun 2012 09:19:14 -0500 Subject: [PATCH 4/6] Fixed bug that caused sphinxmanual.cls to reset the pagestyle at the ToC --- sphinx/texinputs/sphinxmanual.cls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sphinx/texinputs/sphinxmanual.cls b/sphinx/texinputs/sphinxmanual.cls index 57fad1a96..efb50381e 100644 --- a/sphinx/texinputs/sphinxmanual.cls +++ b/sphinx/texinputs/sphinxmanual.cls @@ -99,7 +99,7 @@ \renewcommand{\tableofcontents}{% \setcounter{page}{1}% \pagebreak% - \pagestyle{plain}% + \thispagestyle{plain}% {% \parskip = 0mm% \py@OldTableofcontents% From 788775f07204831707127648916fa43664c2a915 Mon Sep 17 00:00:00 2001 From: Jeff Klukas Date: Sun, 10 Feb 2013 18:37:28 -0600 Subject: [PATCH 5/6] Added configuration option for how transitions are handled in latex --- sphinx/writers/latex.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py index 6471a61a1..c5255831c 100644 --- a/sphinx/writers/latex.py +++ b/sphinx/writers/latex.py @@ -156,6 +156,7 @@ class LaTeXTranslator(nodes.NodeVisitor): 'tableofcontents': '\\tableofcontents', 'footer': '', 'printindex': '\\printindex', + 'transition': '\n\n\\bigskip\\hrule{}\\bigskip\n\n', } def __init__(self, document, builder): @@ -446,7 +447,7 @@ class LaTeXTranslator(nodes.NodeVisitor): self.body.append('}\n') def visit_transition(self, node): - self.body.append('\n\n\\bigskip\\hrule{}\\bigskip\n\n') + self.body.append(self.elements['transition']) def depart_transition(self, node): pass From 17b6e16789e29654b4c8658e342c6c8001bc2f1a Mon Sep 17 00:00:00 2001 From: Jeff Klukas Date: Sun, 10 Feb 2013 19:47:00 -0600 Subject: [PATCH 6/6] Reverting inadvertent changes --- sphinx/texinputs/sphinxmanual.cls | 2 +- sphinx/writers/latex.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sphinx/texinputs/sphinxmanual.cls b/sphinx/texinputs/sphinxmanual.cls index da76a77a1..a04cea5ba 100644 --- a/sphinx/texinputs/sphinxmanual.cls +++ b/sphinx/texinputs/sphinxmanual.cls @@ -99,7 +99,7 @@ \renewcommand{\tableofcontents}{% \setcounter{page}{1}% \pagebreak% - \thispagestyle{plain}% + \pagestyle{plain}% {% \parskip = 0mm% \py@OldTableofcontents% diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py index c5255831c..9358ad128 100644 --- a/sphinx/writers/latex.py +++ b/sphinx/writers/latex.py @@ -216,7 +216,6 @@ class LaTeXTranslator(nodes.NodeVisitor): self.elements['fncychap'] = '' else: self.elements['classoptions'] += ',english' - print self.elements # allow the user to override them all self.elements.update(builder.config.latex_elements) if self.elements['extraclassoptions']: