diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | doc/conf.py | 2 | ||||
| -rw-r--r-- | sphinx/texinputs/sphinxhowto.cls | 11 | ||||
| -rw-r--r-- | sphinx/texinputs/sphinxmanual.cls | 11 |
4 files changed, 7 insertions, 19 deletions
@@ -176,6 +176,8 @@ Bugs fixed * #3575: Problems with pdflatex in a Turkish document built with sphinx has reappeared (refs #2997, #2397) * #3577: Fix intersphinx debug tool +* A LaTeX command such as ``\\large`` inserted in the title items of + :confval:`latex_documents` causes failed PDF build (refs #3551, #3567) Testing -------- diff --git a/doc/conf.py b/doc/conf.py index d52b996dd..1a5be5736 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -4,7 +4,7 @@ import re import sphinx -language = 'ja' + extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo', 'sphinx.ext.autosummary', 'sphinx.ext.extlinks', diff --git a/sphinx/texinputs/sphinxhowto.cls b/sphinx/texinputs/sphinxhowto.cls index cf776534a..f4526c9d3 100644 --- a/sphinx/texinputs/sphinxhowto.cls +++ b/sphinx/texinputs/sphinxhowto.cls @@ -34,15 +34,8 @@ % FIXME: use \hypersetup{pdfauthor={\@author}, pdftitle={\@title}} \ifdefined\pdfinfo \begingroup - % These \defs are required to deal with multi-line authors; it - % changes \\ to ', ' (comma-space), making it pass muster for - % generating document info in the PDF file. - \def\\{, }% - \def\and{and }% - \pdfinfo{ - /Author (\@author) - /Title (\@title) - }% + %\pdfstringdefDisableCommands{\def\\{, }\def\endgraf{ }\def\and{, }}% + %\hypersetup{pdfauthor={\@author}, pdftitle={\@title}}% \endgroup \fi \begin{flushright} diff --git a/sphinx/texinputs/sphinxmanual.cls b/sphinx/texinputs/sphinxmanual.cls index b201d4a99..99b6f8309 100644 --- a/sphinx/texinputs/sphinxmanual.cls +++ b/sphinx/texinputs/sphinxmanual.cls @@ -44,15 +44,8 @@ % FIXME: use \hypersetup{pdfauthor={\@author}, pdftitle={\@title}} \ifdefined\pdfinfo \begingroup - % These \defs are required to deal with multi-line authors; it - % changes \\ to ', ' (comma-space), making it pass muster for - % generating document info in the PDF file. - \def\\{, }% - \def\and{and }% - \pdfinfo{ - /Author (\@author) - /Title (\@title) - }% + %\pdfstringdefDisableCommands{\def\\{, }\def\endgraf{ }\def\and{, }}% + %\hypersetup{pdfauthor={\@author}, pdftitle={\@title}}% \endgroup \fi \begin{flushright}% |