1 files changed, 6 insertions, 14 deletions

diff --git a/default.jats b/default.jats
index 228a063..5fd3590 100644
--- a/default.jats
+++ b/default.jats
@@ -83,14 +83,14 @@ $for(author)$
 $if(author.orcid)$
 <contrib-id contrib-id-type="orcid">$author.orcid$</contrib-id>
 $endif$
-<name>
 $if(author.surname)$
+<name>
 <surname>$author.surname$</surname>
 <given-names>$author.given-names$</given-names>
+</name>
 $else$
 <string-name>$author$</string-name>
 $endif$
-</name>
 $if(author.email)$
 <email>$author.email$</email>
 $endif$
@@ -120,22 +120,14 @@ $endif$
 </author-notes>
 $endif$
 $if(date)$
-$if(date.iso-8601)$
-<pub-date pub-type="epub" iso-8601-date="$date.iso-8601$">
-$else$
-<pub-date pub-type="epub">
-$endif$
+<pub-date pub-type="epub"$if(date.iso-8601)$ iso-8601-date="$date.iso-8601$"$endif$>
 $if(date.day)$
-<day>$pub-date.day$</day>
+<day>$date.day$</day>
 $endif$
 $if(date.month)$
-<month>$pub-date.month$</month>
-$endif$
-$if(date.year)$
-<year>$pub-date.year$</year>
-$else$
-<string-date>$date$</string-date>
+<month>$date.month$</month>
 $endif$
+<year>$date.year$</year>
 </pub-date>
 $endif$
 $if(article.volume)$