diff --git a/quick-reference.markdown b/quick-reference.markdown
index 976c683..fcb0194 100644
--- a/quick-reference.markdown
+++ b/quick-reference.markdown
@@ -15,7 +15,7 @@
 | horizontal rule   | `horizontal-rule` |                                                       |
 |                   | `hr`              |                                                       |
 |                   | `hrule`           |                                                       |
-| horizontal skip   | `horizontal-skip` | `size=fill|`*`<LaTeX length>`*                        | no effect in HTML
+| horizontal skip   | `horizontal-skip` | `size=fill|`*`<LaTeX length>`*                        | HTML: no effect
 |                   | `hskip`           |                                                       |
 | forced line break | `br`              |                                                       |
 |                   | `line-break`      |                                                       |
@@ -112,6 +112,195 @@
 | citation              | `cite`            |                                   |
 | cited item            | `item`            | `label=`*`<string>`*              | within `<cite>`
 
+## Maths
+
+### Equations, etc. (`maths.xml`)
+
+| Item                  | Element(s)                | Attributes                        | Notes
+| ----                  | ----------                | ----------                        | -----
+| calligraphic text     | `calligraphic`            |                                   | LaTeX: `\mathcal`
+|                       | `cursive`                 |                                   |
+| denominator           | `denominator`             |                                   | within `<fraction>`
+| digit group separator | `digit-group-separator`   |                                   | **thin space**
+|                       | `digitsep`                |                                   |
+| equation array        | `equation-array`          |                                   |
+| equation array row    | `row`                     |                                   | within `<equation-array>`
+|                       | `text`                    |                                   |
+| formula               | `math`                    | `[style=display|`**`inline`**`]`  |
+| fraction              | `fraction`                |                                   |
+| log-like function     | `function`                |                                   |
+| numerator             | `numerator`               |                                   | within `<fraction>`
+| subscript             | `subscript`               |                                   | within `<math>`
+| superscript           | `superscript`             |                                   | within `<math>`
+| variable              | `var`                     |                                   |
+|                       | `variable`                |                                   |
+
+### Symbols (`mathematical-symbols.xml`)
+
+| Item                  | Element(s)                        | Attributes                        | Notes
+| ----                  | ----------                        | ----------                        | -----
+| +                     | `plus`                            |                                   | U+002B PLUS SIGN
+|                       | `plus-sign`                       |                                   |
+| ×                     | `times`                           |                                   | U+00D7 MULTIPLICATION SIGN
+|                       | `multiply`                        |                                   |
+|                       | `multiplication`                  |                                   |
+|                       | `multiplication-sign`             |                                   |
+| −                     | `minus`                           |                                   | U+2212 MINUS SIGN
+|                       | `minus-sign`                      |                                   |
+|                       | `subtract`                        |                                   |
+| ∕                     | `divide`                          |                                   | U+2215 DIVISION SLASH
+|                       | `division`                        |                                   |
+|                       | `division-slash`                  |                                   |
+| =                     | `eq`                              |                                   | U+003D EQUALS SIGN
+|                       | `equality`                        |                                   |
+|                       | `equals`                          |                                   |
+|                       | `equals-sign`                     |                                   |
+| ≠                     | `ne`                              |                                   | U+2260 NOT EQUAL TO
+|                       | `not-equal-to`                    |                                   |
+|                       | `not-equals`                      |                                   |
+|                       | `inequality`                      |                                   |
+| ≈                     | `almost-equal-to`                 |                                   | U+2248 ALMOST EQUAL TO
+|                       | `approx`                          |                                   |
+|                       | `approximately-equal-to`          |                                   |
+|                       | `approximately-equals`            |                                   |
+| >                     | `greater-than`                    |                                   | U+003E GREATER-THAN SIGN
+|                       | `greater-than-sign`               |                                   |
+|                       | `gt`                              |                                   |
+| ≥                     | `ge`                              |                                   | U+2265 GREATER-THAN OR EQUAL TO
+|                       | `greater-equals`                  |                                   |
+|                       | `greater-than-or-equal-to`        |                                   |
+| <                     | `less-than`                       |                                   | U+003C LESS-THAN SIGN
+|                       | `less-than-sign`                  |                                   |
+|                       | `lt`                              |                                   |
+| ≤                     | `le`                              |                                   | U+2264 LESS-THAN OR EQUAL TO
+|                       | `less-equals`                     |                                   |
+|                       | `less-than-or-equal-to`           |                                   |
+| ∅                     | `empty-set`                       |                                   | U+2205 EMPTY SET
+|                       | `empty-set-sign`                  |                                   |
+|                       | `null`                            |                                   |
+| ∈                     | `element`                         |                                   | U+2208 ELEMENT OF
+|                       | `element-of`                      |                                   |
+|                       | `element-sign`                    |                                   |
+|                       | `is-an-element-of`                |                                   |
+|                       | `is-element-of`                   |                                   |
+| ∉                     | `is-not-an-element-of`            |                                   | U+2209 NOT AN ELEMENT OF
+|                       | `is-not-element-of`               |                                   |
+|                       | `not-an-element-of`               |                                   |
+|                       | `not-element`                     |                                   |
+|                       | `not-element-of`                  |                                   |
+|                       | `not-element-sign`                |                                   |
+| ∩                     | `cap`                             |                                   | U+2229 INTERSECTION
+|                       | `intersect`                       |                                   |
+|                       | `intersect-operator`              |                                   |
+|                       | `intersection`                    |                                   |
+| ∪                     | `cup`                             |                                   | U+222A UNION
+|                       | `union`                           |                                   |
+|                       | `union-operator`                  |                                   |
+| ⊂                     | `is-a-subset-of`                  |                                   | U+2282 SUBSET OF
+|                       | `is-subset-of`                    |                                   |
+|                       | `strict-subset`                   |                                   |
+|                       | `subset`                          |                                   |
+|                       | `subset-of`                       |                                   |
+|                       | `subset-sign`                     |                                   |
+| ⊃                     | `is-a-superset-of`                |                                   | U+2283 SUPERSET OF
+|                       | `is-superset-of`                  |                                   |
+|                       | `superset`                        |                                   |
+|                       | `superset-of`                     |                                   |
+|                       | `superset-sign`                   |                                   |
+| ⊆                     | `inclusive-subset`                |                                   | U+2286 SUBSET OF OR EQUAL TO
+|                       | `is-a-subset-of-or-equal-to`      |                                   |
+|                       | `is-subset-of-or-equal-to`        |                                   |
+|                       | `subset-of-or-equal-to`           |                                   |
+|                       | `subset-or-equal`                 |                                   |
+| ⊇                     | `inclusive-superset`              |                                   | U+2287 SUPERSET OF OR EQUAL TO
+|                       | `is-a-superset-of-or-equal-to`    |                                   |
+|                       | `is-superset-of-or-equal-to`      |                                   |
+|                       | `superset-of-or-equal-to`         |                                   |
+|                       | `superset-or-equal`               |                                   |
+| ¬                     | `neg`                             |                                   | U+00AC NOT SIGN
+|                       | `negation`                        |                                   |
+|                       | `logical-negation`                |                                   |
+|                       | `logical-negation-operator`       |                                   |
+|                       | `logical-not`                     |                                   |
+|                       | `logical-not-operator`            |                                   |
+|                       | `not`                             |                                   |
+|                       | `not-sign`                        |                                   |
+| ∧                     | `and`                             |                                   | U+2227 LOGICAL AND
+|                       | `and-operator`                    |                                   |
+|                       | `hat`                             |                                   |
+|                       | `logical-and`                     |                                   |
+|                       | `logical-and-operator`            |                                   |
+|                       | `wedge`                           |                                   |
+| ∨                     | `logical-or`                      |                                   | U+2228 LOGICAL OR
+|                       | `logical-or-operator`             |                                   |
+|                       | `or`                              |                                   |
+|                       | `or-operator`                     |                                   |
+|                       | `vee`                             |                                   |
+| →, ⇒                  | `implies`                         | `[weight=double|`**`single`**`]`  | U+2192 RIGHTWARDS ARROW
+|                       | `rarr`                            |                                   | U+21D2 RIGHTWARDS DOUBLE ARROW
+|                       | `rarrow`                          |                                   |
+|                       | `right-arrow`                     |                                   |
+|                       | `rightarrow`                      |                                   |
+|                       | `rightwards-arrow`                |                                   |
+| ←, ⇐                  | `larr`                            | `[weight=double|`**`single`**`]`  | U+2190 LEFTWARDS ARROW
+|                       | `larrow`                          |                                   | U+21D0 LEFTWARDS DOUBLE ARROW
+|                       | `left-arrow`                      |                                   |
+|                       | `leftarrow`                       |                                   |
+|                       | `leftwards-arrow`                 |                                   |
+
+### Greek (`greek-characters.xml`)
+
+| Item                  | Element(s)        | Attributes    | Notes
+| ----                  | ----------        | ----------    | -----
+| α                     | `alpha`           |               | U+03B1 GREEK SMALL LETTER ALPHA
+| Α                     | `capital-alpha`   |               | U+0391 GREEK CAPITAL LETTER ALPHA
+| β                     | `beta`            |               | U+03B2 GREEK SMALL LETTER BETA
+| Β                     | `capital-beta`    |               | U+0392 GREEK CAPITAL LETTER BETA
+| γ                     | `gamma`           |               | U+03B3 GREEK SMALL LETTER GAMMA
+| Γ                     | `capital-gamma`   |               | U+0393 GREEK CAPITAL LETTER GAMMA
+| δ                     | `delta`           |               | U+03B4 GREEK SMALL LETTER DELTA
+| Δ                     | `capital-delta`   |               | U+0394 GREEK CAPITAL LETTER DELTA
+| ε                     | `epsilon`         |               | U+03B5 GREEK SMALL LETTER EPSILON
+| Ε                     | `capital-epsilon` |               | U+0395 GREEK CAPITAL LETTER EPSILON
+| ζ                     | `zeta`            |               | U+03B6 GREEK SMALL LETTER ZETA
+| Ζ                     | `capital-zeta`    |               | U+0396 GREEK CAPITAL LETTER ZETA
+| η                     | `eta`             |               | U+03B7 GREEK SMALL LETTER ETA
+| Η                     | `capital-eta`     |               | U+0397 GREEK CAPITAL LETTER ETA
+| θ                     | `theta`           |               | U+03B8 GREEK SMALL LETTER THETA
+| Θ                     | `capital-theta`   |               | U+0398 GREEK CAPITAL LETTER THETA
+| ι                     | `iota`            |               | U+03B9 GREEK SMALL LETTER IOTA
+| Ι                     | `capital-iota`    |               | U+0399 GREEK CAPITAL LETTER IOTA
+| κ                     | `kappa`           |               | U+03BA GREEK SMALL LETTER KAPPA
+| Κ                     | `capital-kappa`   |               | U+039A GREEK CAPITAL LETTER KAPPA
+| λ                     | `lambda`          |               | U+03BB GREEK SMALL LETTER LAMBDA
+| Λ                     | `capital-lambda`  |               | U+039B GREEK CAPITAL LETTER LAMBDA
+| μ                     | `mu`              |               | U+03BC GREEK SMALL LETTER MU
+| Μ                     | `capital-mu`      |               | U+039C GREEK CAPITAL LETTER MU
+| ν                     | `nu`              |               | U+03BD GREEK SMALL LETTER NU
+| Ν                     | `capital-nu`      |               | U+039D GREEK CAPITAL LETTER NU
+| ξ                     | `xi`              |               | U+03BE GREEK SMALL LETTER XI
+| Ξ                     | `capital-xi`      |               | U+039E GREEK CAPITAL LETTER XI
+| ο                     | `omicron`         |               | U+03BF GREEK SMALL LETTER OMICRON
+| Ο                     | `capital-omicron` |               | U+039F GREEK CAPITAL LETTER OMICRON
+| π                     | `pi`              |               | U+03C0 GREEK SMALL LETTER PI
+| Π                     | `capital-pi`      |               | U+03A0 GREEK CAPITAL LETTER PI
+| ρ                     | `rho`             |               | U+03C1 GREEK SMALL LETTER RHO
+| Ρ                     | `capital-rho`     |               | U+03A1 GREEK CAPITAL LETTER RHO
+| σ                     | `sigma`           |               | U+03C2 GREEK SMALL LETTER SIGMA
+| Σ                     | `capital-sigma`   |               | U+03A3 GREEK CAPITAL LETTER SIGMA
+| τ                     | `tau`             |               | U+03C4 GREEK SMALL LETTER TAU
+| Τ                     | `capital-tau`     |               | U+03A4 GREEK CAPITAL LETTER TAU
+| υ                     | `upsilon`         |               | U+03C5 GREEK SMALL LETTER UPSILON
+| Υ                     | `capital-upsilon` |               | U+03A5 GREEK CAPITAL LETTER UPSILON
+| φ                     | `phi`             |               | U+03C6 GREEK PHI SYMBOL (for consistency with LaTeX)
+| Φ                     | `capital-phi`     |               | U+03A6 GREEK CAPITAL LETTER PHI
+| χ                     | `chi`             |               | U+03C7 GREEK SMALL LETTER CHI
+| Χ                     | `capital-chi`     |               | U+03A7 GREEK CAPITAL LETTER CHI
+| ψ                     | `psi`             |               | U+03C8 GREEK SMALL LETTER PSI
+| Ψ                     | `capital-psi`     |               | U+03A8 GREEK CAPITAL LETTER PSI
+| ω                     | `omega`           |               | U+03C9 GREEK SMALL LETTER OMEGA
+| Ω                     | `capital-omega`   |               | U+03A9 GREEK CAPITAL LETTER OMEGA
+
 ## Miscellaneous
 
 ### Document build date (`build-date.xml`)
