From 421bc71f6536e484b61403d7b7d7d259178654a6 Mon Sep 17 00:00:00 2001
From: devlinjd <james@indevious.com>
Date: Tue, 8 Dec 2015 10:14:29 -0500
Subject: [PATCH] Awesome: Fix baseline LaTeX generation.

---
 themes/awesome/awesome.json                         | 10 +++++-----
 themes/awesome/src/latex/examples/cv/education.tex  |  7 +++----
 themes/awesome/src/latex/examples/cv/experience.tex | 13 +++++--------
 .../awesome/src/latex/examples/cv/presentation.tex  |  2 +-
 themes/awesome/src/latex/examples/cv/writing.tex    |  2 +-
 .../awesome/src/latex/examples/resume/education.tex |  7 +++----
 .../src/latex/examples/resume/experience.tex        | 13 +++++--------
 .../src/latex/examples/resume/extracurricular.tex   |  2 +-
 .../src/latex/examples/resume/presentation.tex      |  2 +-
 .../awesome/src/latex/examples/resume/writing.tex   |  2 +-
 10 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/themes/awesome/awesome.json b/themes/awesome/awesome.json
index e43393e..84fc9f9 100644
--- a/themes/awesome/awesome.json
+++ b/themes/awesome/awesome.json
@@ -3,10 +3,10 @@
   "description": "A FluentCV résumé theme based on Awesome-CV for LaTeX.",
   "engine": "underscore",
   "delimeters": {
-    "interpolate": "\\[\\[(.+?)\\]\\]",
-    "escape": "\\[\\=(.+?)\\]\\]",
-    "evaluate": "\\[\\~(.+?)\\~\\]",
-    "comment": "\\[\\#(.+?)\\#\\]"
+    "interpolate": "\\[\\[([\\s\\S]+?)\\]\\]",
+    "escape": "\\[\\=([\\s\\S]+?)\\]\\]",
+    "evaluate": "\\[~([\\s\\S]+?)~]",
+    "comment": "\\[\\#([\\s\\S]+?)\\#\\]"
   },
   "formats": {
     "latex": {
@@ -29,7 +29,7 @@
         "src/latex/examples/cv/skills.tex",
         "src/latex/examples/cv/writing.tex"
       ],
-      "symlinks": {
+      "symLinks": {
         "src/latex/examples/awesome-cv.cls": "../awesome-cv.cls",
         "src/latex/examples/fontawesome.sty": "../fontawesome.sty",
         "src/latex/examples/fonts": "../fonts"
diff --git a/themes/awesome/src/latex/examples/cv/education.tex b/themes/awesome/src/latex/examples/cv/education.tex
index 65ba774..6e32135 100644
--- a/themes/awesome/src/latex/examples/cv/education.tex
+++ b/themes/awesome/src/latex/examples/cv/education.tex
@@ -7,15 +7,14 @@
     {[[ edu.institution ]]}
     {[[ edu.location ]]}
     {[[ edu.safe.start ]] - [[ edu.safe.end ]]}
-    [~ if( edu.highlights && edu.highlights.length ) { ~]
-    {
+    [~ if( edu.highlights && edu.highlights.length ) {
+    ~]{
       \begin{cvitems}
         [~ _.each(edu.highlights, function(high) { ~]
         \item {[[ high ]]}
         [~ }); ~]
       \end{cvitems}
-    }
-    [~ } ~]
+    }[~ } else { ~]{ }[~ } ~]
 [~ }); ~]
 \end{cventries}
 [~ } ~]
diff --git a/themes/awesome/src/latex/examples/cv/experience.tex b/themes/awesome/src/latex/examples/cv/experience.tex
index 37f5d28..72ab2df 100644
--- a/themes/awesome/src/latex/examples/cv/experience.tex
+++ b/themes/awesome/src/latex/examples/cv/experience.tex
@@ -7,15 +7,12 @@
     {[[ emp.employer ]]}
     {[[ emp.location ]]}
     {[[ emp.safe.start ]] - [[ emp.safe.end ]]}
-    [~ if( emp.highlights && emp.highlights.length ) { ~]
-    {
-      \begin{cvitems}
-      [~ _.each( emp.highlights, function(high) { ~]
-        \item {[[ high ]]}
-      [~ }); ~]
+    [~ if( emp.highlights && emp.highlights.length ) {
+    ~]{
+      \begin{cvitems}[~ _.each( emp.highlights, function(high) { ~]
+        \item {[[ high.replace(/#/g, '\\#') ]]}[~ }); ~]
       \end{cvitems}
-    }
-    [~ } ~]
+    }[~ } ~]
 [~ }); ~]
 \end{cventries}
 [~ } ~]
diff --git a/themes/awesome/src/latex/examples/cv/presentation.tex b/themes/awesome/src/latex/examples/cv/presentation.tex
index 5b4c80b..f2f6c8b 100644
--- a/themes/awesome/src/latex/examples/cv/presentation.tex
+++ b/themes/awesome/src/latex/examples/cv/presentation.tex
@@ -15,7 +15,7 @@
         [~ }); ~]
       \end{cvitems}
     }
