From 673d545016023fe68658c2f6063d1718290d735f Mon Sep 17 00:00:00 2001
From: Andrew Dunning <adunning@users.noreply.github.com>
Date: Wed, 23 Jan 2019 13:31:26 -0500
Subject: [PATCH] LaTeX template: Restrict `institute` to Beamer (#5219)

The `\institute` command is only standard in the Beamer class.
Use a conditional to restrict this to Beamer output rather than
output an empty command. To add this information to a LaTeX
class providing an `\institute` command, use `header-includes`.
---
 MANUAL.txt                   | 8 ++++----
 data/templates/default.latex | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/MANUAL.txt b/MANUAL.txt
index ca2c5ea7f797..3823f3eb6e34 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -1370,10 +1370,6 @@ depending on the output format, but include the following:
 `subtitle`
 :   document subtitle, included in HTML, EPUB, LaTeX, ConTeXt, and Word docx
 
-`institute`
-:   author affiliations (in LaTeX and Beamer only).  Can be a
-    list, when there are multiple authors.
-
 `abstract`
 :   document summary, included in LaTeX, ConTeXt, AsciiDoc, and Word docx
 
@@ -1453,6 +1449,10 @@ including all [reveal.js configuration options].
 `logo`
 :   logo for Beamer documents
 
+`institute`
+:   author affiliations in Beamer.  Can be a
+    list when there are multiple authors.
+
 `slidy-url`
 :   base URL for Slidy documents (defaults to
     `https://www.w3.org/Talks/Tools/Slidy2`)
diff --git a/data/templates/default.latex b/data/templates/default.latex
index f37af0a2ad70..519effca91ba 100644
--- a/data/templates/default.latex
+++ b/data/templates/default.latex
@@ -364,12 +364,11 @@ $endif$
 $if(author)$
 \author{$for(author)$$author$$sep$ \and $endfor$}
 $endif$
+\date{$date$}
+$if(beamer)$
 $if(institute)$
-\providecommand{\institute}[1]{}
 \institute{$for(institute)$$institute$$sep$ \and $endfor$}
 $endif$
-\date{$date$}
-$if(beamer)$
 $if(titlegraphic)$
 \titlegraphic{\includegraphics{$titlegraphic$}}
 $endif$