All: Better section handling & add projects.

themes/awesome/README.md

@@ -5,8 +5,9 @@ An experimental resume theme based on [Byungjin Park's][author] awesome
 
 ## Use
 
-1. Run `fluentcv build my-resume.json to out/my-resume.all -t awesome` to create
+1. Run `hackmyresume build my-resume.json to out/my-resume.all -t awesome` to
-a LaTeX résumé in the Awesome-CV style using your FRESH or JSON Resume resume.
+create a LaTeX résumé in the Awesome-CV style using your FRESH or JSON Resume
+resume.
 
 2. Generate a styled PDF by running `xelatex my-resume.tex` in the `examples`
 folder generated in Step 1. You'll need a valid and updated LaTeX environment on
@@ -21,10 +22,10 @@ are 3 symlinks in the `examples` folder that need to exist:
 - `fontawesome.sty` should link to `../fontawesome.sty`.
 - `fonts` should link to `../fonts` (folder).
 
-FluentCV creates these by default when it generates a resume under the `awesome`
+HackMyResume creates these by default when it generates a resume under the
-theme. To create these symlinks manually, either use the Linux / OS X symlink
+`awesome` theme. To create these symlinks manually, either use the Linux / OS X
-command for all three or, if on Windows, run use `mklink /H` for the first two
+symlink command for all three or, if on Windows, run use `mklink /H` for the
-and `mklink /J` for the last.
+first two and `mklink /J` for the last.
 
 ## License
 

themes/awesome/theme.json

@@ -1,5 +1,5 @@
 {
-  "title": "compact",
+  "title": "awesome",
   "description": "A technical résumé theme based on Awesome-CV for LaTeX.",
   "engine": "underscore",
   "url": "https://github.com/posquit0/Awesome-CV",

themes/compact/src/compact-doc.xml

@@ -513,9 +513,9 @@
         </w:r>
       </w:p> -->
       {{{wpml RAW.info.brief }}}
-      {{#hasSection "skills"}}{{> skills }}{{/hasSection}}
+      {{#section "skills"}}{{> skills }}{{/section}}
-      {{#hasSection "employment"}}{{> employment }}{{/hasSection}}
+      {{#section "employment"}}{{> employment }}{{/section}}
-      {{#hasSection "education"}}{{> education }}{{/hasSection}}
+      {{#section "education"}}{{> education }}{{/section}}
       <w:sectPr wsp:rsidR="00B43FDC" wsp:rsidRPr="000A3AF0" wsp:rsidSect="001B7422">
         <w:pgSz w:w="12240" w:h="15840"/>
         <w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0"/>

themes/compact/src/compact-html.html

@@ -25,7 +25,7 @@
 {{/has}}
 
 
-{{#hasSection "skills"}}
+{{#section "skills"}}
       <section id="skills">
         <header>
         <h2><span class="fa fa-code"></span> {{{sectionTitle "Skills"}}}</h2><hr>
@@ -47,18 +47,17 @@
           </tbody>
         </table>
       </section>
-{{/hasSection}}
+{{/section}}
 
 
 
-{{#hasSection "employment"}}
+{{#section "employment"}}
       <section id="employment">
         <header>
         <h2><span class="fa fa-building" style="vertical-align: top;"></span> {{{sectionTitle "Employment"}}}</h2><hr>
         </header>
 
         {{#each r.employment.history}}
-          {{#compare @index 4 operator="<"}}
             <h3><em>{{ position }}</em>,
               {{#if url }}
               <a href="{{ url }}">{{ employer }}</a>
@@ -74,27 +73,39 @@
               {{/each}}
               </ul>
             {{/if}}
-          {{/compare}}
-          {{#compare @index 4 operator=">="}}
-
-            {{#compare @index 4 operator="=="}}
-            <h3>Previously...</h3>
-            <p style="clear: both;">Prior to {{ employer }}, I worked on a range of projects for companies large and small.</p>
-            <ul>
-            {{/compare}}
-
-            <li>{{{ position }}}, {{{ employer }}}</li>
-
-            {{#if @last}}
-            </ul>
-            {{/if}}
-          {{/compare}}
         {{/each}}
 
       </section>
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "education"}}
+{{#section 'projects'}}
+<hr>
+<section id="projects">
+  <header>
+  <h3>{{{sectionTitle "Projects"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.projects}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/section}}
+
+{{#section "education"}}
       <section id="education">
         <header>
         <h2><span class="fa fa-mortar-board"></span> {{{sectionTitle "Education"}}}</h2><hr>
@@ -104,9 +115,9 @@
         {{/each}}
 
       </section>
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "service"}}
+{{#section "service"}}
       <section id="volunteer">
         <header>
         <h2><span class="fa fa-child" style="vertical-align: top;"></span> {{{sectionTitle "Service"}}}</h2><hr>
@@ -130,9 +141,9 @@
         {{/each}}
 
       </section>
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "writing"}}
+{{#section "writing"}}
       <section id="publications">
         <header>
         <h2><span class="fa fa-book"></span> {{{sectionTitle "Writing"}}}</h2><hr>
@@ -143,9 +154,9 @@
         {{# if summary}}{{{ summary }}}{{/if}}
         {{/each}}
       </section>
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "recognition"}}
+{{#section "recognition"}}
       <section id="awards">
         <header>
         <h2><span class="fa fa-trophy"></span> {{{sectionTitle "recognition" "Awards"}}}</h2><hr>
@@ -155,7 +166,7 @@
           {{ summary }}
         {{/each}}
       </section>
-{{/hasSection}}
+{{/section}}
 
     </main>
   </body>

themes/compact/src/compact-pdf.html

@@ -26,7 +26,7 @@
 {{/has}}
 
 
-{{#hasSection "skills"}}
+{{#section "skills"}}
       <section id="skills">
         <header>
         <h2><span class="fa fa-code"></span> {{{sectionTitle "Skills"}}}</h2><hr>
@@ -48,11 +48,11 @@
           </tbody>
         </table>
       </section>
-{{/hasSection}}
+{{/section}}
 
 
 
-{{#hasSection "employment"}}
+{{#section "employment"}}
       <section id="employment">
         <header>
         <h2><span class="fa fa-building" style="vertical-align: top;"></span> {{{sectionTitle "Employment"}}}</h2><hr>
@@ -93,9 +93,36 @@
         {{/each}}
 
       </section>
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "education"}}
+{{#section 'projects'}}
+<hr>
+<section id="projects">
+  <header>
+  <h3>{{{sectionTitle "Projects"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.projects}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/section}}
+
+{{#section "education"}}
       <section id="education">
         <header>
         <h2><span class="fa fa-mortar-board"></span> {{{sectionTitle "Education"}}}</h2><hr>
@@ -105,9 +132,9 @@
         {{/each}}
 
       </section>
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "service"}}
+{{#section "service"}}
       <section id="volunteer">
         <header>
         <h2><span class="fa fa-child" style="vertical-align: top;"></span> {{{sectionTitle "Service"}}}</h2><hr>
@@ -131,9 +158,9 @@
         {{/each}}
 
       </section>
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "writing"}}
+{{#section "writing"}}
       <section id="publications">
         <header>
         <h2><span class="fa fa-book"></span> {{{sectionTitle "Writing"}}}</h2><hr>
@@ -144,9 +171,9 @@
         {{# if summary}}{{{ summary }}}{{/if}}
         {{/each}}
       </section>
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "recognition"}}
+{{#section "recognition"}}
       <section id="awards">
         <header>
         <h2><span class="fa fa-trophy"></span> {{{sectionTitle "recognition" "Awards"}}}</h2><hr>
@@ -156,7 +183,7 @@
           {{ summary }}
         {{/each}}
       </section>
-{{/hasSection}}
+{{/section}}
 
     </main>
   </body>

themes/compact/src/compact-txt.txt

@@ -1,24 +1,24 @@
 {{ r.name }}
-{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
+{{#has 'contact.email' }}Email: {{{ r.contact.email }}}{{/has}}
-{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
+{{#has 'contact.phone' }}Tel: {{{ r.contact.phone }}}{{/has}}
-{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
+{{#has 'contact.website' }}Web: {{{ r.contact.website }}}{{/has}}
 ================================================================================
 
-{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
+{{#has 'info.brief' }}{{{ r.info.brief }}}{{/has}}
 
-{{#hasSection "skills"}}
+{{#section "skills"}}
 {{{sectionTitle "SKILLS"}}} -------------------------------------------------------------------------
 
 {{#each r.skills.sets}}
 - {{{ name }}}: {{#each skills}}{{{ this }}} {{/each}}
 {{/each}}
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "employment"}}
+{{#section "employment"}}
 {{{sectionTitle "EMPLOYMENT"}}} ---------------------------------------------------------------------
 
 {{#each r.employment.history }}
-{{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
+{{{ position }}}, {{{ employer }}} ({{dateRange .}})
 {{{ summary }}}
 {{#if highlights}}
 {{#each highlights}}
@@ -27,13 +27,13 @@
 {{/if}}
 
 {{/each}}
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection 'projects'}}
+{{#section 'projects'}}
 {{{sectionTitle "PROJECTS"}}} -----------------------------------------------------------------------
 
 {{#each r.projects }}
-{{{ title }}}, {{{ role }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
+{{{ title }}}, {{{ role }}} ({{dateRange .}})
 {{{ description }}}
 {{{ summary }}}
 {{#if highlights}}
@@ -42,13 +42,13 @@
 {{/each}}
 {{/if}}
 {{/each}}
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "education"}}
+{{#section "education"}}
 {{{sectionTitle "EDUCATION"}}} ----------------------------------------------------------------------
 
 {{#each r.education.history}}
-{{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{{ institution }}} ({{dateRange .}})
 {{#if summary }}
 {{{ summary }}}
 {{/if}}
@@ -59,22 +59,22 @@
 {{/if}}
 
 {{/each}}
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "writing"}}
+{{#section "writing"}}
 {{{sectionTitle "WRITING"}}} ------------------------------------------------------------------------
 
 {{#each r.writing}}
-{{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
+{{{ title }}}{{#has 'safe.date'}} ({{formatDate safe.date 'YYYY-MM' }}){{/has}}
 {{{ summary }}}
 {{/each}}
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "service" }}
+{{#section "service" }}
 {{{sectionTitle "SERVICE"}}} ------------------------------------------------------------------------
 
 {{#each r.service.history}}
-{{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{{ organization }}} ({{dateRange .}})
 {{{ summary }}}
 {{#if highlights}}
 {{#each highlights}}
@@ -82,13 +82,13 @@
 {{/each}}
 {{/if}}
 {{/each}}
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "recognition"}}
+{{#section "recognition"}}
 {{{sectionTitle "RECOGNITION"}}} --------------------------------------------------------------------
 
 {{#each r.recognition}}
 {{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
 {{{ summary }}}
 {{/each}}
-{{/hasSection}}
+{{/section}}

themes/hello-world/theme.json

@@ -1,5 +1,5 @@
 {
-  "title": "minimist",
+  "title": "hello-world",
   "description": "An unstyled starter résumé theme for FluentCV.",
   "author": "hacksalot <hacksalot@fluentdesk.com>",
   "engine": "handlebars"

themes/minimist/README.md

@@ -1,6 +1,7 @@
 Theme: Minimist
 ===============
-An unstyled résumé theme.
+An unstyled résumé theme. Unlike most other FRESH themes, Minimist uses the
+Underscore.js templating engine (instead of Handlebars).
 
 ## License
 

themes/minimist/src/txt.txt

@@ -19,7 +19,7 @@
 
 {% 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.employer }} {{ h.dateRange(proj) }}
 {{ proj.summary }}
 {% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high ) { %}
   - {{ high }}
@@ -27,7 +27,7 @@
 
 {% 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.institution }} {% print(h.dateRange(edu)) %}
 {{ edu.summary }}
 {% if( edu.courses ) { %}{% edu.courses.forEach( function( course ) { %}
   - {{ course }}
@@ -35,10 +35,10 @@
 
 {% if ( r.projects && r.projects.length ) { %}{% print(h.sectionTitle('PROJECTS')) %}
 {% r.projects.forEach( function( proj, idx, ar) { %}
-{{ proj.title }} ({{ proj.safe.start.format('YYYY-MM') }} — {{ proj.safe.end.format('YYYY-MM') }})
+{{ proj.title }} {{ h.dateRange( proj ) }}
 {{ proj.summary }}
-{% if( edu.courses ) { %}{% proj.highlights.forEach( function( course ) { %}
+{% if( proj.highlights ) { %}{% proj.highlights.forEach( function( high ) { %}
-  - {{ course }}
+  - {{ high }}
 {% }); } }); } %}
 
 {% if ( r.service && r.service.history ) { %}{% print(h.sectionTitle('service', 'VOLUNTEER')) %}

themes/minimist/theme.json

@@ -1,6 +1,6 @@
 {
-  "title": "awesome",
+  "title": "minimist",
-  "description": "A visually compact résumé theme for FluentCV.",
+  "description": "A unstyled résumé theme for FluentCV.",
   "author": "hacksalot <hacksalot@fluentdesk.com>",
   "engine": "underscore"
 }

themes/modern/src/modern-doc.xml

@@ -485,13 +485,13 @@
           </w:r>
         </w:hlink>
       </w:p>
-      {{#hasSection "info"}}{{> info }}{{/hasSection}}
+      {{#section "info"}}{{> info }}{{/section}}
-      {{#hasSection "skills"}}{{> skills }}{{/hasSection}}
+      {{#section "skills"}}{{> skills }}{{/section}}
-      {{#hasSection "employment"}}{{> employment }}{{/hasSection}}
+      {{#section "employment"}}{{> employment }}{{/section}}
-      {{#hasSection "education"}}{{> education }}{{/hasSection}}
+      {{#section "education"}}{{> education }}{{/section}}
-      {{#hasSection "service"}}{{> service }}{{/hasSection}}
+      {{#section "service"}}{{> service }}{{/section}}
-      {{#hasSection "writing"}}{{> writing }}{{/hasSection}}
+      {{#section "writing"}}{{> writing }}{{/section}}
-      {{#hasSection "recognition"}}{{> recognition }}{{/hasSection}}
+      {{#section "recognition"}}{{> recognition }}{{/section}}
       <w:sectPr wsp:rsidR="00B43FDC" wsp:rsidRPr="000A3AF0" wsp:rsidSect="001B7422">
         <w:pgSz w:w="12240" w:h="15840"/>
         <w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0"/>

themes/modern/src/modern-html.html

@@ -91,7 +91,7 @@
 </section>
 {{/if}}
 
-{{#hasSection 'projects'}}
+{{#section 'projects'}}
 <hr>
 <section id="projects">
   <header>
@@ -116,9 +116,9 @@
   {{/each}}
 
 </section>
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection 'education'}}
+{{#section 'education'}}
 <hr>
 <section id="education">
   <header>
@@ -138,7 +138,7 @@
   {{/each}}
 
 </section>
-{{/hasSection}}
+{{/section}}
 
 {{#if r.service}}
 <hr>

themes/modern/src/modern-md.txt

@@ -1,38 +1,68 @@
 {{ r.name }}
 ============
-{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
+{{#has 'contact.email' }}Email: {{{ r.contact.email }}}{{/has}}
-{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
+{{#has 'contact.phone' }}Tel: {{{ r.contact.phone }}}{{/has}}
-{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
+{{#has 'contact.website' }}Web: {{{ r.contact.website }}}{{/has}}
 
-{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
+{{#has "info.brief" }}{{{ r.info.brief }}}{{/has}}
 
-{{#if r.skills}}
+{{#section "skills"}}
 ## {{{sectionTitle "SKILLS"}}}
 
 {{#each r.skills.sets}}
   - {{{ name }}}: {{#each this.skills}}{{{ this }}} {{/each}}
 {{/each}}
-{{/if}}
+{{/section}}
 
-{{#if r.employment}}
+{{#section "employment"}}
 ## {{{sectionTitle "EMPLOYMENT"}}}
 
 {{#each r.employment.history }}
-### {{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
+
+{{#if url}}
+### *{{{ position }}}*, [{{{ employer }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{else}}
+### *{{{ position }}}*, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{/if}}
 {{{ summary }}}
 {{#if highlights}}
 {{#each highlights}}
   - {{{ this }}}
 {{/each}}
 {{/if}}
+
+{{/each}}
+{{/section}}
+
+{{#section 'projects'}}
+## {{{sectionTitle "PROJECTS"}}}
+
+{{#each r.projects }}
+{{#if url }}
+### *{{{camelCase role }}}*, [{{{ title }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{else}}
+### *{{{camelCase role }}}*, {{{ title }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{/if}}
+{{{ description }}}
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+  - {{{ . }}}
+
 {{/each}}
 {{/if}}
+{{/each}}
+{{/section}}
 
-{{#if r.education}}
+{{#section 'education'}}
 ## {{{sectionTitle "EDUCATION"}}}
 
 {{#each r.education.history}}
+{{#if url}}
+### [{{{ institution }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{else}}
 ### {{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{/if}}
 {{#if summary }}
 {{{ summary }}}
 {{/if}}
@@ -40,35 +70,39 @@
 {{#each courses}}
   - {{{ this }}}{{/each}}{{/if}}
 {{/each}}
-{{/if}}
+{{/section}}
-{{#if r.writing}}
+{{#section 'writing'}}
 ## WRITING
 
 {{#each r.writing}}
 ### {{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
 {{{ summary }}}
 {{/each}}
-{{/if}}
+{{/section}}
 
-{{#if r.service }}
+{{#section 'service'}}
 ## {{{sectionTitle "SERVICE"}}}
 
-{{#each r.service.history}}
+{{#each r.service.history }}
+{{#if url}}
+### [{{{ organization }}}]({{{ url }}}) ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{else}}
 ### {{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{/if}}
 {{{ summary }}}
 {{#if highlights}}
 {{#each highlights}}
   - {{{ this }}}
 {{/each}}
 {{/if}}
-
 {{/each}}
-{{/if}}
+{{/section}}
-{{#if r.recognition}}
+
+{{#section 'recognition'}}
 ## {{{sectionTitle "RECOGNITION"}}}
 
 {{#each r.recognition}}
-### {{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
+### *{{{ title }}}*, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
 {{{ summary }}}
 {{/each}}
-{{/if}}
+{{/section}}

themes/modern/src/modern-pdf.html

@@ -96,7 +96,7 @@
 </section>
 {{/if}}
 
-{{#hasSection 'projects'}}
+{{#section 'projects'}}
 <hr>
 <section id="projects">
   <header>
@@ -121,9 +121,9 @@
   {{/each}}
 
 </section>
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection 'education'}}
+{{#section 'education'}}
 <hr>
 <section id="education">
   <header>
@@ -143,7 +143,7 @@
   {{/each}}
 
 </section>
-{{/hasSection}}
+{{/section}}
 
 {{#if r.service}}
 <hr>

themes/modern/src/modern-txt.txt

@@ -1,24 +1,24 @@
 {{ r.name }}
-{{#if r.contact.email }}Email: {{{ r.contact.email }}}{{/if}}
+{{#has 'contact.email' }}Email: {{{ r.contact.email }}}{{/has}}
-{{#if r.contact.phone }}Tel: {{{ r.contact.phone }}}{{/if}}
+{{#has 'contact.phone' }}Tel: {{{ r.contact.phone }}}{{/has}}
-{{#if r.contact.website }}Web: {{{ r.contact.website }}}{{/if}}
+{{#has 'contact.website' }}Web: {{{ r.contact.website }}}{{/has}}
 ================================================================================
 
-{{#if r.info.brief }}{{{ r.info.brief }}}{{/if}}
+{{#has 'info.brief' }}{{{ r.info.brief }}}{{/has}}
 
-{{#hasSection "skills"}}
+{{#section "skills"}}
 {{{sectionTitle "SKILLS"}}} -------------------------------------------------------------------------
 
 {{#each r.skills.sets}}
 - {{{ name }}}: {{#each skills}}{{{ this }}} {{/each}}
 {{/each}}
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "employment"}}
+{{#section "employment"}}
 {{{sectionTitle "EMPLOYMENT"}}} ---------------------------------------------------------------------
 
 {{#each r.employment.history }}
-{{{ position }}}, {{{ employer }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
+{{{ position }}}, {{{ employer }}} ({{dateRange .}})
 {{{ summary }}}
 {{#if highlights}}
 {{#each highlights}}
@@ -27,13 +27,13 @@
 {{/if}}
 
 {{/each}}
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection 'projects'}}
+{{#section 'projects'}}
 {{{sectionTitle "PROJECTS"}}} -----------------------------------------------------------------------
 
 {{#each r.projects }}
-{{{ title }}}, {{{ role }}} ({{formatDate safe.start 'YYYY-MM' }} -- {{formatDate safe.end 'YYYY-MM' }})
+{{{ title }}}, {{{ role }}} ({{dateRange .}})
 {{{ description }}}
 {{{ summary }}}
 {{#if highlights}}
@@ -42,13 +42,13 @@
 {{/each}}
 {{/if}}
 {{/each}}
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "education"}}
+{{#section "education"}}
 {{{sectionTitle "EDUCATION"}}} ----------------------------------------------------------------------
 
 {{#each r.education.history}}
-{{{ institution }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{{ institution }}} ({{dateRange .}})
 {{#if summary }}
 {{{ summary }}}
 {{/if}}
@@ -59,22 +59,22 @@
 {{/if}}
 
 {{/each}}
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "writing"}}
+{{#section "writing"}}
 {{{sectionTitle "WRITING"}}} ------------------------------------------------------------------------
 
 {{#each r.writing}}
-{{{ title }}} ({{formatDate safe.date 'YYYY-MM' }})
+{{{ title }}}{{#has 'safe.date'}} ({{formatDate safe.date 'YYYY-MM' }}){{/has}}
 {{{ summary }}}
 {{/each}}
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "service" }}
+{{#section "service" }}
 {{{sectionTitle "SERVICE"}}} ------------------------------------------------------------------------
 
 {{#each r.service.history}}
-{{{ organization }}} ({{formatDate safe.start 'YYYY-MM' }} — {{formatDate safe.end 'YYYY-MM' }})
+{{{ organization }}} ({{dateRange .}})
 {{{ summary }}}
 {{#if highlights}}
 {{#each highlights}}
@@ -82,13 +82,13 @@
 {{/each}}
 {{/if}}
 {{/each}}
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "recognition"}}
+{{#section "recognition"}}
 {{{sectionTitle "RECOGNITION"}}} --------------------------------------------------------------------
 
 {{#each r.recognition}}
 {{{ title }}}, {{{ from }}} ({{formatDate safe.date 'MMM YYYY' }})
 {{{ summary }}}
 {{/each}}
-{{/hasSection}}
+{{/section}}

themes/positive/src/positive-doc.xml

@@ -528,12 +528,12 @@
         </w:r> -->
       </w:p>
       {{/has}}
-      {{#hasSection "skills"}}{{> skills }}{{/hasSection}}
+      {{#section "skills"}}{{> skills }}{{/section}}
-      {{#hasSection "employment"}}{{> employment }}{{/hasSection}}
+      {{#section "employment"}}{{> employment }}{{/section}}
-      {{#hasSection "education"}}{{> education }}{{/hasSection}}
+      {{#section "education"}}{{> education }}{{/section}}
-      {{#hasSection "service"}}{{> service }}{{/hasSection}}
+      {{#section "service"}}{{> service }}{{/section}}
-      {{#hasSection "writing"}}{{> writing }}{{/hasSection}}
+      {{#section "writing"}}{{> writing }}{{/section}}
-      {{#hasSection "recognition"}}{{> recognition }}{{/hasSection}}
+      {{#section "recognition"}}{{> recognition }}{{/section}}
       <w:sectPr wsp:rsidR="00B43FDC" wsp:rsidRPr="000A3AF0" wsp:rsidSect="001B7422">
         <w:pgSz w:w="12240" w:h="15840"/>
         <w:pgMar w:top="1440" w:right="1440" w:bottom="1440" w:left="1440" w:header="720" w:footer="720" w:gutter="0"/>

themes/positive/src/positive-html.html

@@ -27,7 +27,7 @@
 {{/has}}
 
 
-{{#hasSection "skills"}}
+{{#section "skills"}}
       <section id="skills">
         <header>
         <h2><span class="fa fa-code"></span> Skills</h2>
@@ -49,11 +49,11 @@
           </tbody>
         </table>
       </section>
-{{/hasSection}}
+{{/section}}
 
 
 
-{{#hasSection "employment"}}
+{{#section "employment"}}
       <section id="employment">
         <header>
         <h2><span class="fa fa-building" style="vertical-align: top;"></span> {{{sectionTitle "Employment"}}}</h2>
@@ -94,9 +94,36 @@
         {{/each}}
 
       </section>
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "education"}}
+{{#section 'projects'}}
+<hr>
+<section id="projects">
+  <header>
+  <h3>{{{sectionTitle "Projects"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.projects}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/section}}
+
+{{#section "education"}}
       <section id="education">
         <header>
         <h2><span class="fa fa-mortar-board"></span> {{{sectionTitle "Education"}}}</h2>
@@ -106,9 +133,9 @@
         {{/each}}
 
       </section>
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "service"}}
+{{#section "service"}}
       <section id="volunteer">
         <header>
         <h2><span class="fa fa-child" style="vertical-align: top;"></span> {{{sectionTitle "Service"}}}</h2>
@@ -132,9 +159,9 @@
         {{/each}}
 
       </section>
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "writing"}}
+{{#section "writing"}}
       <section id="publications">
         <header>
         <h2><span class="fa fa-book"></span> {{{sectionTitle "Writing"}}}</h2>
@@ -145,9 +172,9 @@
         {{# if summary}}{{{ summary }}}{{/if}}
         {{/each}}
       </section>
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "recognition"}}
+{{#section "recognition"}}
       <section id="awards">
         <header>
         <h2><span class="fa fa-trophy"></span> {{{"sectionTitle" "recognition" "Awards"}}}</h2>
@@ -157,7 +184,7 @@
           {{{ summary }}}
         {{/each}}
       </section>
-{{/hasSection}}
+{{/section}}
 
     </main>
   </body>

themes/positive/src/positive-pdf.html

@@ -28,7 +28,7 @@
 {{/has}}
 
 
-{{#hasSection "skills"}}
+{{#section "skills"}}
       <section id="skills">
         <header>
         <h2><span class="fa fa-code"></span> Skills</h2>
@@ -50,11 +50,11 @@
           </tbody>
         </table>
       </section>
-{{/hasSection}}
+{{/section}}
 
 
 
-{{#hasSection "employment"}}
+{{#section "employment"}}
       <section id="employment">
         <header>
         <h2><span class="fa fa-building" style="vertical-align: top;"></span> {{{sectionTitle "Employment"}}}</h2>
@@ -95,9 +95,36 @@
         {{/each}}
 
       </section>
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "education"}}
+{{#section 'projects'}}
+<hr>
+<section id="projects">
+  <header>
+  <h3>{{{sectionTitle "Projects"}}}</h3>
+  </header>
+  <span class="fa fa-lg fa-building"></span>
+  {{#each r.projects}}
+    {{#if url}}
+    <h4><span class="res-label">{{ role }}</span>, <a href="{{{ url }}}">{{ title }}</a></h4>
+    {{else}}
+    <h4><span class="res-label">{{ role }}</span>, <span class="defunct">{{ title }}</span></h4>
+    {{/if}}
+    <span class="tenure">{{formatDate safe.start 'YYYY-MM' }}&mdash;{{formatDate safe.end 'YYYY-MM' }}</span>
+    {{{ summary }}}
+    {{#if proj.highlights}}
+      <ul>
+      {{#each highlights}}
+        <li>{{{ this }}}</li>
+      {{/each}}
+      </ul>
+    {{/if}}
+  {{/each}}
+
+</section>
+{{/section}}
+
+{{#section "education"}}
       <section id="education">
         <header>
         <h2><span class="fa fa-mortar-board"></span> {{{sectionTitle "Education"}}}</h2>
@@ -107,9 +134,9 @@
         {{/each}}
 
       </section>
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "service"}}
+{{#section "service"}}
       <section id="volunteer">
         <header>
         <h2><span class="fa fa-child" style="vertical-align: top;"></span> {{{sectionTitle "Service"}}}</h2>
@@ -133,9 +160,9 @@
         {{/each}}
 
       </section>
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "writing"}}
+{{#section "writing"}}
       <section id="publications">
         <header>
         <h2><span class="fa fa-book"></span> {{{sectionTitle "Writing"}}}</h2>
@@ -146,9 +173,9 @@
         {{# if summary}}{{{ summary }}}{{/if}}
         {{/each}}
       </section>
-{{/hasSection}}
+{{/section}}
 
-{{#hasSection "recognition"}}
+{{#section "recognition"}}
       <section id="awards">
         <header>
         <h2><span class="fa fa-trophy"></span> {{{"sectionTitle" "recognition" "Awards"}}}</h2>
@@ -158,7 +185,7 @@
           {{{ summary }}}
         {{/each}}
       </section>
-{{/hasSection}}
+{{/section}}
 
     </main>
   </body>