From ed84216741b490aa73b336721b8357909049004f Mon Sep 17 00:00:00 2001
From: ULRIK LYNGS <ulrik.lyngs@cs.ox.ac.uk>
Date: Fri, 25 Jan 2019 12:29:09 +0100
Subject: [PATCH] allow orcid and additional affiliations and tweak meta data
 naming

---
 .../skeleton/chi_ea_template_v1.56_Rmd.tex    | 51 +++++++++++--------
 .../templates/chi_ea/skeleton/skeleton.Rmd    | 14 ++---
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/inst/rmarkdown/templates/chi_ea/skeleton/chi_ea_template_v1.56_Rmd.tex b/inst/rmarkdown/templates/chi_ea/skeleton/chi_ea_template_v1.56_Rmd.tex
index 6738852..cca2fde 100755
--- a/inst/rmarkdown/templates/chi_ea/skeleton/chi_ea_template_v1.56_Rmd.tex
+++ b/inst/rmarkdown/templates/chi_ea/skeleton/chi_ea_template_v1.56_Rmd.tex
@@ -17,22 +17,13 @@
 $endif$
 
 % Copyright
-\setcopyright{$copyright$}
-%\setcopyright{none}
-%\setcopyright{acmcopyright}
-%\setcopyright{acmlicensed}
-%\setcopyright{rightsretained}
-%\setcopyright{usgov}
-%\setcopyright{usgovmixed}
-%\setcopyright{cagov}
-%\setcopyright{cagovmixed}
-
+\setcopyright{$setcopyright$}
 
 % DOI
-\acmDOI{$DOI$}
+\acmDOI{$acmDOI$}
 
 % ISBN
-\acmISBN{$ISBN$}
+\acmISBN{$acmISBN$}
 
 %Conference
 \acmConference[$conference-short$]{$conference$}{$conference-date$}{$conference-location$}
@@ -49,16 +40,32 @@
 \title[$short-title$]{$title$}
 
 $for(author)$
-  \author{$author.name$}
-  \affiliation{
-    \position{$author.affiliation.position$}
-    \institution{$author.affiliation.institution$}
-    \city{$author.affiliation.city$}
-    \state{$author.affiliation.state$}
-    \country{$author.affiliation.country$}
-    \postcode{$author.affiliation.postcode$}
-  }
-  \email{$author.email$}
+\author{$author.name$}
+$if(authornote)$
+  \authornote{$authornote$}
+$endif$
+$if(orcid)$
+  \orcid{$orcid$}
+$endif$
+\email{$author.email$}
+$if(author.affiliation)$
+\affiliation{
+  \institution{$author.affiliation.institution$}
+  \city{$author.affiliation.city$}
+  \state{$author.affiliation.state$}
+  \country{$author.affiliation.country$}
+  \postcode{$author.affiliation.postcode$}
+}
+$endif$
+$if(author.additional-affiliation)$
+\additionalaffiliation{
+  \institution{$author.additional-affiliation.institution$}
+  \city{$author.additional-affiliation.city$}
+  \state{$author.additional-affiliation.state$}
+  \country{$author.additional-affiliation.country$}
+  \postcode{$author.additional-affiliation.postcode$}
+}
+$endif$
 $endfor$
 
 % The default list of authors is too long for headers.
diff --git a/inst/rmarkdown/templates/chi_ea/skeleton/skeleton.Rmd b/inst/rmarkdown/templates/chi_ea/skeleton/skeleton.Rmd
index 7c58f95..8fb10a1 100644
--- a/inst/rmarkdown/templates/chi_ea/skeleton/skeleton.Rmd
+++ b/inst/rmarkdown/templates/chi_ea/skeleton/skeleton.Rmd
@@ -1,15 +1,15 @@
 ---
 #conference and copyright metadata
-copyright: acmcopyright #otherwise e.g. none, acmlicensed, ...
 copyright-year: 2016
-DOI: 10.475/123_4
-ISBN: 123-4567-24-567/08/06
-conference: ACM Woodstock conference
-conference-short: WOODSTOCK'97
-conference-date: July 1997
-conference-location: El Paso, Texas USA
 acm-year: 1997
+setcopyright: acmlicensed #e.g. none, acmcopyright, acmlicensed, rightsretained, usgov...
+conference: CHI Conference on Human Factors in Computing Systems Proceedings
+conference-short: CHI 2019
+conference-date: May 4--9, 2019
+conference-location: Glasgow, Scotland UK
 acm-price: 15.00
+acmDOI: 10.475/123_4
+acmISBN: 123-4567-24-567/08/06
 watermark: false #e.g. 'pre-print'
 watermark-on-first-page-only: true