4 files changed, 67 insertions, 21 deletions

diff --git a/article.jats_publishing b/article.jats_publishing
index ce184c0..b64425f 100644
--- a/article.jats_publishing
+++ b/article.jats_publishing
@@ -14,6 +14,13 @@ $endif$
 $if(journal.pmc)$
 <journal-id journal-id-type="pmc">$journal.pmc$</journal-id>
 $endif$
+$-- Fallback: an empty journal-id in case none is available.
+$if(journal.publisher-id)$
+$elseif(journal.nlm-ta)$
+$elseif(journal.pmc)$
+$else$
+<journal-id></journal-id>
+$endif$
 <journal-title-group>
 $if(journal.title)$
 <journal-title>$journal.title$</journal-title>
@@ -28,6 +35,12 @@ $endif$
 $if(journal.eissn)$
 <issn pub-type="epub">$journal.eissn$</issn>
 $endif$
+$-- At least one issn element is required; use empty issn as fallback
+$if(journal.pissn)$
+$elseif(journal.eissn)$
+$else$
+<issn></issn>
+$endif$
 <publisher>
 <publisher-name>$journal.publisher-name$</publisher-name>
 $if(journal.publisher-loc)$
diff --git a/default.latex b/default.latex
index 80f6a7f..b03c4d8 100644
--- a/default.latex
+++ b/default.latex
@@ -257,6 +257,7 @@ $highlighting-macros$
 $endif$
 $if(tables)$
 \usepackage{longtable,booktabs}
+\usepackage{calc} % for calculating minipage widths
 $if(beamer)$
 \usepackage{caption}
 % Make caption package work with longtable
@@ -383,10 +384,10 @@ $if(csl-refs)$
   \fi
  }%
  {}
-\usepackage{calc} % for \widthof, \maxof
+\usepackage{calc}
 \newcommand{\CSLBlock}[1]{#1\hfill\break}
-\newcommand{\CSLLeftMargin}[1]{\parbox[t]{\maxof{\widthof{#1}}{\csllabelwidth}}{#1}}
-\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth}{#1}}
+\newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{#1}}
+\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}}
 \newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1}
 $endif$
 
diff --git a/default.man b/default.man
index 5b16bdf..58e0789 100644
--- a/default.man
+++ b/default.man
@@ -1,5 +1,5 @@
 $if(has-tables)$
-.\"t
+'\" t
 $endif$
 $if(pandoc-version)$
 .\" Automatically generated by Pandoc $pandoc-version$
diff --git a/styles.html b/styles.html
index 3d7ebb5..e744d83 100644
--- a/styles.html
+++ b/styles.html
@@ -1,6 +1,6 @@
 $if(document-css)$
 html {
-  line-height: $if(linestretch)$$linestretch$$else$1.7$endif$;
+  line-height: $if(linestretch)$$linestretch$$else$1.5$endif$;
   font-family: $if(mainfont)$$mainfont$$else$Georgia, serif$endif$;
   font-size: $if(fontsize)$$fontsize$$else$20px$endif$;
   color: $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
@@ -8,7 +8,7 @@ html {
 }
 body {
   margin: 0 auto;
-  max-width: 40em;
+  max-width: 36em;
   padding-left: $if(margin-left)$$margin-left$$else$50px$endif$;
   padding-right: $if(margin-right)$$margin-right$$else$50px$endif$;
   padding-top: $if(margin-top)$$margin-top$$else$50px$endif$;
@@ -28,6 +28,7 @@ body {
   body {
     background-color: transparent;
     color: black;
+    font-size: 12pt;
   }
   p, h2, h3 {
     orphans: 3;
@@ -38,7 +39,7 @@ body {
   }
 }
 p {
-  margin-top: 1.7em;
+  margin: 1em 0;
 }
 a {
   color: $if(linkcolor)$$linkcolor$$else$#1a1a1a$endif$;
@@ -50,59 +51,90 @@ img {
   max-width: 100%;
 }
 h1, h2, h3, h4, h5, h6 {
-  margin-top: 1.7em;
+  margin-top: 1.4em;
+}
+h5, h6 {
+  font-size: 1em;
+  font-style: italic;
+}
+h6 {
+  font-weight: normal;
 }
 ol, ul {
   padding-left: 1.7em;
-  margin-top: 1.7em;
+  margin-top: 1em;
 }
 li > ol, li > ul {
   margin-top: 0;
 }
 blockquote {
-  margin: 1.7em 0 1.7em 1.7em;
+  margin: 1em 0 1em 1.7em;
   padding-left: 1em;
   border-left: 2px solid #e6e6e6;
-  font-style: italic;
+  color: #606060;
 }
 code {
   font-family: $if(monofont)$$monofont$$else$Menlo, Monaco, 'Lucida Console', Consolas, monospace$endif$;
-  background-color: #f0f0f0;
+$if(monobackgroundcolor)$
+  background-color: $monobackgroundcolor$;
+  padding: .2em .4em;
+$endif$
   font-size: 85%;
   margin: 0;
-  padding: .2em .4em;
 }
 pre {
-  line-height: 1.5em;
+  margin: 1em 0;
+$if(monobackgroundcolor)$
+  background-color: $monobackgroundcolor$;
   padding: 1em;
-  background-color: #f0f0f0;
+$endif$
   overflow: auto;
 }
 pre code {
   padding: 0;
   overflow: visible;
 }
+.sourceCode {
+ background-color: transparent;
+ overflow: visible;
+}
 hr {
   background-color: #1a1a1a;
   border: none;
   height: 1px;
-  margin-top: 1.7em;
+  margin: 1em 0;
 }
 table {
+  margin: 1em 0;
   border-collapse: collapse;
   width: 100%;
   overflow-x: auto;
   display: block;
+  font-variant-numeric: lining-nums tabular-nums;
+}
+table caption {
+  margin-bottom: 0.75em;
 }
-th, td {
-  border-bottom: 1px solid lightgray;
-  padding: 1em 3em 1em 0;
+tbody {
+  margin-top: 0.5em;
+  border-top: 1px solid $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
+  border-bottom: 1px solid $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
+}
+th {
+  border-top: 1px solid $if(fontcolor)$$fontcolor$$else$#1a1a1a$endif$;
+  padding: 0.25em 0.5em 0.25em 0.5em;
+}
+td {
+  padding: 0.125em 0.5em 0.25em 0.5em;
 }
 header {
-  margin-bottom: 6em;
+  margin-bottom: 4em;
   text-align: center;
 }
-nav a:not(:hover) {
+#TOC li {
+  list-style: none;
+}
+#TOC a:not(:hover) {
   text-decoration: none;
 }
 $endif$