@@ -127,6 +316,22 @@
 | ----                  | ----------        | ----------                            | -----
 | process when format   | `process-when`    | `format=latex|html`                   |
 
+### Global elements (`global-elements.xml`)
+
+| Item                  | Element(s)            | Attributes                            | Notes
+| ----                  | ----------            | ----------                            | -----
+| assessment due date   | `DueDate`             | `[style={bold|italic|underline}]`     | requires top-level `<due-date>`
+|                       |                       |                                       | only relevant if `/document/@class = "assignment"`
+| Blackboard URL        | `Blackboard`          |                                       | **`https://blackboard.otago.ac.nz/`**
+| full paper code       | `PaperCode`           |                                       | e.g., “INFO 202”
+| Oracle “name”         | `OracleServer`        |                                       | e.g., “Oracle11*g*”
+| Oracle release number | `OracleServerRelease` |                                       | e.g., “2”
+| Oracle version number | `OracleServerVersion` |                                       | e.g., “11.2”
+| paper number          | `PaperNumber`         |                                       | e.g., “202”
+| period paper offered  | `PaperPeriod`         |                                       | e.g., “Second Semester”
+| subject code          | `SubjectCode`         |                                       | “**`INFO`**”
+| year paper offered    | `PaperYear`           | `[offset=`*`<integer>`*`]`            | **`0`**
+
 modules/cross-references.xml:   <template name="reference" match="reference[@label]">
 modules/cross-references.xml:   <template name="broken-reference" match="reference[not( @label )]">
 modules/cross-references.xml:   <template name="section-reference" match="section" mode="reference">
