Merge pull request #308 from FredHutch/contact_linebreaks

ensure line breaks between multiple contact personnel

Author: slager

NEWS.md

@@ -1,6 +1,7 @@
 # VISCtemplates (development version)
 
 Improvements for users
+* Line breaks added between multiple contact personnel on title page of PDF report template (#308)
 * `visc_load_pdata()` gives more informative error message when serialized pdata file does not contain an R object of the same name (#303)
 * Default behavior of `create_visc_project()` no longer includes creation of package-specific files DESCRIPTION and NAMESPACE (#306)
 

inst/templates/report_latex_template.tex

@@ -269,7 +269,8 @@
   \advance\dimen@\@totalleftmargin
   \advance\dimen@-\dimen\@curtab
   \parbox[t]\dimen@{%
-    \leftskip=2em\hspace*{-2em}#1\ifhmode\strut\fi}%
+    \parindent=0pt % Ensure no paragraph indentation
+    #1\ifhmode\strut\fi}%
 }
 \makeatother
 
@@ -278,15 +279,16 @@
 \begin{flushleft}
 \begin{tabbing}
 this line is to\= set up the tab stop \kill
-{\bf Date:} \> \insertdate\\
-{\bf To:} \>  \tabfill{$for(to)$$to.name$$sep$, $endfor$}\\
+{\bf Date:} \> \insertdate\\[0.5em]
+{\bf To:} \>  \tabfill{$for(to)$$to.name$$sep$, $endfor$}\\[0.1em]
 {\bf From:} \> \tabfill{$for(from)$$from.name$$sep$, $endfor$}\\
-{\bf RE:} \> \tabfill{$title$}\\
 $if(dropcc)$
+[0.5em]
 $else$
-{\bf cc:} \> \tabfill{$for(cc)$$cc.name$$sep$, $endfor$}\\
+[0.1em]{\bf CC:} \> \tabfill{$for(cc)$$cc.name$$sep$, $endfor$}\\[0.5em]
 $endif$
-{\bf Contact:} \> \tabfill{$for(from)$$if(from.contact)$$from.name$, $from.email$$endif$ $endfor$}\\
+{\bf RE:} \> \tabfill{$title$}\\[0.5em]
+{\bf Contact:} \> \tabfill{$for(from)$$if(from.contact)$$from.name$ ($from.email$)\\$endif$ $endfor$}\\[0.5em]
 \end{tabbing}
 \end{flushleft}
 

inst/templates/visc_empty/skeleton/skeleton.Rmd

@@ -6,16 +6,19 @@ author: "Contact: First Name, Last Name (xxx@fredhutch.org)"
 date: "Word document compiled on `r format(Sys.Date(), '%A, %B %d, %Y')`"
 from:
  - name: FirstNameA LastNameA
-   email: foo@bar.com
+   email: xxx@fredhutch.org
    contact: true
  - name: FirstNameB LastNameB
-to:
+   email: yyy@zzz.com
+   contact: true
  - name: FirstNameC LastNameC
+to:
  - name: FirstNameD LastNameD
+ - name: FirstNameE LastNameE
 dropcc: false
 cc:
- - name: FirstNameE LastNameE
  - name: FirstNameF LastNameF
+ - name: FirstNameG LastNameG
 includesummary: true
 summary: 
   A short summary about your report. 

inst/templates/visc_report/skeleton/skeleton.Rmd

@@ -6,16 +6,19 @@ author: "Contact: First Name, Last Name (xxx@fredhutch.org)"
 date: "Word document compiled on `r format(Sys.Date(), '%A, %B %d, %Y')`"
 from:
  - name: FirstNameA LastNameA
-   email: foo@bar.com
+   email: xxx@fredhutch.org
    contact: true
  - name: FirstNameB LastNameB
-to:
+   email: yyy@zzz.com
+   contact: true
  - name: FirstNameC LastNameC
+to:
  - name: FirstNameD LastNameD
+ - name: FirstNameE LastNameE
 dropcc: false
 cc:
- - name: FirstNameE LastNameE
  - name: FirstNameF LastNameF
+ - name: FirstNameG LastNameG
 includesummary: true
 summary: 
   A short summary about your report.