merge with 0.6

CHANGES

@@ -135,6 +135,9 @@ Release 1.0 (in development)
 Release 0.6.6 (in development)
 ==============================
 
+* #404: Make ``\and`` work properly in the author field of the
+  ``latex_documents`` setting.
+
 * #409: Make the ``highlight_language`` config value work properly
   in the LaTeX builder.
 

sphinx/texinputs/sphinxhowto.cls

@@ -33,10 +33,11 @@
   \rule{\textwidth}{1pt}
   \ifsphinxpdfoutput
     \begingroup
-    % This \def is required to deal with multi-line authors; it
+    % 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)
@@ -48,7 +49,10 @@
     {\rm\Huge\py@HeaderFamily \@title} \par
     {\em\large\py@HeaderFamily \py@release\releaseinfo} \par
     \vspace{25pt}
-    {\Large\py@HeaderFamily \@author} \par
+    {\Large\py@HeaderFamily
+      \begin{tabular}[t]{c}
+        \@author
+      \end{tabular}} \par
     \vspace{25pt}
     \@date \par
     \py@authoraddress \par

sphinx/texinputs/sphinxmanual.cls

@@ -40,10 +40,11 @@
     \rule{\textwidth}{1pt}%
     \ifsphinxpdfoutput
       \begingroup
-      % This \def is required to deal with multi-line authors; it
+      % 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)
@@ -55,7 +56,11 @@
       {\rm\Huge\py@HeaderFamily \@title \par}%
       {\em\LARGE\py@HeaderFamily \py@release\releaseinfo \par}
       \vfill
-      {\LARGE\py@HeaderFamily \@author \par}
+      {\LARGE\py@HeaderFamily
+        \begin{tabular}[t]{c}
+          \@author
+        \end{tabular}
+        \par}
       \vfill\vfill
       {\large
        \@date \par

tests/root/conf.py

@@ -43,7 +43,7 @@ htmlhelp_basename = 'SphinxTestsdoc'
 
 latex_documents = [
   ('contents', 'SphinxTests.tex', 'Sphinx Tests Documentation',
-   'Georg Brandl', 'manual'),
+   'Georg Brandl \\and someone else', 'manual'),
 ]
 
 latex_additional_files = ['svgimg.svg']