@@ -138,7 +343,6 @@
 modules/cross-references.xml:   <template name="broken-page" match="page[not( @label )]">
 modules/cross-references.xml:   <template name="direct-page-reference" match="page[@label]" mode="reference">
 modules/emoticons.xml:  <template name="emoticon" match="emoticon|smiley">
-modules/emoticons.xml:  <template name="emoticon-strip" match="emoticon|smiley" mode="strip">
 modules/floaters.xml:   <template name="figure" match="figure">
 modules/floaters.xml:   <template name="table" match="table">
 modules/floaters.xml:   <template name="multipart-table" match="table[count(part) gt 0]">
@@ -146,122 +350,6 @@
 modules/floaters.xml:   <template name="table-caption" match="table/caption">
 modules/footnotes.xml:  <template name="footnote" match="footnote">
 modules/footnotes.xml:  <template name="footnote-list" match="footnote" mode="list">
-modules/global-elements.xml:    <template name="SubjectCode" match="SubjectCode">
-modules/global-elements.xml:    <template name="SubjectCode-strip" match="SubjectCode" mode="strip">
-modules/global-elements.xml:    <template name="PaperNumber" match="PaperNumber">
-modules/global-elements.xml:    <template name="PaperNumber-strip" match="PaperNumber" mode="strip">
-modules/global-elements.xml:    <template name="PaperCode" match="PaperCode">
-modules/global-elements.xml:    <template name="PaperCode-strip" match="PaperCode" mode="strip">
-modules/global-elements.xml:    <template name="PaperYear" match="PaperYear">
-modules/global-elements.xml:    <template name="PaperYear-strip" match="PaperYear" mode="strip">
-modules/global-elements.xml:    <template name="PaperPeriod" match="PaperPeriod">
-modules/global-elements.xml:    <template name="PaperPeriod-strip" match="PaperPeriod" mode="strip">
-modules/global-elements.xml:    <template name="OracleServer" match="OracleServer">
-modules/global-elements.xml:    <template name="OracleServer-strip" match="OracleServer" mode="strip">
-modules/global-elements.xml:    <template name="OracleServerRelease" match="OracleServerRelease">
-modules/global-elements.xml:    <template name="OracleServerRelease-strip" match="OracleServerRelease" mode="strip">
-modules/global-elements.xml:    <template name="OracleServerVersion" match="OracleServerVersion">
-modules/global-elements.xml:    <template name="OracleServerVersion-strip" match="OracleServerVersion" mode="strip">
-modules/global-elements.xml:    <template name="Blackboard" match="Blackboard">
-modules/global-elements.xml:    <template name="Blackboard-strip" match="Blackboard" mode="strip">
-modules/global-elements.xml:    <template name="DueDate" match="DueDate">
-modules/global-elements.xml:    <template name="DueDate-strip" match="DueDate" mode="strip">
-modules/greek-characters.xml:   <template name="alpha" match="alpha|greek-small-letter-alpha">
-modules/greek-characters.xml:   <template name="alpha-strip" match="alpha|greek-small-letter-alpha" mode="strip">
-modules/greek-characters.xml:   <template name="capital-alpha" match="capital-alpha|greek-capital-letter-alpha">
-modules/greek-characters.xml:   <template name="capital-alpha-stip" match="capital-alpha|greek-capital-letter-alpha" mode="strip">
-modules/greek-characters.xml:   <template name="beta" match="beta|greek-small-letter-beta">
-modules/greek-characters.xml:   <template name="beta-strip" match="beta|greek-small-letter-beta" mode="strip">
-modules/greek-characters.xml:   <template name="capital-beta" match="capital-beta|greek-capital-letter-beta">
-modules/greek-characters.xml:   <template name="capital-beta-stip" match="capital-beta|greek-capital-letter-beta" mode="strip">
-modules/greek-characters.xml:   <template name="gamma" match="gamma|greek-small-letter-gamma">
-modules/greek-characters.xml:   <template name="gamma-strip" match="gamma|greek-small-letter-gamma" mode="strip">
-modules/greek-characters.xml:   <template name="capital-gamma" match="capital-gamma|greek-capital-letter-gamma">
-modules/greek-characters.xml:   <template name="capital-gamma-stip" match="capital-gamma|greek-capital-letter-gamma" mode="strip">
-modules/greek-characters.xml:   <template name="delta" match="delta|greek-small-letter-delta">
-modules/greek-characters.xml:   <template name="delta-strip" match="delta|greek-small-letter-delta" mode="strip">
-modules/greek-characters.xml:   <template name="capital-delta" match="capital-delta|greek-capital-letter-delta">
-modules/greek-characters.xml:   <template name="capital-delta-stip" match="capital-delta|greek-capital-letter-delta" mode="strip">
-modules/greek-characters.xml:   <template name="epsilon" match="epsilon|greek-small-letter-epsilon">
-modules/greek-characters.xml:   <template name="epsilon-strip" match="epsilon|greek-small-letter-epsilon" mode="strip">
-modules/greek-characters.xml:   <template name="capital-epsilon" match="capital-epsilon|greek-capital-letter-epsilon">
-modules/greek-characters.xml:   <template name="capital-epsilon-stip" match="capital-epsilon|greek-capital-letter-epsilon" mode="strip">
-modules/greek-characters.xml:   <template name="zeta" match="zeta|greek-small-letter-zeta">
-modules/greek-characters.xml:   <template name="zeta-strip" match="zeta|greek-small-letter-zeta" mode="strip">
-modules/greek-characters.xml:   <template name="capital-zeta" match="capital-zeta|greek-capital-letter-zeta">
-modules/greek-characters.xml:   <template name="capital-zeta-stip" match="capital-zeta|greek-capital-letter-zeta" mode="strip">
-modules/greek-characters.xml:   <template name="eta" match="eta|greek-small-letter-eta">
-modules/greek-characters.xml:   <template name="eta-strip" match="eta|greek-small-letter-eta" mode="strip">
-modules/greek-characters.xml:   <template name="capital-eta" match="capital-eta|greek-capital-letter-eta">
-modules/greek-characters.xml:   <template name="capital-eta-stip" match="capital-eta|greek-capital-letter-eta" mode="strip">
-modules/greek-characters.xml:   <template name="theta" match="theta|greek-small-letter-theta">
-modules/greek-characters.xml:   <template name="theta-strip" match="theta|greek-small-letter-theta" mode="strip">
-modules/greek-characters.xml:   <template name="capital-theta" match="capital-theta|greek-capital-letter-theta">
-modules/greek-characters.xml:   <template name="capital-theta-stip" match="capital-theta|greek-capital-letter-theta" mode="strip">
-modules/greek-characters.xml:   <template name="iota" match="iota|greek-small-letter-iota">
-modules/greek-characters.xml:   <template name="iota-strip" match="iota|greek-small-letter-iota" mode="strip">
-modules/greek-characters.xml:   <template name="capital-iota" match="capital-iota|greek-capital-letter-iota">
-modules/greek-characters.xml:   <template name="capital-iota-stip" match="capital-iota|greek-capital-letter-iota" mode="strip">
-modules/greek-characters.xml:   <template name="kappa" match="kappa|greek-small-letter-kappa">
-modules/greek-characters.xml:   <template name="kappa-strip" match="kappa|greek-small-letter-kappa" mode="strip">
-modules/greek-characters.xml:   <template name="capital-kappa" match="capital-kappa|greek-capital-letter-kappa">
-modules/greek-characters.xml:   <template name="capital-kappa-stip" match="capital-kappa|greek-capital-letter-kappa" mode="strip">
-modules/greek-characters.xml:   <template name="lambda" match="lambda|greek-small-letter-lambda">
-modules/greek-characters.xml:   <template name="lambda-strip" match="lambda|greek-small-letter-lambda" mode="strip">
-modules/greek-characters.xml:   <template name="capital-lambda" match="capital-lambda|greek-capital-letter-lambda">
-modules/greek-characters.xml:   <template name="capital-lambda-stip" match="capital-lambda|greek-capital-letter-lambda" mode="strip">
-modules/greek-characters.xml:   <template name="mu" match="mu|greek-small-letter-mu">
-modules/greek-characters.xml:   <template name="mu-strip" match="mu|greek-small-letter-mu" mode="strip">
-modules/greek-characters.xml:   <template name="capital-mu" match="capital-mu|greek-capital-letter-mu">
-modules/greek-characters.xml:   <template name="capital-mu-stip" match="capital-mu|greek-capital-letter-mu" mode="strip">
-modules/greek-characters.xml:   <template name="nu" match="nu|greek-small-letter-nu">
-modules/greek-characters.xml:   <template name="nu-strip" match="nu|greek-small-letter-nu" mode="strip">
-modules/greek-characters.xml:   <template name="capital-nu" match="capital-nu|greek-capital-letter-nu">
-modules/greek-characters.xml:   <template name="capital-nu-stip" match="capital-nu|greek-capital-letter-nu" mode="strip">
-modules/greek-characters.xml:   <template name="xi" match="xi|greek-small-letter-xi">
-modules/greek-characters.xml:   <template name="xi-strip" match="xi|greek-small-letter-xi" mode="strip">
-modules/greek-characters.xml:   <template name="capital-xi" match="capital-xi|greek-capital-letter-xi">
-modules/greek-characters.xml:   <template name="capital-xi-stip" match="capital-xi|greek-capital-letter-xi" mode="strip">
-modules/greek-characters.xml:   <template name="omicron" match="omicron|greek-small-letter-omicron">
-modules/greek-characters.xml:   <template name="omicron-strip" match="omicron|greek-small-letter-omicron" mode="strip">
-modules/greek-characters.xml:   <template name="capital-omicron" match="capital-omicron|greek-capital-letter-omicron">
-modules/greek-characters.xml:   <template name="capital-omicron-stip" match="capital-omicron|greek-capital-letter-omicron" mode="strip">
-modules/greek-characters.xml:   <template name="pi" match="pi|greek-small-letter-pi">
-modules/greek-characters.xml:   <template name="pi-strip" match="pi|greek-small-letter-pi" mode="strip">
-modules/greek-characters.xml:   <template name="capital-pi" match="capital-pi|greek-capital-letter-pi">
-modules/greek-characters.xml:   <template name="capital-pi-stip" match="capital-pi|greek-capital-letter-pi" mode="strip">
-modules/greek-characters.xml:   <template name="rho" match="rho|greek-small-letter-rho">
-modules/greek-characters.xml:   <template name="rho-strip" match="rho|greek-small-letter-rho" mode="strip">
-modules/greek-characters.xml:   <template name="capital-rho" match="capital-rho|greek-capital-letter-rho">
-modules/greek-characters.xml:   <template name="capital-rho-stip" match="capital-rho|greek-capital-letter-rho" mode="strip">
-modules/greek-characters.xml:   <template name="sigma" match="sigma|greek-small-letter-sigma">
-modules/greek-characters.xml:   <template name="sigma-strip" match="sigma|greek-small-letter-sigma" mode="strip">
-modules/greek-characters.xml:   <template name="capital-sigma" match="capital-sigma|greek-capital-letter-sigma">
-modules/greek-characters.xml:   <template name="capital-sigma-stip" match="capital-sigma|greek-capital-letter-sigma" mode="strip">
-modules/greek-characters.xml:   <template name="tau" match="tau|greek-small-letter-tau">
-modules/greek-characters.xml:   <template name="tau-strip" match="tau|greek-small-letter-tau" mode="strip">
-modules/greek-characters.xml:   <template name="capital-tau" match="capital-tau|greek-capital-letter-tau">
-modules/greek-characters.xml:   <template name="capital-tau-stip" match="capital-tau|greek-capital-letter-tau" mode="strip">
-modules/greek-characters.xml:   <template name="upsilon" match="upsilon|greek-small-letter-upsilon">
-modules/greek-characters.xml:   <template name="upsilon-strip" match="upsilon|greek-small-letter-upsilon" mode="strip">
-modules/greek-characters.xml:   <template name="capital-upsilon" match="capital-upsilon|greek-capital-letter-upsilon">
-modules/greek-characters.xml:   <template name="capital-upsilon-stip" match="capital-upsilon|greek-capital-letter-upsilon" mode="strip">
-modules/greek-characters.xml:   <template name="phi" match="phi|greek-phi-symbol">
-modules/greek-characters.xml:   <template name="phi-strip" match="phi|greek-phi-symbol" mode="strip">
-modules/greek-characters.xml:   <template name="capital-phi" match="capital-phi|greek-capital-letter-phi">
-modules/greek-characters.xml:   <template name="capital-phi-stip" match="capital-phi|greek-capital-letter-phi" mode="strip">
-modules/greek-characters.xml:   <template name="chi" match="chi|greek-small-letter-chi">
-modules/greek-characters.xml:   <template name="chi-strip" match="chi|greek-small-letter-chi" mode="strip">
-modules/greek-characters.xml:   <template name="capital-chi" match="capital-chi|greek-capital-letter-chi">
-modules/greek-characters.xml:   <template name="capital-chi-stip" match="capital-chi|greek-capital-letter-chi" mode="strip">
-modules/greek-characters.xml:   <template name="psi" match="psi|greek-small-letter-psi">
-modules/greek-characters.xml:   <template name="psi-strip" match="psi|greek-small-letter-psi" mode="strip">
-modules/greek-characters.xml:   <template name="capital-psi" match="capital-psi|greek-capital-letter-psi">
-modules/greek-characters.xml:   <template name="capital-psi-stip" match="capital-psi|greek-capital-letter-psi" mode="strip">
-modules/greek-characters.xml:   <template name="omega" match="omega|greek-small-letter-omega">
-modules/greek-characters.xml:   <template name="omega-strip" match="omega|greek-small-letter-omega" mode="strip">
-modules/greek-characters.xml:   <template name="capital-omega" match="capital-omega|greek-capital-letter-omega">
-modules/greek-characters.xml:   <template name="capital-omega-stip" match="capital-omega|greek-capital-letter-omega" mode="strip">
 modules/hyperlinks.xml: <template name="hyperlink-label" match="hyperlink[@label and node()]">
 modules/hyperlinks.xml: <template name="hyperlink-url" match="hyperlink[@url and node()]">
 modules/hyperlinks.xml: <template name="empty-hyperlink-url" match="hyperlink[@url and not( node() )]">
