Implement caption, widths, alignment, thead, and tbody

Author: jarrodmillman

assets/theme-css/styles.css

@@ -168,7 +168,7 @@ a.headerlink {
   visibility: hidden;
 }
 
-:is(h1, h2, h3, h4, h5, h6):hover > a.headerlink {
+:is(h1, h2, h3, h4, h5, h6, caption):hover > a.headerlink {
   visibility: visible;
 }
 

layouts/shortcodes/tomlToTable.html

@@ -5,13 +5,13 @@
 {{< tomlToTable >}}
 
 caption = 'Table caption'
-align = [ "left", "left", "right" ]
-header-rows = 1
+align = ["left", "left", "right"]
+widths = ["10%", "50%", "20%"]
+headerrows = 1
 footer-rows = 3
 stub-columns = 1
 
 [[row]]
-type = 'header'
 
 [[row.column]]
 body = 'Project'
@@ -44,35 +44,55 @@
 **Windows**, **Linux**, and **Mac OS X**'''
 
 [[row.column]]
-align = 'right'
 body = '''[SciPy release page](https://github.com/scipy/scipy/releases) (sources)<br />
 [PyPI page for SciPy](https://pypi.python.org/pypi/scipy) (all)'''
 
 {{< /tomlToTable >}}
 
 */}}
 
-{{ $arg := .Get 0 }}
-{{ $data := .Inner | transform.Unmarshal }}
-
-{{ with $data }}
-<table class="table">
-  {{ range $i, $row := .row }}
-  {{if (modBool $i 2)}}
-  <tr class="row-odd">
-  {{else}}
-  <tr class="row-even">
-  {{end}}
-    {{ $el := "td" }}
-    {{ if (eq $row.type "header") }}
-    {{ $el = "th class='head'" }}
-    {{ end }}
-    {{ range $col := .column }}
-    {{ printf "<%s" $el | safeHTML }} colspan="{{ $col.colspan }}" rowspan="{{ $col.rowspan }}" {{ printf ">" | safeHTML }}
-      {{ $col.body | markdownify }}
-    {{ printf "</%s>" $el | safeHTML }}
-    {{ end }}
-  </tr>
+{{- $data := .Inner | transform.Unmarshal }}
+{{- $id := printf "id%03d" $.Ordinal -}}
+{{- $align := $data.align }}
+{{- $numrows := $data.row | len }}
+{{- $headerrows := or $data.headerrows 0 }}
+{{- $header := first $headerrows $data.row }}
+{{- $body := last (math.Sub $numrows $headerrows) $data.row }}
+
+<table class="table" id="{{ $id }}">
+  {{- with $data.caption }}
+    <caption><span class="caption-text">{{ . }}</span><a class="headerlink" href="#{{ $id }}" title="Link to this table">#</a></caption>
+  {{- end }}
+  {{- with $data.widths }}
+    <colgroup>
+      {{- range . }}
+        <col style="width: {{ . }}" />
+      {{- end }}
+    </colgroup>
   {{ end }}
+  {{- if $header }}<thead>
+  {{- range $row_idx, $row := $header }}
+    {{ if (modBool $row_idx 2) }}<tr class="row-odd">{{- else }}<tr class="row-even">{{- end }}
+    {{- range $col_idx, $col := .column }}
+      {{- $alignment := or (index $align $col_idx) "left" }}
+      <th class="head" style="text-align:{{ $alignment }}">
+        {{ $col.body | markdownify }}
+      </th>
+    {{- end }}
+    </tr>
+  {{- end }}
+  </thead>
+  {{- end }}
+  <tbody>
+  {{- range $row_idx, $row := $body }}
+    {{ if (modBool (add $row_idx $headerrows) 2) }}<tr class="row-odd">{{- else }}<tr class="row-even">{{- end }}
+    {{- range $col_idx, $col := .column }}
+      {{- $alignment := or (index $align $col_idx) "left" }}
+      <td class="head" style="text-align:{{ $alignment }}">
+        {{ $col.body | markdownify }}
+      </td>
+    {{- end }}
+     </tr>
+  {{- end }}
+  </tbody>
 </table>
-{{ end }}