-    [~ } ~]
+    [~ } else { ~]{ }[~ } ~]
   [~ }); ~]
 \end{cventries}
 [~ } ~]
diff --git a/themes/awesome/src/latex/examples/cv/writing.tex b/themes/awesome/src/latex/examples/cv/writing.tex
index a3f18ef..45117b3 100644
--- a/themes/awesome/src/latex/examples/cv/writing.tex
+++ b/themes/awesome/src/latex/examples/cv/writing.tex
@@ -15,7 +15,7 @@
         [~ }); ~]
       \end{cvitems}
     }
-    [~ } ~]
+    [~ } else { ~]{ }[~ } ~]
 [~ }); ~]
 \end{cventries}
 [~ } ~]
diff --git a/themes/awesome/src/latex/examples/resume/education.tex b/themes/awesome/src/latex/examples/resume/education.tex
index 65ba774..6e32135 100644
--- a/themes/awesome/src/latex/examples/resume/education.tex
+++ b/themes/awesome/src/latex/examples/resume/education.tex
@@ -7,15 +7,14 @@
     {[[ edu.institution ]]}
     {[[ edu.location ]]}
     {[[ edu.safe.start ]] - [[ edu.safe.end ]]}
-    [~ if( edu.highlights && edu.highlights.length ) { ~]
-    {
+    [~ if( edu.highlights && edu.highlights.length ) {
+    ~]{
       \begin{cvitems}
         [~ _.each(edu.highlights, function(high) { ~]
         \item {[[ high ]]}
         [~ }); ~]
       \end{cvitems}
-    }
-    [~ } ~]
+    }[~ } else { ~]{ }[~ } ~]
 [~ }); ~]
 \end{cventries}
 [~ } ~]
diff --git a/themes/awesome/src/latex/examples/resume/experience.tex b/themes/awesome/src/latex/examples/resume/experience.tex
index 37f5d28..72ab2df 100644
--- a/themes/awesome/src/latex/examples/resume/experience.tex
+++ b/themes/awesome/src/latex/examples/resume/experience.tex
@@ -7,15 +7,12 @@
     {[[ emp.employer ]]}
     {[[ emp.location ]]}
     {[[ emp.safe.start ]] - [[ emp.safe.end ]]}
-    [~ if( emp.highlights && emp.highlights.length ) { ~]
-    {
-      \begin{cvitems}
-      [~ _.each( emp.highlights, function(high) { ~]
-        \item {[[ high ]]}
-      [~ }); ~]
+    [~ if( emp.highlights && emp.highlights.length ) {
+    ~]{
+      \begin{cvitems}[~ _.each( emp.highlights, function(high) { ~]
+        \item {[[ high.replace(/#/g, '\\#') ]]}[~ }); ~]
       \end{cvitems}
-    }
-    [~ } ~]
+    }[~ } ~]
 [~ }); ~]
 \end{cventries}
 [~ } ~]
diff --git a/themes/awesome/src/latex/examples/resume/extracurricular.tex b/themes/awesome/src/latex/examples/resume/extracurricular.tex
index a05998a..25cef35 100644
--- a/themes/awesome/src/latex/examples/resume/extracurricular.tex
+++ b/themes/awesome/src/latex/examples/resume/extracurricular.tex
@@ -15,7 +15,7 @@
         [~ }); ~]
       \end{cvitems}
     }
-    [~ } ~]
+    [~ } else { ~]{ }[~ } ~]
   [~ }); ~]
 \end{cventries}
 [~ } ~]
diff --git a/themes/awesome/src/latex/examples/resume/presentation.tex b/themes/awesome/src/latex/examples/resume/presentation.tex
index 5b4c80b..f2f6c8b 100644
--- a/themes/awesome/src/latex/examples/resume/presentation.tex
+++ b/themes/awesome/src/latex/examples/resume/presentation.tex
@@ -15,7 +15,7 @@
         [~ }); ~]
       \end{cvitems}
     }
-    [~ } ~]
+    [~ } else { ~]{ }[~ } ~]
   [~ }); ~]
 \end{cventries}
 [~ } ~]
diff --git a/themes/awesome/src/latex/examples/resume/writing.tex b/themes/awesome/src/latex/examples/resume/writing.tex
index a3f18ef..45117b3 100644
--- a/themes/awesome/src/latex/examples/resume/writing.tex
+++ b/themes/awesome/src/latex/examples/resume/writing.tex
@@ -15,7 +15,7 @@
         [~ }); ~]
       \end{cvitems}
     }
-    [~ } ~]
+    [~ } else { ~]{ }[~ } ~]
 [~ }); ~]
 \end{cventries}
 [~ } ~]