@@ -291,103 +379,32 @@
 modules/lists.xml:  <template name="definition-item" match="item" mode="definition-list">
 modules/lists.xml:  <template name="keyword" match="item/keyword|item/term|item/topic|item/DT|item/dt">
 modules/lists.xml:  <template name="definition" match="item/definition|item/description|item/discourse|item/DD|item/dd">
-modules/mathematical-symbols.xml:   <template name="plus-operator" match="plus|plus-sign">
-modules/mathematical-symbols.xml:   <template name="times-operator" match="times|multiply|multiplication|multiplication-sign">
-modules/mathematical-symbols.xml:   <template name="minus-operator" match="minus|subtract|minus-sign">
-modules/mathematical-symbols.xml:   <template name="divide-operator" match="divide|division|division-slash">
-modules/mathematical-symbols.xml:   <template name="equals-operator" match="equals|eq|equals-sign|equality">
-modules/mathematical-symbols.xml:   <template name="not-equals-operator" match="not-equals|ne|inequality|not-equal-to">
-modules/mathematical-symbols.xml:   <template name="approximately-equals-operator" match="approximately-equals|approximately-equal-to|approx|almost-equal-to">
-modules/mathematical-symbols.xml:   <template name="greater-than-operator" match="greater-than|gt|greater-than-sign">
-modules/mathematical-symbols.xml:   <template name="greater-equals-operator" match="greater-equals|ge|greater-than-or-equal-to">
-modules/mathematical-symbols.xml:   <template name="less-than-operator" match="less-than|lt|less-than-sign">
-modules/mathematical-symbols.xml:   <template name="less-equals-operator" match="less-equals|le|less-than-or-equal-to">
-modules/mathematical-symbols.xml:   <template name="empty-set-sign" match="empty-set-sign|empty-set|null">
-modules/mathematical-symbols.xml:   <template name="empty-set-sign-strip" match="empty-set-sign|empty-set|null" mode="strip">
-modules/mathematical-symbols.xml:   <template name="element-sign" match="element-sign|element|element-of|is-element-of|is-an-element-of">
-modules/mathematical-symbols.xml:   <template name="element-sign-strip" match="element-sign|element|element-of|is-element-of|is-an-element-of" mode="strip">
-modules/mathematical-symbols.xml:   <template name="not-element-sign" match="not-element-sign|not-element|not-element-of|is-not-element-of|is-not-an-element-of|not-an-element-of">
-modules/mathematical-symbols.xml:   <template name="not-element-sign-strip" match="not-element-sign|not-element|not-element-of|is-not-element-of|is-not-an-element-of|not-an-element-of" mode="strip">
-modules/mathematical-symbols.xml:   <template name="intersect-operator" match="intersect-operator|intersect|intersection|cap">
-modules/mathematical-symbols.xml:   <template name="intersect-operator-strip" match="intersect-operator|intersect|intersection|cap" mode="strip">
-modules/mathematical-symbols.xml:   <template name="union-operator" match="union-operator|union|cup">
-modules/mathematical-symbols.xml:   <template name="union-operator-strip" match="union-operator|union|cup" mode="strip">
-modules/mathematical-symbols.xml:   <template name="strict-subset-sign" match="subset-sign|subset|subset-of|is-subset-of|is-a-subset-of|strict-subset">
-modules/mathematical-symbols.xml:   <template name="strict-subset-sign-strip" match="subset-sign|subset|subset-of|is-subset-of|is-a-subset-of|strict-subset" mode="strip">
-modules/mathematical-symbols.xml:   <template name="strict-superset-sign" match="superset-sign|superset|superset-of|is-superset-of|is-a-superset-of">
-modules/mathematical-symbols.xml:   <template name="strict-superset-sign-strip" match="superset-sign|superset|superset-of|is-superset-of|is-a-superset-of" mode="strip">
-modules/mathematical-symbols.xml:   <template name="inclusive-subset-sign" match="inclusive-subset|subset-or-equal|subset-of-or-equal-to|is-subset-of-or-equal-to|is-a-subset-of-or-equal-to">
-modules/mathematical-symbols.xml:   <template name="inclusive-subset-sign-strip" match="inclusive-subset|subset-or-equal|subset-of-or-equal-to|is-subset-of-or-equal-to|is-a-subset-of-or-equal-to" mode="strip">
-modules/mathematical-symbols.xml:   <template name="inclusive-superset-sign" match="inclusive-superset|superset-or-equal|superset-of-or-equal-to|is-superset-of-or-equal-to|is-a-superset-of-or-equal-to">
-modules/mathematical-symbols.xml:   <template name="inclusive-superset-sign-strip" match="inclusive-superset|superset-or-equal|superset-of-or-equal-to|is-superset-of-or-equal-to|is-a-superset-of-or-equal-to" mode="strip">
-modules/mathematical-symbols.xml:   <template name="logical-not-operator" match="logical-not-operator|logical-negation-operator|logical-negation|logical-not|not|negation|neg|not-sign">
-modules/mathematical-symbols.xml:   <template name="logical-not-operator-strip" match="logical-not-operator|logical-negation-operator|logical-negation|logical-not|not|negation|neg|not-sign" mode="strip">
-modules/mathematical-symbols.xml:   <template name="logical-and-operator" match="logical-and-operator|logical-and|and|and-operator|hat|wedge">
-modules/mathematical-symbols.xml:   <template name="logical-and-operator-strip" match="logical-and-operator|logical-and|and|and-operator|hat|wedge" mode="strip">
-modules/mathematical-symbols.xml:   <template name="logical-or-operator" match="logical-or-operator|logical-or|or|or-operator|vee">
-modules/mathematical-symbols.xml:   <template name="logical-or-operator-strip" match="logical-or-operator|logical-or|or|or-operator|vee" mode="strip">
-modules/mathematical-symbols.xml:   <template name="right-arrow" match="right-arrow|rightarrow|implies|rarr|rarrow|rightwards-arrow">
-modules/mathematical-symbols.xml:   <template name="left-arrow" match="left-arrow|leftarrow|larr|larrow|leftwards-arrow">
-modules/maths.xml:  <template name="math-inline" match="math|math[@style='inline']">
-modules/maths.xml:  <template name="math-display" match="math[@style='display']">
-modules/maths.xml:  <template name="equation-array" match="equation-array">
-modules/maths.xml:  <template match="equation-array/row">
-modules/maths.xml:  <template name="math-text" match="text">
-modules/maths.xml:  <template name="calligraphic-text" match="calligraphic|cursive">
-modules/maths.xml:  <template name="digit-group-separator" match="digit-group-separator|digitsep">
-modules/maths.xml:  <template name="superscript-math" match="math//superscript">
-modules/maths.xml:  <template name="subscript-math" match="math//subscript">
-modules/maths.xml:  <template name="log-like-function" match="function">
-modules/maths.xml:  <template name="math-variable" match="variable|var">
-modules/maths.xml:  <template name="math-fraction" match="fraction">
 modules/menus.xml:  <template name="menu-separator" match="menu-separator|menusep|menu/separator">
