From 57d34c3d319b084f58f9048ebfba1e5f121f45fa Mon Sep 17 00:00:00 2001
From: Sina Atalay <sina.atalay@cern.ch>
Date: Sat, 9 Mar 2024 18:53:29 +0100
Subject: [PATCH] update PublicationEntry templates for optional DOI

---
 rendercv/themes/classic/PublicationEntry.j2.tex  |  9 ++++++++-
 rendercv/themes/markdown/PublicationEntry.j2.md  |  2 +-
 rendercv/themes/moderncv/PublicationEntry.j2.tex |  6 +++++-
 rendercv/themes/sb2nov/PublicationEntry.j2.tex   | 11 ++++++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/rendercv/themes/classic/PublicationEntry.j2.tex b/rendercv/themes/classic/PublicationEntry.j2.tex
index 92e5451..09d4486 100644
--- a/rendercv/themes/classic/PublicationEntry.j2.tex
+++ b/rendercv/themes/classic/PublicationEntry.j2.tex
@@ -15,7 +15,14 @@
 
     \vspace{<<design.margins.highlights_area.vertical_between_bullet_points>>}
 
-    \href{<<entry.doi_url>>}{<<entry.doi>>} ((* if not entry.journal == "" *))(<<entry.journal>>)((* endif *))
+    ((*- if entry.doi != "" -*))
+    \href{<<entry.doi_url>>}{<<entry.doi>>}
+    ((*- endif -*))
+    ((*- if entry.doi != "" and entry.journal != "" *)) (((* endif -*))
+    ((*- if entry.journal != "" -*))
+    <<entry.journal>>
+    ((*- endif -*))
+    ((*- if entry.doi != "" and entry.journal != "" *)))((* endif -*))
     &
     <<entry.date_string>>
 \end{tabularx}
diff --git a/rendercv/themes/markdown/PublicationEntry.j2.md b/rendercv/themes/markdown/PublicationEntry.j2.md
index 49f73de..e38315d 100644
--- a/rendercv/themes/markdown/PublicationEntry.j2.md
+++ b/rendercv/themes/markdown/PublicationEntry.j2.md
@@ -1,4 +1,4 @@
-## <<entry.title>> ([<<entry.doi>>](<<entry.doi_url>>))
+## <<entry.title>> ((* if entry.doi != "" *))([<<entry.doi>>](<<entry.doi_url>>))((* endif *))
 
 - <<entry.date_string>>
 - <<entry.authors|join(", ")>>
diff --git a/rendercv/themes/moderncv/PublicationEntry.j2.tex b/rendercv/themes/moderncv/PublicationEntry.j2.tex
index f382540..1862b0c 100644
--- a/rendercv/themes/moderncv/PublicationEntry.j2.tex
+++ b/rendercv/themes/moderncv/PublicationEntry.j2.tex
@@ -1,2 +1,6 @@
-\cventry{<<entry.date_string>>}{<<entry.title>>}{<<entry.journal>>}{\href{<<entry.doi_url>>}{<<entry.doi>>}}{}{}
+\cventry{<<entry.date_string>>}{<<entry.title>>}{<<entry.journal>>}{
+((*- if entry.doi != "" -*))
+\href{<<entry.doi_url>>}{<<entry.doi>>}
+((*- endif -*))
+}{}{}
 \cvline{}{\small <<entry.authors|map("make_it_nolinebreak")|join(", ")>>}
\ No newline at end of file
diff --git a/rendercv/themes/sb2nov/PublicationEntry.j2.tex b/rendercv/themes/sb2nov/PublicationEntry.j2.tex
index 218b8f9..4f1f1f6 100644
--- a/rendercv/themes/sb2nov/PublicationEntry.j2.tex
+++ b/rendercv/themes/sb2nov/PublicationEntry.j2.tex
@@ -1,6 +1,15 @@
 \resumeSubheading
     {<<entry.title>>}{<<entry.date_string>>}
-    {\href{<<entry.doi_url>>}{<<entry.doi>>} ((* if not entry.journal == "" *))(<<entry.journal>>)((* endif *))}{}
+    {
+((*- if entry.doi != "" -*))
+\href{<<entry.doi_url>>}{<<entry.doi>>}
+((*- endif -*))
+((*- if entry.doi != "" and entry.journal != "" *)) (((* endif -*))
+((*- if entry.journal != "" -*))
+<<entry.journal>>
+((*- endif -*))
+((*- if entry.doi != "" and entry.journal != "" *)))((* endif -*))
+}{}
     \resumeItemListStart
         \resumeItem{}{\raggedright <<entry.authors|map("make_it_nolinebreak")|join(", ")>> \par}
     \resumeItemListEnd
\ No newline at end of file