From cf1360bc7736cd852f696bddf894093562c30f66 Mon Sep 17 00:00:00 2001
From: hacksalot <hacksalot@indevious.com>
Date: Mon, 4 Jan 2016 17:29:21 -0500
Subject: [PATCH] Patch Minimist theme.

---
 themes/minimist/src/doc.xml   |   6 +-
 themes/minimist/src/html.html |  14 ++--
 themes/minimist/src/md.txt    | 122 +++++++++++++---------------------
 themes/minimist/src/pdf.html  |  14 ++--
 themes/minimist/src/txt.txt   | 112 +++++++++++--------------------
 5 files changed, 101 insertions(+), 167 deletions(-)

diff --git a/themes/minimist/src/doc.xml b/themes/minimist/src/doc.xml
index 6715eb5..1969839 100644
--- a/themes/minimist/src/doc.xml
+++ b/themes/minimist/src/doc.xml
@@ -740,7 +740,7 @@ engine: Underscore
               <w:i w:val="off"/>
               <w:i-cs w:val="off"/>
             </w:rPr>
-            <w:t>{{{sectionTitle "Skills"}}}</w:t>
+            <w:t>{% print(h.sectionTitle('Skills')) %}</w:t>
           </w:r>
         </w:p>
         <w:tbl>
@@ -792,7 +792,7 @@ engine: Underscore
             <w:pStyle w:val="Heading1"/>
           </w:pPr>
           <w:r>
-            <w:t>{{{sectionTitle "Employment"}}}</w:t>
+            <w:t>{% print(h.sectionTitle('Employment')) %}</w:t>
           </w:r>
         </w:p>
         <w:tbl>
@@ -917,7 +917,7 @@ engine: Underscore
             <w:pStyle w:val="Heading1"/>
           </w:pPr>
           <w:r>
-            <w:t>{{{sectionTitle "Education"}}}</w:t>
+            <w:t>{% print(h.sectionTitle('Education')) %}</w:t>
           </w:r>
         </w:p>
         <w:tbl>
