diff --git a/quick-reference.markdown b/quick-reference.markdown
index 9032312..eee671c 100644
--- a/quick-reference.markdown
+++ b/quick-reference.markdown
@@ -204,6 +204,29 @@
 
 | Item                  | Element(s)            | Attributes                    | Notes
 | ----                  | ----------            | ----------                    | -----
+| definition            | `DD`                  |                               |
+|                       | `dd`                  |                               |
+|                       | `definition`          |                               |
+|                       | `description`         |                               |
+|                       | `discourse`           |                               |
+| definition list       | `definition-list`     |                               |
+|                       | `description-list`    |                               |
+|                       | `DL`                  |                               |
+|                       | `dl`                  |                               |
+| keyword               | `DT`                  | `[linebreak=`**`no`**`|yes]`  |
+|                       | `dt`                  |                               |
+|                       | `keyword`             |                               |
+|                       | `term`                |                               |
+|                       | `topic`               |                               |
+| list item             | `item`                | `[label=`*`<string>`*`]`      | `label` for ordered lists only
+|                       |                       | `[value=`*`<integer>`*`]`     | `value` for ordered lists only
+| ordered list          | `enumerate`           | `[start=`*`<integer>`*`]`     | **`1`**
+|                       | `enumerated-list`     |                               |
+|                       | `numbered-list`       |                               |
+|                       | `OL`                  |                               |
+|                       | `ol`                  |                               |
+|                       | `ordered-list`        |                               |
+|                       | `question-list`       |                               |
 | unordered list        | `bullet-list`         |                               |
 |                       | `bullet-points`       |                               |
 |                       | `bulleted-list`       |                               |
@@ -212,29 +235,32 @@
 |                       | `UL`                  |                               |
 |                       | `ul`                  |                               |
 |                       | `unordered-list`      |                               |
-| ordered list          | `enumerate`           | `[start=`*`<integer>`*`]`     | **`1`**
-|                       | `enumerated-list`     |                               |
-|                       | `numbered-list`       |                               |
-|                       | `OL`                  |                               |
-|                       | `ol`                  |                               |
-|                       | `ordered-list`        |                               |
-|                       | `question-list`       |                               |
-| definition list       | `definition-list`     |                               |
-|                       | `description-list`    |                               |
-|                       | `DL`                  |                               |
-|                       | `dl`                  |                               |
-| list item             | `item`                | `[label=`*`<string>`*`]`      | `label` for ordered lists only
-|                       |                       | `[value=`*`<integer>`*`]`     | `value` for ordered lists only
-| keyword               | `DT`                  | `[linebreak=`**`no`**`|yes]`  |
-|                       | `dt`                  |                               |
-|                       | `keyword`             |                               |
-|                       | `term`                |                               |
-|                       | `topic`               |                               |
-| definition            | `DD`                  |                               |
-|                       | `dd`                  |                               |
-|                       | `definition`          |                               |
-|                       | `description`         |                               |
-|                       | `discourse`           |                               |
+
+### Tabular material (`tabular.xml`)
+
+| Item                  | Element(s)            | Attributes                                    | Notes
+| ----                  | ----------            | ----------                                    | -----
+| tabular layout        | `tabular`             | `[align=center|centre|`**`left`**`|right]`    |
+|                       |                       | `[border=`*`<integer>`*`]`                    | **`0`**; HTML only
+|                       |                       | `[long-table=`**`no`**`|yes]`                 | LaTeX only
+|                       |                       | `[rotate=`*`<integer>`*`]`                    | LaTeX only
+|                       |                       | `[scale=`*`<decimal>`*`]`                     | LaTeX only
+|                       |                       | `[valign=bottom|`**`center|centre`**`|top]`   | LaTeX only
+| column                | `column`              | `[align=center|centre|`**`left`**`|right]`    |
+|                       |                       | `[left-border="|"]`                           | i.e., literal “`|`”
+|                       |                       | `[right-border="|"]`                          | i.e., literal “`|`”
+| tabular header        | `tabular-header`      |                                               |
+| tabular footer        | `tabular-footer`      |                                               |
+| tabular body          | `tabular-body`        |                                               |
+| row                   | `row`                 | `[page-break=no|`**`yes`**`]`                 | LaTeX only
+|                       |                       | `[valign=bottom|middle|top]`                  | HTML only
+| horizontal rule       | `row-rule`            | `[columns=`*`<integer>`*`]`                   | **`1`**
+|                       |                       | `[weight=double|`*`single`*`]`                |
+| cell                  | `cell`                | `[align=center|`**`left`**`|right]`           |
+|                       |                       | `[columns=`*`<integer>`*`]`                   | **`1`**
+|                       |                       | `[header=`**`no`**`|yes]`                     |
+|                       |                       | `[rows=`*`<integer>`*`]`                      | **`1`** (somewhat broken?)
+| caption               | `caption`             |                                               | onyl within long tables
 
 ### Bibliographies (`bibliography.xml`)
 
@@ -675,16 +701,3 @@
 modules/quotations.xml: <template name="nested-double-quote" match="quote//quote">
 modules/quotations.xml: <template name="nested-single-quote" match="quote[@single='yes']//quote" priority="2">
 modules/quotations.xml: <template name="quotation" match="quotation">
-modules/tabular.xml:    <template name="tabular" match="tabular">
-modules/tabular.xml:    <template name="aligned-tabular-column" match="tabular-columns/column[@align]">
-modules/tabular.xml:    <template name="unaligned-tabular-column" match="tabular-columns/column[not(@align)]">
-modules/tabular.xml:    <template name="tabular-header" match="tabular-header">
-modules/tabular.xml:    <template name="tabular-footer" match="tabular-footer">
-modules/tabular.xml:    <template name="tabular-body" match="tabular-body">
-modules/tabular.xml:    <template name="row" match="row">
-modules/tabular.xml:    <template name="last-row-body" match="tabular-body/row[( position() = last() ) and not( following-sibling::row-rule ) and not( ancestor::tabular/tabular-footer )]|tabular-footer/row[position() = last() and not( following-sibling::row-rule )]">
-modules/tabular.xml:    <template name="row-rule-full" match="row-rule[not(@columns)]">
-modules/tabular.xml:    <template name="row-rule-partial" match="row-rule[@columns]">
-modules/tabular.xml:    <template name="multirow-cell" match="cell" mode="latex-multi-row">
-modules/tabular.xml:    <template name="multicolumn-cell" match="cell" mode="latex-multi-column">
-modules/tabular.xml:    <template match="cell">