fix taxonomy issues

layouts/tools/page.html

@@ -26,19 +26,21 @@
     <h2>At a Glance</h2>
     <table id="taxonomy-table">
       <tbody>
+        {{ $params := .Params }}
         {{ range $taxonomyname, $taxonomy := .Site.Taxonomies }}
-        {{ with $taxonomy }}
-        <tr>
-          <td>
-            <a 
+          {{ $terms := index $params $taxonomyname }}
+          {{ if $terms }}
+          <tr>
+            <td>
+              <a 
               class="taxonomy-name" 
               href="{{ "/" | relLangURL }}{{ $taxonomyname }}">
               {{ $taxonomyname | strings.FirstUpper }}
             </a>
-            </td>
+          </td>
           <td>
-            {{ range $key, $value := $taxonomy }}
-              {{ partial "term-link.html" (dict "name" $key "taxonomy" $taxonomyname) }}
+            {{ range $term := $terms }}
+              {{ partial "term-link.html" (dict "name" $term "taxonomy" $taxonomyname) }}
             {{ end }}
           </td>
         </tr>
@@ -54,21 +56,29 @@
   </section>
   
   {{ with .Params.publications}}
-  <section>
+  <section id="publications">
     <h2>Publications</h2>
     <ul>
       {{ range $citation, $pub := site.Data.publications }}
       {{ range $pub }}
       {{ if in $.Params.publications .key }}
       <li>
-        {{ if .year }} <strong>{{ .year }}</strong>: {{ end }}
-        {{ if .title }} <em>{{ .title }}</em> {{ end }}
-        {{ if .author }} <br /> by {{ delimit .author " | " | html }} {{ end }}
-        {{ if .booktitle }} <br />Appears in <em>{{ .booktitle }}</em> {{ end }}
-        {{ if .journal }} <br />Appears in <em>{{ .journal }}</em> {{ end }}
-        {{ if .volume }} <strong>{{ .volume }}</strong> {{ end }}
+        {{ if .title }} <strong>{{ .title }}</strong> {{ end }}
+        {{ if .year }}
+        {{ if .month }}
+          ({{ .month }} {{.year }}) 
+        {{ else }}
+          ({{ .year }}) 
+        {{ end }}
+        {{ end }}
+        {{ if .author }} by {{ index .author 0 }}{{ if (gt (len .author) 1) }} et. al. {{ end }}{{ end }}
+        {{ if .booktitle }}  | Appears in <em>{{ .booktitle }}</em> {{ end }}
         {{ if .pages }} ({{ .pages }}) {{ end }}
-        {{ if .doi }} <br /><a href="https://doi.org/{{ . }}" target="_blank" rel="noopener">DOI: {{ .doi }}</a> {{ end }}
+        {{ if .journal }}  | Appears in <em>{{ .journal }}</em> {{ end }}
+        {{ if .volume }} | Volume {{ .volume }} {{ end }}
+        {{ if .publisher }}  | Published by <em>{{ .publisher }}</em> {{ end }}
+        {{ if .doi }} <br /><a href="https://doi.org/{{ . }}" target="_blank" rel="noopener">{{ .doi }}</a> 
+        {{ else if .url }} <br /><a href="{{ . }}" target="_blank" rel="noopener">{{ .url }}</a> {{ end }}
       </li>
       {{ end }}
       {{ end }}