Use hyperref to set up the PDF information dictionary (fixes sphinx-doc#3551)

jfbu · jfbu · commit a8627ac01c9d · 2017-03-24T09:16:14.000+01:00
diff --git a/CHANGES b/CHANGES
@@ -109,6 +109,7 @@ Bugs fixed
 * #2693: Sphinx latex style file wrongly inhibits colours for section headings
   for latex+dvi(ps,pdf,pdfmx)
 * C++, properly look up ``any`` references.
+* #3551: PDF information dictionary is lacking author and title data
 
 Deprecated
 ----------
diff --git a/sphinx/texinputs/sphinxhowto.cls b/sphinx/texinputs/sphinxhowto.cls
@@ -31,13 +31,11 @@
 %
 \renewcommand{\maketitle}{%
   \noindent\rule{\textwidth}{1pt}\par
-  % FIXME: use \hypersetup{pdfauthor={\@author}, pdftitle={\@title}}
-  \ifdefined\pdfinfo
-    \begingroup
-     %\pdfstringdefDisableCommands{\def\\{, }\def\endgraf{ }\def\and{, }}%
-     %\hypersetup{pdfauthor={\@author}, pdftitle={\@title}}%
+    \begingroup % for PDF information dictionary
+       \def\endgraf{ }\def\and{\& }%
+       \pdfstringdefDisableCommands{\def\\{, }}% overwrite hyperref setup
+       \hypersetup{pdfauthor={\@author}, pdftitle={\@title}}%
     \endgroup
-  \fi
   \begin{flushright}
     \sphinxlogo
     \py@HeaderFamily
diff --git a/sphinx/texinputs/sphinxmanual.cls b/sphinx/texinputs/sphinxmanual.cls
@@ -41,13 +41,11 @@
     \let\footnotesize\small
     \let\footnoterule\relax
     \noindent\rule{\textwidth}{1pt}\par
-    % FIXME: use \hypersetup{pdfauthor={\@author}, pdftitle={\@title}}
-    \ifdefined\pdfinfo
-      \begingroup
-       %\pdfstringdefDisableCommands{\def\\{, }\def\endgraf{ }\def\and{, }}%
-       %\hypersetup{pdfauthor={\@author}, pdftitle={\@title}}%
+      \begingroup % for PDF information dictionary
+       \def\endgraf{ }\def\and{\& }%
+       \pdfstringdefDisableCommands{\def\\{, }}% overwrite hyperref setup
+       \hypersetup{pdfauthor={\@author}, pdftitle={\@title}}%
       \endgroup
-    \fi
     \begin{flushright}%
       \sphinxlogo
       \py@HeaderFamily