-modules/menus.xml:  <template name="menu-separator-strip" match="menu-separator|menusep|menu/separator" mode="strip">
 modules/menus.xml:  <template name="menu-item" match="menu/item">
 modules/meta-elements.xml:  <template name="omit" match="omit" />
 modules/meta-elements.xml:  <template name="comment" match="comment">
 modules/meta-elements.xml:  <template name="todo" match="todo|to-do|incomplete|check">
 modules/miscellaneous-symbols.xml:  <template name="sharp-sign" match="sharp|hash|number-sign">
-modules/miscellaneous-symbols.xml:  <template name="sharp-sign-strip" match="sharp|hash|number-sign" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="dollar" match="dollar|dollar-sign">
-modules/miscellaneous-symbols.xml:  <template name="dollar-strip" match="dollar|dollar-sign" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="percent-sign" match="percent-sign|percentage-sign|percent">
-modules/miscellaneous-symbols.xml:  <template name="percent-sign-strip" match="percent-sign|percentage-sign|percent" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="ampersand" match="ampersand">
-modules/miscellaneous-symbols.xml:  <template name="ampersand-strip" match="ampersand" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="backslash" match="backslash">
-modules/miscellaneous-symbols.xml:  <template name="backslash-strip" match="backslash" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="underscore" match="underscore|low-line">
-modules/miscellaneous-symbols.xml:  <template name="underscore-strip" match="underscore|low-line" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="left-curly-bracket" match="left-curly-bracket|left-curly-brace|left-brace">
-modules/miscellaneous-symbols.xml:  <template name="left-curly-bracket-strip" match="left-curly-bracket|left-curly-brace|left-brace" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="right-curly-bracket" match="right-curly-bracket|right-curly-brace|right-brace">
-modules/miscellaneous-symbols.xml:  <template name="right-curly-bracket-strip" match="right-curly-bracket|right-curly-brace|right-brace" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="degree-sign" match="degree-sign|degrees">
-modules/miscellaneous-symbols.xml:  <template name="degree-sign-strip" match="degree-sign|degrees" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="section-sign" match="section-sign">
-modules/miscellaneous-symbols.xml:  <template name="section-sign-strip" match="section-sign" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="copyright-sign" match="copyright-sign">
-modules/miscellaneous-symbols.xml:  <template name="copyright-sign-strip" match="copyright-sign" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="paragraph-sign" match="paragraph-sign|pilcrow|pilcrow-sign">
-modules/miscellaneous-symbols.xml:  <template name="paragraph-sign-strip" match="paragraph-sign|pilcrow|pilcrow-sign" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="figure-dash" match="figure-dash|number-dash">   
-modules/miscellaneous-symbols.xml:  <template name="figure-dash-strip" match="figure-dash|number-dash" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="endash" match="endash|en-dash|ndash|n-dash">    
-modules/miscellaneous-symbols.xml:  <template name="endash-strip" match="endash|en-dash|ndash|n-dash" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="emdash" match="emdash|em-dash|mdash|m-dash">
-modules/miscellaneous-symbols.xml:  <template name="emdash-strip" match="emdash|em-dash|mdash|m-dash" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="apostrophe" match="apostrophe|right-single-quotation-mark">
-modules/miscellaneous-symbols.xml:  <template name="apostrophe-strip" match="apostrophe|right-single-quotation-mark" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="dagger" match="dagger|dag">
-modules/miscellaneous-symbols.xml:  <template name="dagger-strip" match="dagger|dag" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="double-dagger" match="double-dagger|ddagger|ddag">
-modules/miscellaneous-symbols.xml:  <template name="double-dagger-strip" match="double-dagger|ddagger|ddag" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="ellipsis-sign" match="ellipsis-sign|etc|ellipsis|dots|horizontal-ellipsis">
-modules/miscellaneous-symbols.xml:  <template name="ellipsis-sign-strip" match="ellipsis-sign|etc|ellipsis|dots|horizontal-ellipsis" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="trademark-sign" match="trademark-sign|trademark|tm|trade-mark-sign">
-modules/miscellaneous-symbols.xml:  <template name="trademark-sign-strip" match="trademark-sign|trademark|tm|trade-mark-sign" mode="strip">
 modules/miscellaneous-symbols.xml:  <template name="LaTeX" match="LaTeX|latex">
