From 12096b3b863f40d10fce94e03abc4b8d3f856eb1 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Mon, 19 Dec 2016 11:34:41 +0900 Subject: [PATCH 1/2] Fix #3261: ``latex_use_parts`` makes sphinx crash --- CHANGES | 1 + sphinx/builders/latex.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 9040bc33d..c24b83655 100644 --- a/CHANGES +++ b/CHANGES @@ -16,6 +16,7 @@ Bugs fixed * #185: References to section title including raw node has broken * #3255: In Py3.4 environment, autodoc doesn't support documentation for attributes of Enum class correctly. +* #3261: ``latex_use_parts`` makes sphinx crash Release 1.5.1 (released Dec 13, 2016) ===================================== diff --git a/sphinx/builders/latex.py b/sphinx/builders/latex.py index 7bd43a84c..4e86ef19f 100644 --- a/sphinx/builders/latex.py +++ b/sphinx/builders/latex.py @@ -230,7 +230,7 @@ def validate_config_values(app): app.warn('latex_use_parts conflicts with latex_toplevel_sectioning, ignored.') else: app.warn('latex_use_parts is deprecated. Use latex_toplevel_sectioning instead.') - app.config.latex_toplevel_sectioning = 'parts' + app.config.latex_toplevel_sectioning = 'part' if app.config.latex_use_modindex is not True: # changed by user app.warn('latex_use_modindex is deprecated. Use latex_domain_indices instead.') From 07633a5a712a3b06c21ef35c341a606ad9b96d47 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Tue, 20 Dec 2016 18:44:33 +0900 Subject: [PATCH 2/2] Fix the warning type ``misc.highlighting_failure`` does not work --- CHANGES | 1 + sphinx/highlighting.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index c24b83655..7cc7cd809 100644 --- a/CHANGES +++ b/CHANGES @@ -17,6 +17,7 @@ Bugs fixed * #3255: In Py3.4 environment, autodoc doesn't support documentation for attributes of Enum class correctly. * #3261: ``latex_use_parts`` makes sphinx crash +* The warning type ``misc.highlighting_failure`` does not work Release 1.5.1 (released Dec 13, 2016) ===================================== diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py index 4b4ba87da..198939197 100644 --- a/sphinx/highlighting.py +++ b/sphinx/highlighting.py @@ -144,7 +144,7 @@ class PygmentsBridge(object): elif warn: warn('Could not lex literal_block as "%s". ' 'Highlighting skipped.' % lang, - type='misc', subtype='higlighting_failure') + type='misc', subtype='highlighting_failure') else: raise exc hlsource = highlight(source, lexers['none'], formatter)