diff --git a/themes/minimist/src/html.html b/themes/minimist/src/html.html
index c3443e6..631d098 100644
--- a/themes/minimist/src/html.html
+++ b/themes/minimist/src/html.html
@@ -30,7 +30,7 @@ engine: Underscore
 {% if ( r.info.brief && r.info.brief.length ) { %}
       <hr>
       <section id="summary">
-        <h3>{{{sectionTitle "info" "About"}}}</h3>
+        <h3>{% print(h.sectionTitle('info', 'About')) %}</h3>
         <span class="fa fa-lg fa-user"></span>
         {{ r.info.brief }}
       </section>
@@ -41,7 +41,7 @@ engine: Underscore
       <hr>
       <section id="skills">
         <header>
-        <h3>{{{sectionTitle "Skills"}}}</h3>
+        <h3>{% print(h.sectionTitle('Skills')) %}</h3>
         </header>
         <span class="fa fa-lg fa-code"></span>
 
@@ -75,7 +75,7 @@ engine: Underscore
       <hr>
       <section id="employment">
         <header>
-        <h3>{{{sectionTitle "Employment"}}}</h3>
+        <h3>{% print(h.sectionTitle("Employment")) %}</h3>
         </header>
         <span class="fa fa-lg fa-building"></span>
         {% r.employment.history.forEach( function( proj, idx, ar) { %}
@@ -104,7 +104,7 @@ engine: Underscore
       <hr>
       <section id="education">
         <header>
-        <h3>{{{sectionTitle "Education"}}}</h3>
+        <h3>{% print(h.sectionTitle("Education")) %}</h3>
         </header>
         <span class="fa fa-lg fa-mortar-board"></span>
         {% r.education.history.forEach( function( edu, idx, ar) { %}
@@ -126,7 +126,7 @@ engine: Underscore
       <hr>
       <section id="awards">
         <header>
-        <h3>{{{sectionTitle "recognition" "Awards"}}}</h3>
+        <h3>{% print( h.sectionTitle("recognition", "Awards")) %}</h3>
         </header>
         <span class="fa fa-lg fa-trophy"></span>
         {% r.recognition.forEach( function( award, idx, ar) { %}
@@ -141,7 +141,7 @@ engine: Underscore
       <hr>
       <section id="publications">
         <header>
-        <h3>{{{sectionTitle "writing" "Publications"}}}</h3>
+        <h3>{% print( h.sectionTitle("writing", "Publications")) %}</h3>
         </header>
         <span class="fa fa-lg fa-pencil"></span>
         {% r.writing.forEach( function( pub, idx, ar) { %}
@@ -160,7 +160,7 @@ engine: Underscore
       <hr>
       <section id="volunteer">
         <header>
-        <h3>{{{sectionTitle "service" "Volunteer Work"}}}</h3>
+        <h3>{% print(h.sectionTitle("service", "Volunteer Work")) %}</h3>
         </header>
         <span class="fa fa-lg fa-child"></span>
         {% r.service.history.forEach( function( vol, idx, ar) { %}
diff --git a/themes/minimist/src/md.txt b/themes/minimist/src/md.txt
index eabbb84..ee1688f 100644
--- a/themes/minimist/src/md.txt
+++ b/themes/minimist/src/md.txt
@@ -1,84 +1,54 @@
-{{ r.name }}
-============
-{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
-{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
-{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
+# {{ r.name }}
 
-{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
+{% if (r.contact.email) { %}Email: {{ r.contact.email }}{% } %}
+{% if (r.contact.phone) { %}Tel: {{ r.contact.phone }}{% } %}
+{% if (r.contact.website) { %}Web: {{ r.contact.website }}{% } %}
 
-{{#if r.skills}}
-## {{{sectionTitle "SKILLS"}}}
+{% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %}
 
-{{#each r.skills.sets}}
-  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
-{{/each}}
-{{/if}}
+{% if ( r.skills && r.skills.sets ) { %}
+## {% print(h.sectionTitle('Skills')) %}
+{% r.skills.sets.forEach( function( set, idx, ar) { %}
+- **{{ set.name }}**: {{ set.skills.join(', ') }}
+{% }); } %}
 
-{{#if r.employment}}
-## {{{sectionTitle "EMPLOYMENT"}}}
+{% if ( r.employment.history && r.employment.history.length ) { %}
+## {% print(h.sectionTitle('Employment')) %}
+{% r.employment.history.forEach( function( proj, idx, ar) { %}
+### *{{ proj.position }}*, {{ proj.employer }}
+<small>{{ proj.safe.start.format('MMM YYYY') }} — {{ proj.safe.end.format('MMM YYYY') }}</small>
+{{ proj.summary }}
+{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high, idx, ar) { %}
+- {{ high }}
+{% }); }  }); } %}
 
-{{#each r.employment.history }}
-  {{#compare @index 4 operator="<"}}
-### {{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
+{% if ( r.education.history && r.education.history.length ) { %}
+## {% print(h.sectionTitle('Education')) %}
+{% r.education.history.forEach( function( edu, idx, ar) { %}
+### {{ edu.institution }} ({{ edu.safe.start.format('MMM YYYY') }} — {{ edu.safe.end.format('MMM YYYY') }})
+{{ edu.area }}
+{% if( edu.curriculum ) { %}{% edu.curriculum.forEach( function( course, idx, ar) { %}
+- {{ course }}
+{% }); } }); } %}
 
-  {{/compare}}
-  {{#compare @index 4 operator=">="}}
-    {{#compare @index 4 operator="=="}}
-### Previously...
-Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.
-    {{/compare}}
-  - {{{ position }}}, {{{ employer }}}
-  {{/compare}}
-{{/each}}
-{{/if}}
+{% if ( r.writing && r.writing.length ) { %}
+## {% print(h.sectionTitle('publications', 'Writing')) %}
+{% r.writing.forEach( function( pub, idx, ar) { %}
+### {{ pub.title }} ({{ pub.safe.date.format('MMM YYYY') }})
+{{ pub.publisher }}
+{{ pub.summary }}
+{% }); } %}
 
-{{#if r.education}}
-## {{{sectionTitle "EDUCATION"}}}
+{% if ( r.service.history && r.service.history.length ) { %}
+## {% print(h.sectionTitle('service','Volunteer')) %}
+{% r.service.history.forEach( function( vol, idx, ar) { %}
+### {{ vol.organization }} ({{ vol.safe.start.format('MMM YYYY') }} — {{ vol.safe.end.format('MMM YYYY') }})
+{{ vol.summary }}
+{% }); } %}
 
-{{#each r.education.history}}
-### {{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{#if summary }}
-{{{ summary }}}
-{{/if}}
-{{#if courses}}
-{{#each courses}}
-  - {{{ this }}}{{/each}}{{/if}}
-{{/each}}
-{{/if}}
-{{#if r.writing}}
-## WRITING
-
-{{#each r.writing}}
-### {{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
-
-{{#if r.service }}
-## {{{sectionTitle "SERVICE"}}}
-
-{{#each r.service.history}}
-### {{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-{{/each}}
-{{/if}}
-{{#if r.recognition}}
-## {{{sectionTitle "RECOGNITION"}}}
-
-{{#each r.recognition}}
-### {{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
+{% if ( r.recognition && r.recognition.length ) { %}
+## {% print(h.sectionTitle('Recognition')) %}
+{% r.recognition.forEach( function( awd, idx, ar) { %}
+### *{{ awd.title }}*, {{ awd.from }} ({{ awd.safe.date.format('MMM YYYY') }})
+{{ awd.summary }}
+{% }); } %}
diff --git a/themes/minimist/src/pdf.html b/themes/minimist/src/pdf.html
index 01f233a..e3988a0 100644
--- a/themes/minimist/src/pdf.html
+++ b/themes/minimist/src/pdf.html
@@ -32,7 +32,7 @@ engine: Underscore
 {% if ( r.info.brief && r.info.brief.length ) { %}
       <hr>
       <section id="summary">
-        <h3>{{{sectionTitle "info" "About"}}}</h3>
+        <h3>{% print(h.sectionTitle('info', 'About')) %}</h3>
         <span class="fa fa-lg fa-user"></span>
         {{ r.info.brief }}
       </section>
@@ -43,7 +43,7 @@ engine: Underscore
       <hr>
       <section id="skills">
         <header>
-        <h3>{{{sectionTitle "Skills"}}}</h3>
+        <h3>{% print(h.sectionTitle('Skills')) %}</h3>
         </header>
         <span class="fa fa-lg fa-code"></span>
 
@@ -77,7 +77,7 @@ engine: Underscore
       <hr>
       <section id="employment">
         <header>
-        <h3>{{{sectionTitle "Employment"}}}</h3>
+        <h3>{% print(h.sectionTitle("Employment")) %}</h3>
         </header>
         <span class="fa fa-lg fa-building"></span>
         {% r.employment.history.forEach( function( proj, idx, ar) { %}
@@ -106,7 +106,7 @@ engine: Underscore
       <hr>
       <section id="education">
         <header>
-        <h3>{{{sectionTitle "Education"}}}</h3>
+        <h3>{% print(h.sectionTitle("Education")) %}</h3>
         </header>
         <span class="fa fa-lg fa-mortar-board"></span>
         {% r.education.history.forEach( function( edu, idx, ar) { %}
@@ -128,7 +128,7 @@ engine: Underscore
       <hr>
       <section id="awards">
         <header>
-        <h3>{{{sectionTitle "recognition" "Awards"}}}</h3>
+        <h3>{% print( h.sectionTitle("recognition", "Awards")) %}</h3>
         </header>
         <span class="fa fa-lg fa-trophy"></span>
         {% r.recognition.forEach( function( award, idx, ar) { %}
@@ -143,7 +143,7 @@ engine: Underscore
       <hr>
       <section id="publications">
         <header>
-        <h3>{{{sectionTitle "writing" "Publications"}}}</h3>
+        <h3>{% print( h.sectionTitle("writing", "Publications")) %}</h3>
         </header>
         <span class="fa fa-lg fa-pencil"></span>
         {% r.writing.forEach( function( pub, idx, ar) { %}
@@ -162,7 +162,7 @@ engine: Underscore
       <hr>
       <section id="volunteer">
         <header>
-        <h3>{{{sectionTitle "service" "Volunteer Work"}}}</h3>
+        <h3>{% print(h.sectionTitle("service", "Volunteer Work")) %}</h3>
         </header>
         <span class="fa fa-lg fa-child"></span>
         {% r.service.history.forEach( function( vol, idx, ar) { %}
diff --git a/themes/minimist/src/txt.txt b/themes/minimist/src/txt.txt
index 505f8b8..affc807 100644
--- a/themes/minimist/src/txt.txt
+++ b/themes/minimist/src/txt.txt
@@ -1,84 +1,48 @@
 {{ r.name }}
-{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
-{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
-{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
-================================================================================
+{% if (r.contact.email) { %}Email: {{ r.contact.email }}{% } %}
+{% if (r.contact.phone) { %}Tel: {{ r.contact.phone }}{% } %}
+{% if (r.contact.website) { %}Web: {{ r.contact.website }}{% } %}
 
-{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
+***
 
-{{#if r.skills}}
-{{{sectionTitle "SKILLS"}}} -------------------------------------------------------------------------
+{% if ( r.info.brief && r.info.brief.length ) { %}{{ r.info.brief }}{% } %}
 
-{{#each r.skills.sets}}
-  - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
-{{/each}}
-{{/if}}
 
-{{#if r.employment}}
-{{{sectionTitle "EMPLOYMENT"}}} ---------------------------------------------------------------------
+{% if ( r.skills && r.skills.sets && r.skills.sets.length ) { %}SKILLS
+{% r.skills.sets.forEach( function( set ) { %}
+  - {{ set.name }}: {% set.skills.forEach(function(sk){ %}{{ sk }}, {% }); %}
+  {{ set.level }}
+{% }); %}
+{% } else if( r.skills && r.skills.list && r.skills.list.length ) { %}
 
-{{#each r.employment.history }}
-  {{#compare @index 4 operator="<"}}
-{{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
+{% } %}
 
-  {{/compare}}
-  {{#compare @index 4 operator=">="}}
-    {{#compare @index 4 operator="=="}}
-Previously...
-Prior to {{{ employer }}}, I worked on a range of projects for companies large and small.
-    {{/compare}}
-  - {{{ position }}}, {{{ employer }}}
-  {{/compare}}
-{{/each}}
-{{/if}}
+{% if ( r.employment && r.employment.history ) { %}{% print(h.sectionTitle('EMPLOYMENT')) %}
+{% r.employment.history.forEach( function( proj, idx, ar) { %}
+{{ proj.employer }} ({{ proj.safe.start.format('YYYY-MM') }} — {{ proj.safe.end.format('YYYY-MM') }})
+{{ proj.summary }}
+{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high ) { %}
+  - {{ high }}
+{% }); }  }); } %}
 
-{{#if r.education}}
-{{{sectionTitle "EDUCATION"}}} ----------------------------------------------------------------------
+{% if ( r.education && r.education.history ) { %}{% print(h.sectionTitle('EDUCATION')) %}
+{% r.education.history.forEach( function( edu, idx, ar) { %}
+{{ edu.institution }} ({{ edu.safe.start.format('YYYY-MM') }} — {{ edu.safe.end.format('YYYY-MM') }})
+{{ edu.summary }}
+{% if( edu.courses ) { %}{% edu.courses.forEach( function( course ) { %}
+  - {{ course }}
+{% }); } }); } %}
 
-{{#each r.education.history}}
-{{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{#if summary }}
-{{{ summary }}}
-{{/if}}
-{{#if courses}}
-{{#each courses}}
-  - {{{ this }}}{{/each}}{{/if}}
-{{/each}}
-{{/if}}
-{{#if r.writing}}
-{{{sectionTitle "WRITING"}}} ------------------------------------------------------------------------
+{% if ( r.service && r.service.history ) { %}{% print(h.sectionTitle('service', 'VOLUNTEER')) %}
+{% r.service.history.forEach( function( srv, idx, ar) { %}
+{{ srv.organization }} ({{ srv.safe.start.format('YYYY-MM') }} — {{ srv.safe.end.format('YYYY-MM') }})
+{{ srv.summary }}
+{% if( srv.highlights ) { %}{% srv.highlights.forEach( function( high ) { %}
+  - {{ high }}
+{% }); } }); } %}
 
-{{#each r.writing}}
-{{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
-
-{{#if r.service }}
-{{{sectionTitle "SERVICE"}}} ------------------------------------------------------------------------
-
-{{#each r.service.history}}
-{{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
-{{{ summary }}}
-{{#if highlights}}
-{{#each highlights}}
-  - {{{ this }}}
-{{/each}}
-{{/if}}
-
-{{/each}}
-{{/if}}
-{{#if r.recognition}}
-{{{sectionTitle "RECOGNITION"}}} --------------------------------------------------------------------
-
-{{#each r.recognition}}
-{{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
-{{{ summary }}}
-{{/each}}
-{{/if}}
+{% if ( r.writing && r.writing.length ) { %}{% print(h.sectionTitle('EMPLOYMENT')) %}
+{% r.writing.forEach( function( wri, idx, ar) { %}
+{{ wri.title }} ({{ wri.safe.date.format('YYYY-MM') }})
+{{ wri.summary }}
+{% }); } %}