-modules/miscellaneous-symbols.xml:  <template name="LaTeX-strip" match="LaTeX|latex" mode="strip">
 modules/multi-column.xml:   <template name="multi-column" match="multi-column">
 modules/multi-column.xml:   <template name="multi-column-column" match="multi-column/column">
 modules/native-code.xml:    <template name="raw-latex" match="raw-code[@format = 'latex']|raw-latex">
@@ -435,22 +452,15 @@
 modules/quotations.xml: <template name="nested-single-quote" match="quote[@single='yes']//quote" priority="2">
 modules/quotations.xml: <template name="quotation" match="quotation">
 modules/relational-algebra.xml: <template name="project-operator" match="project|project-operator|relational-project">
-modules/relational-algebra.xml: <template name="project-operator-strip" match="project|project-operator|relational-project" mode="strip">
 modules/relational-algebra.xml: <template name="extend-operator" match="extend|extend-operator|relational-extend">
-modules/relational-algebra.xml: <template name="extend-operator-strip" match="extend|extend-operator|relational-extend" mode="strip">
 modules/relational-algebra.xml: <template name="rename-operator" match="rename|rename-operator|relational-rename">
-modules/relational-algebra.xml: <template name="rename-operator-strip" match="rename|rename-operator|relational-rename" mode="strip">
 modules/relational-algebra.xml: <template name="restrict-operator" match="restrict|restrict-operator|relational-restrict">
