>From b7792069f1c2f7c86bc8767d9e26b4f7345c2685 Mon Sep 17 00:00:00 2001
From: Rasmus <address@hidden>
Date: Thu, 2 Jun 2016 11:45:49 +0200
Subject: [PATCH 2/2] ox-beamer: Add short titlepage properties

* lisp/ox-beamer.el: Add #+short_{title,subtitle,author,date,institute}
  and #+institute and the :titlegraphic option.
---
 lisp/ox-beamer.el | 81 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 68 insertions(+), 13 deletions(-)

diff --git a/lisp/ox-beamer.el b/lisp/ox-beamer.el
index 4ac91d0..ce19d4d 100644
--- a/lisp/ox-beamer.el
+++ b/lisp/ox-beamer.el
@@ -240,6 +240,12 @@ Return overlay specification, as a string, or nil."
     (:beamer-inner-theme "BEAMER_INNER_THEME" nil nil t)
     (:beamer-outer-theme "BEAMER_OUTER_THEME" nil nil t)
     (:beamer-header "BEAMER_HEADER" nil nil newline)
+    (:beamer-short-title "SHORT_TITLE" nil nil parse)
+    (:beamer-short-subtitle "SHORT_SUBTITLE" nil nil parse)
+    (:beamer-short-author "SHORT_AUTHOR" nil nil parse)
+    (:beamer-short-date "SHORT_DATE" nil nil parse)
+    (:beamer-institute "INSTITUTE" nil nil parse)
+    (:beamer-short-institute "SHORT_INSTITUTE" nil nil parse)
     (:beamer-environments-extra nil nil org-beamer-environments-extra)
     (:beamer-frame-default-options nil nil org-beamer-frame-default-options)
     (:beamer-outline-frame-options nil nil org-beamer-outline-frame-options)
@@ -751,7 +757,12 @@ used as a communication channel."
 			    ref
 			    contents))))))))
      ;; Otherwise, use `latex' back-end.
-     (t (org-export-with-backend 'latex link contents info)))))
+     (t (cond ((and (org-export-inline-image-p link)
+		    (plist-get (org-export-read-attribute
+				:attr_beamer (org-export-get-parent-element link))
+			       :titlegraphic))
+	       "")
+	      (t (org-export-with-backend 'latex link contents info)))))))
 
 
 ;;;; Plain List
@@ -855,21 +866,65 @@ holding export options."
        (when (integerp sec-num)
 	 (format "\\setcounter{secnumdepth}{%d}\n" sec-num)))
      ;; Author.
-     (let ((author (and (plist-get info :with-author)
-			(let ((auth (plist-get info :author)))
-			  (and auth (org-export-data auth info)))))
-	   (email (and (plist-get info :with-email)
-		       (org-export-data (plist-get info :email) info))))
+     (let* ((author (and (plist-get info :with-author)
+			 (let ((auth (plist-get info :author)))
+			   (and auth (org-export-data auth info)))))
+	    (short-author (and author (plist-get info :short-author)))
+	    (email (and (plist-get info :with-email)
+			(org-export-data (plist-get info :email) info)))
+	    )
        (cond ((and author email (not (string= "" email)))
-	      (format "\\author{%s\\thanks{%s}}\n" author email))
-	     ((or author email) (format "\\author{%s}\n" (or author email)))))
+	      (format "\\author%s{%s\\thanks{%s}}\n"
+		      (if short-author
+			  (format "[%s]" (org-export-data short-author info)) "")
+		      author email))
+	     ((or author email) (format "\\author%s{%s}\n"
+					(if short-author
+					    (format "[%s]" (org-export-data short-author info)) "")
+					(or author email)))))
      ;; Date.
-     (let ((date (and (plist-get info :with-date) (org-export-get-date info))))
-       (format "\\date{%s}\n" (org-export-data date info)))
-     ;; Title
-     (format "\\title{%s}\n" title)
+     (let* ((date (and (plist-get info :with-date) (org-export-get-date info)))
+	    ;; TODO: add optional argument of ‘org-export-get-date’.
+	    (short-date (and date (org-export-data
+				   (org-export-get-date
+				    (plist-put info :date
+					       (plist-get info :beamer-short-date)))
+				   info))))
+       (format "\\date%s{%s}\n" (if (org-string-nw-p short-date)
+				    (format "[%s]" short-date) "")
+	       (org-export-data date info)))
+     ;; Title.
+     (let ((short-title (and title
+			     (plist-get info :beamer-short-title))))
+       (format "\\title%s{%s}\n"
+	       (if short-title (format "[%s]" (org-export-data short-title info)) "")
+	       title))
+     ;; Subtitle.
      (when (org-string-nw-p subtitle)
-       (concat (format (plist-get info :beamer-subtitle-format) subtitle) "\n"))
+       (let ((short-subtitle (plist-get info :beamer-short-subtitle)))
+	 (format "\\subtitle%s{%s}\n"
+		 (if short-subtitle (format "[%s]" (org-export-data short-subtitle info)) "")
+		 subtitle)))
+     ;; Institute.
+     (let ((institute (plist-get info :beamer-institute))
+	   (short-institute (plist-get info :beamer-short-institute)))
+       (when institute
+	 (format "\\institute%s{%s}\n"
+		 (if short-institute (format "[%s]" (org-export-data short-institute info)) "")
+		 (org-export-data institute info))))
+     ;; Titlegraphics.
+     (let ((titlegraphic-link
+	    (org-element-map (plist-get info :parse-tree) 'link
+	      (lambda (link)
+		(when (and (org-export-inline-image-p link)
+			   (plist-get (org-export-read-attribute
+				       :attr_beamer (org-export-get-parent-element link))
+				      :titlegraphic))
+		  link))
+	      info t)))
+       (when titlegraphic-link
+	 (format "\\titlegraphic{%s}\n"
+		 (org-trim (org-latex--inline-image titlegraphic-link info)))))
      ;; Beamer-header
      (let ((beamer-header (plist-get info :beamer-header)))
        (when beamer-header
-- 
2.8.3