-modules/relational-algebra.xml: <template name="restrict-operator-strip" match="restrict|restrict-operator|relational-restrict" mode="strip">
 modules/relational-algebra.xml: <template name="join-operator" match="join-operator|join|natural-join|inner-join|bowtie|relational-join">
-modules/relational-algebra.xml: <template name="join-operator-strip" match="join-operator|join|natural-join|inner-join|bowtie|relational-join" mode="strip">
 modules/relational-algebra.xml: <template name="outer-join-operator" match="outer-join-operator|outer-join|relational-outer-join">
-modules/relational-algebra.xml: <template name="outer-join-operator-strip" match="outer-join-operator|outer-join|relational-outer-join" mode="strip">
 modules/sectioning.xml: <template name="section" match="section">
 modules/sectioning.xml: <template name="generate-subs">
 modules/sectioning.xml: <template name="section-title" match="section/title">
 modules/special-characters.xml: <template name="space" match="space">
-modules/special-characters.xml: <template name="space-strip" match="space" mode="strip">
 modules/special-characters.xml: <template name="non-breaking-space" match="non-breaking-space|nbsp|no-break-space">
 modules/special-characters.xml: <template name="thin-space" match="thin-space|thinspace">
 modules/special-characters.xml: <template name="discretionary-hyphen" match="hyphen">