packages feed

citeproc 0.8.0.2 → 0.8.1

raw patch · 63 files changed

+2615/−839 lines, 63 filesdep ~pandoc-typesPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: pandoc-types

API changes (from Hackage documentation)

Files

CHANGELOG.md view
@@ -1,5 +1,29 @@ # citeproc changelog +## 0.8.1++  * In Pandoc and CslJson CaseTransform, group punctuation in clusters (#127).++  * Fix sorting on dates (#126). Previously this broke for some styles,+    e.g. apa.csl, which styles dates as MM/DD/YYYY, and would lead to+    incorrect sorting of dates with months and/or days.++  * Add citation-key variable from citeId. This is a new addition in CSL 1.0.2.++  * Update locales from upstream.++  * Raise an error if multiple layout elements are present (#120).++  * Fix two test cases. They had illegal bibliography elements with+    no layout children.++  * If there are multiple layout elements, only use the last one.+    This can happen with CSL-M styles. The last layout should be+    locale-unspecific. This change will prevent us from emitting+    doubled citations or bibliographic references (see #120),+    allowing more graceful handling of CSL-M styles, even though we+    don't support CSL-M.+ ## 0.8.0.2    * Fix missing locator after collapsing and grouping with year
citeproc.cabal view
@@ -1,6 +1,6 @@ cabal-version:       2.2 name:                citeproc-version:             0.8.0.2+version:             0.8.1 synopsis:            Generates citations and bibliography from CSL styles. description:         citeproc parses CSL style files and uses them to                      generate a list of formatted citations and bibliography@@ -77,7 +77,7 @@                      , aeson                      , filepath                      , file-embed-                     , pandoc-types >= 1.22 && < 1.23+                     , pandoc-types >= 1.22 && < 1.24                      , unicode-collation >= 0.1.3 && < 0.2                      -- , pretty-show   if flag(icu)
locales/af-ZA.xml view
@@ -66,7 +66,6 @@     <term name="in">in</term>     <term name="in press">in press</term>     <term name="internet">internet</term>-    <term name="interview">interview</term>     <term name="letter">brief</term>     <term name="no date">no date</term>     <term name="no date" form="short">n.d.</term>@@ -90,9 +89,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -135,8 +134,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -300,39 +299,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/ar.xml view
@@ -72,7 +72,6 @@     <term name="in">في</term>     <term name="in press">قيد النشر</term>     <term name="internet">انترنت</term>-    <term name="interview">مقابلة</term>     <term name="letter">خطاب</term>     <term name="no date">دون تاريخ</term>     <term name="no date" form="short">د.ت</term>@@ -96,9 +95,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -110,7 +109,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">مقابلة</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -141,8 +140,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -300,39 +299,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/bg-BG.xml view
@@ -71,7 +71,6 @@     <term name="in">в</term>     <term name="in press">под печат</term>     <term name="internet">интернет</term>-    <term name="interview">интервю</term>     <term name="letter">писмо</term>     <term name="no date">без дата</term>     <term name="no date" form="short">б.д.</term>@@ -95,9 +94,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -109,7 +108,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">интервю</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -140,8 +139,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -336,39 +335,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/ca-AD.xml view
@@ -72,7 +72,6 @@     <term name="in">en</term>     <term name="in press">en impremta</term>     <term name="internet">internet</term>-    <term name="interview">entrevista</term>     <term name="letter">carta</term>     <term name="no date">sense data</term>     <term name="no date" form="short">s.d.</term>@@ -96,9 +95,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -110,7 +109,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">entrevista</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -141,8 +140,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -300,39 +299,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/cs-CZ.xml view
@@ -79,7 +79,6 @@     <term name="in">in</term>     <term name="in press">v tisku</term>     <term name="internet">internet</term>-    <term name="interview">interview</term>     <term name="letter">dopis</term>     <term name="no date">nedatováno</term>     <term name="no date" form="short">b.r.</term>@@ -103,9 +102,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -148,8 +147,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -307,39 +306,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/cy-GB.xml view
@@ -66,7 +66,6 @@     <term name="in">yn</term>     <term name="in press">yn y wasg</term>     <term name="internet">rhyngrwyd</term>-    <term name="interview">cyfweliad</term>     <term name="letter">llythyr</term>     <term name="no date">dim dyddiad</term>     <term name="no date" form="short">d.d.</term>@@ -90,9 +89,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -104,7 +103,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">cyfweliad</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -135,8 +134,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -300,39 +299,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/da-DK.xml view
@@ -75,7 +75,6 @@     <term name="in">i</term>     <term name="in press">i trykken</term>     <term name="internet">internet</term>-    <term name="interview">interview</term>     <term name="letter">brev</term>     <term name="no date">uden år</term>     <term name="no date" form="short">u.å.</term>@@ -99,9 +98,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -144,8 +143,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -303,39 +302,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/de-AT.xml view
@@ -84,7 +84,6 @@     <term name="in">in</term>     <term name="in press">im Druck</term>     <term name="internet">Internet</term>-    <term name="interview">Interview</term>     <term name="letter">Brief</term>     <term name="no date">ohne Datum</term>     <term name="no date" form="short">o.&#160;J.</term>@@ -108,9 +107,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -122,7 +121,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">Interview</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -153,8 +152,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -312,39 +311,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/de-CH.xml view
@@ -78,7 +78,6 @@     <term name="in">in</term>     <term name="in press">im Druck</term>     <term name="internet">Internet</term>-    <term name="interview">Interview</term>     <term name="letter">Brief</term>     <term name="no date">ohne Datum</term>     <term name="no date" form="short">o.&#160;J.</term>@@ -102,9 +101,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -116,7 +115,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">Interview</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -147,8 +146,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -306,39 +305,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/de-DE.xml view
@@ -81,7 +81,6 @@     <term name="in">in</term>     <term name="in press">im Druck</term>     <term name="internet">Internet</term>-    <term name="interview">Interview</term>     <term name="letter">Brief</term>     <term name="no date">ohne Datum</term>     <term name="no date" form="short">o.&#160;J.</term>@@ -105,9 +104,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -119,7 +118,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">Interview</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -150,8 +149,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -309,39 +308,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/el-GR.xml view
@@ -72,7 +72,6 @@     <term name="in">στο</term>     <term name="in press">υπό έκδοση</term>     <term name="internet">διαδίκτυο</term>-    <term name="interview">συνέντευξη</term>     <term name="letter">επιστολή</term>     <term name="no date">χωρίς χρονολογία</term>     <term name="no date" form="short">χ.χ.</term>@@ -96,9 +95,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -110,7 +109,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">συνέντευξη</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -141,8 +140,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -302,39 +301,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/en-GB.xml view
@@ -75,7 +75,6 @@     <term name="in">in</term>     <term name="in press">in press</term>     <term name="internet">internet</term>-    <term name="interview">interview</term>     <term name="letter">letter</term>     <term name="no date">no date</term>     <term name="no date" form="short">n.d.</term>@@ -99,9 +98,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -144,8 +143,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>
locales/en-US.xml view
@@ -81,7 +81,6 @@     <term name="in">in</term>     <term name="in press">in press</term>     <term name="internet">internet</term>-    <term name="interview">interview</term>     <term name="letter">letter</term>     <term name="no date">no date</term>     <term name="no date" form="short">n.d.</term>@@ -105,9 +104,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -150,8 +149,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>
locales/es-CL.xml view
@@ -70,7 +70,6 @@     <term name="in">en</term>     <term name="in press">en imprenta</term>     <term name="internet">internet</term>-    <term name="interview">entrevista</term>     <term name="letter">carta</term>     <term name="no date">sin fecha</term>     <term name="no date" form="short">s.&#160;f.</term>@@ -94,9 +93,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -108,7 +107,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">entrevista</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -139,8 +138,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -298,39 +297,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/es-ES.xml view
@@ -69,7 +69,6 @@     <term name="in">en</term>     <term name="in press">en imprenta</term>     <term name="internet">internet</term>-    <term name="interview">entrevista</term>     <term name="letter">carta</term>     <term name="no date">sin fecha</term>     <term name="no date" form="short">s.&#160;f.</term>@@ -93,9 +92,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -107,7 +106,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">entrevista</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -138,8 +137,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -297,39 +296,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/es-MX.xml view
@@ -73,7 +73,6 @@     <term name="in">en</term>     <term name="in press">en imprenta</term>     <term name="internet">internet</term>-    <term name="interview">entrevista</term>     <term name="letter">carta</term>     <term name="no date">sin fecha</term>     <term name="no date" form="short">s/f</term>@@ -97,9 +96,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -111,7 +110,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">entrevista</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -142,8 +141,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -303,39 +302,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/et-EE.xml view
@@ -69,7 +69,6 @@     <term name="in"></term>     <term name="in press">trükis</term>     <term name="internet">internet</term>-    <term name="interview">intervjuu</term>     <term name="letter">kiri</term>     <term name="no date">s.a.</term>     <term name="no date" form="short">s.a.</term>@@ -93,9 +92,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -107,7 +106,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">intervjuu</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -138,8 +137,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -297,39 +296,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/eu.xml view
@@ -69,7 +69,6 @@     <term name="in">in</term>     <term name="in press">moldiztegian</term>     <term name="internet">internet</term>-    <term name="interview">elkarrizketa</term>     <term name="letter">gutuna</term>     <term name="no date">datarik gabe</term>     <term name="no date" form="short">d. g.</term>@@ -93,9 +92,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -107,7 +106,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">elkarrizketa</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -138,8 +137,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -297,39 +296,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/fa-IR.xml view
@@ -72,7 +72,6 @@     <term name="in">در</term>     <term name="in press">زیر چاپ</term>     <term name="internet">اینترنت</term>-    <term name="interview">مصاحبه</term>     <term name="letter">نامه</term>     <term name="no date">بدون تاریخ</term>     <term name="no date" form="short">بدون تاریخ</term>@@ -96,9 +95,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -110,7 +109,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">مصاحبه</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -141,8 +140,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -300,39 +299,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/fi-FI.xml view
@@ -78,7 +78,6 @@     <term name="in">teoksessa</term>     <term name="in press">painossa</term>     <term name="internet">internet</term>-    <term name="interview">haastattelu</term>     <term name="letter">kirje</term>     <term name="no date">ei päivämäärää</term>     <term name="no date" form="short">ei pvm.</term>@@ -102,9 +101,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -116,7 +115,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">haastattelu</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -147,8 +146,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -306,39 +305,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/fr-CA.xml view
@@ -69,7 +69,6 @@     <term name="in">dans</term>     <term name="in press">sous presse</term>     <term name="internet">Internet</term>-    <term name="interview">entretien</term>     <term name="letter">lettre</term>     <term name="no date">sans date</term>     <term name="no date" form="short">s.&#160;d.</term>@@ -93,9 +92,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -107,7 +106,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">entretien</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -138,8 +137,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -299,39 +298,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/fr-FR.xml view
@@ -72,7 +72,6 @@     <term name="in">in</term>     <term name="in press">sous presse</term>     <term name="internet">Internet</term>-    <term name="interview">entretien</term>     <term name="letter">lettre</term>     <term name="no date">sans date</term>     <term name="no date" form="short">s.&#160;d.</term>@@ -96,9 +95,9 @@     <term name="article-magazine">article de magazine</term>     <term name="article-newspaper">article de presse</term>     <term name="bill">projet de loi</term>-    <term name="book">livre</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">émission</term>-    <term name="chapter">chapitre de livre</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classique</term>     <term name="collection">collection</term>     <term name="dataset">jeu de données</term>@@ -110,7 +109,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">image</term>     <term name="hearing">audience</term>-    <term name="interview">interview</term>+    <term name="interview">entretien</term>     <term name="legal_case">affaire</term>     <term name="legislation">acte juridique</term>     <term name="manuscript">manuscrit</term>@@ -141,8 +140,8 @@     <term name="article-journal" form="short">art. de revue</term>     <term name="article-magazine" form="short">art. de mag.</term>     <term name="article-newspaper" form="short">art. de presse</term>-    <term name="book" form="short">liv.</term>-    <term name="chapter" form="short">chap. de liv.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -302,39 +301,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">+    <term name="appendix" form="short">       <single>append.</single>       <multiple>append.</multiple>     </term>-    <term name="article-locator">+    <term name="article-locator" form="short">       <single>art.</single>       <multiple>art.</multiple>     </term>-    <term name="elocation">+    <term name="elocation" form="short">       <single>emplact</single>       <multiple>emplact</multiple>     </term>-    <term name="equation">+    <term name="equation" form="short">       <single>eq.</single>       <multiple>eq.</multiple>     </term>-    <term name="rule">+    <term name="rule" form="short">       <single>règle</single>       <multiple>règles</multiple>     </term>-    <term name="scene">+    <term name="scene" form="short">       <single>sc.</single>       <multiple>sc.</multiple>     </term>-    <term name="table">+    <term name="table" form="short">       <single>tab.</single>       <multiple>tab.</multiple>     </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>     </term>-    <term name="title-locator">+    <term name="title-locator" form="short">       <single>tit.</single>       <multiple>tit.</multiple>     </term>
locales/he-IL.xml view
@@ -69,7 +69,6 @@     <term name="in">בתוך</term>     <term name="in press">בהדפסה</term>     <term name="internet">אינטרנט</term>-    <term name="interview">ראיון</term>     <term name="letter">מכתב</term>     <term name="no date">אין נתונים</term>     <term name="no date" form="short">nd</term>@@ -93,9 +92,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -107,7 +106,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">ראיון</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -138,8 +137,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -303,39 +302,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/hi-IN.xml view
@@ -70,7 +70,6 @@     <term name="in">में</term>     <term name="in press">मुद्रण में</term>     <term name="internet">इंटर्नेट</term>-    <term name="interview">साक्षात्कार</term>     <term name="letter">पत्र</term>     <term name="no date">दिनांक अज्ञात</term>     <term name="no date" form="short">n.d.</term>@@ -94,9 +93,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -108,7 +107,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">साक्षात्कार</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -139,8 +138,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -180,7 +179,7 @@     <term name="long-ordinal-01">पहला</term>     <term name="long-ordinal-01" gender-form="feminine">पहली</term>     <term name="long-ordinal-02">दूसरा</term>-    <term name="long-ordinal-01" gender-form="feminine">दूसरी</term>+    <term name="long-ordinal-02" gender-form="feminine">दूसरी</term>     <term name="long-ordinal-03">तीसरा</term>     <term name="long-ordinal-03" gender-form="feminine">तीसरी</term>     <term name="long-ordinal-04">चौथा</term>@@ -313,39 +312,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/hr-HR.xml view
@@ -69,7 +69,6 @@     <term name="in">u</term>     <term name="in press">u tisku</term>     <term name="internet">internet</term>-    <term name="interview">intervju</term>     <term name="letter">pismo</term>     <term name="no date">bez datuma</term>     <term name="no date" form="short">bez dat.</term>@@ -93,9 +92,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -107,7 +106,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">intervju</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -138,8 +137,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -297,39 +296,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/hu-HU.xml view
@@ -69,7 +69,6 @@     <term name="in">in</term>     <term name="in press">nyomtatás alatt</term>     <term name="internet">internet</term>-    <term name="interview">interjú</term>     <term name="letter">levél</term>     <term name="no date">évszám nélkül</term>     <term name="no date" form="short">é. n.</term>@@ -93,9 +92,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -107,7 +106,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">interjú</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -138,8 +137,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -297,39 +296,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/id-ID.xml view
@@ -75,7 +75,6 @@     <term name="in">dalam</term>     <term name="in press">dalam proses cetakan</term>     <term name="internet">internet</term>-    <term name="interview">wawancara</term>     <term name="letter">surat</term>     <term name="no date">tanpa tanggal</term>     <term name="no date" form="short">t.t.</term>@@ -99,9 +98,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -113,7 +112,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">wawancara</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -144,8 +143,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -309,39 +308,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/is-IS.xml view
@@ -72,7 +72,6 @@     <term name="in">í</term>     <term name="in press">í prentun</term>     <term name="internet">rafrænt</term>-    <term name="interview">viðtal</term>     <term name="letter">bréf</term>     <term name="no date">engin dagsetning</term>     <term name="no date" form="short">e.d.</term>@@ -96,9 +95,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -110,7 +109,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">viðtal</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -141,8 +140,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -300,39 +299,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/it-IT.xml view
@@ -20,7 +20,7 @@     <date-part name="year"/>   </date>   <terms>-    <term name="advance-online-publication">advance online publication</term>+    <term name="advance-online-publication">pubblicazione online ad accesso anticipato</term>     <term name="album">album</term>     <term name="audio-recording">registrazione audio</term>     <term name="film">film</term>@@ -65,15 +65,13 @@     </term>     <term name="edition" form="short">ed.</term>     <term name="et-al">et al.</term>-    <term name="forthcoming">futuro</term>+    <term name="forthcoming">in corso di pubblicazione</term>     <term name="from">da</term>-    <term name="ibid">ibid.</term>     <term name="ibid">ibidem</term>     <term name="ibid" form="short">ibid.</term>     <term name="in">in</term>     <term name="in press">in stampa</term>     <term name="internet">internet</term>-    <term name="interview">intervista</term>     <term name="letter">lettera</term>     <term name="no date">sine data</term>     <term name="no date" form="short">s.d.</term>@@ -97,9 +95,9 @@     <term name="article-magazine">articolo di rivista generalista</term>     <term name="article-newspaper">articolo di giornale</term>     <term name="bill">proposta di legge</term>-    <term name="book">libro</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">capitolo di libro</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classico</term>     <term name="collection">collezione</term>     <term name="dataset">dataset</term>@@ -142,8 +140,8 @@     <term name="article-journal" form="short">art. di riv.</term>     <term name="article-magazine" form="short">art. di riv</term>     <term name="article-newspaper" form="short">art. di g.</term>-    <term name="book" form="short">l.</term>-    <term name="chapter" form="short">c. di l.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">op. d'arte</term>@@ -323,39 +321,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>app.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>art.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eq.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>r.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>sc.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tab.</single>       <multiple>tab.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/ja-JP.xml view
@@ -69,7 +69,6 @@     <term name="in"></term>     <term name="in press">in press</term>     <term name="internet">internet</term>-    <term name="interview">interview</term>     <term name="letter">手紙</term>     <term name="no date">no date</term>     <term name="no date" form="short">日付なし</term>@@ -93,9 +92,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -138,8 +137,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -303,39 +302,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/km-KH.xml view
@@ -66,7 +66,6 @@     <term name="in">in</term>     <term name="in press">in press</term>     <term name="internet">internet</term>-    <term name="interview">interview</term>     <term name="letter">letter</term>     <term name="no date">no date</term>     <term name="no date" form="short">n.d.</term>@@ -90,9 +89,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -135,8 +134,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -300,39 +299,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/ko-KR.xml view
@@ -66,7 +66,6 @@     <term name="in">in</term>     <term name="in press">in press</term>     <term name="internet">internet</term>-    <term name="interview">interview</term>     <term name="letter">편지</term>     <term name="no date">no date</term>     <term name="no date" form="short">일자 없음</term>@@ -90,9 +89,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -135,8 +134,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -300,39 +299,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/la.xml view
@@ -69,7 +69,6 @@     <term name="in">in</term>     <term name="in press">impressorio</term>     <term name="internet">interrete</term>-    <term name="interview">congressus</term>     <term name="letter">epistula</term>     <term name="no date">sine die</term>     <term name="no date" form="short">s.d.</term>@@ -93,9 +92,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -107,7 +106,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">congressus</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -138,8 +137,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -297,39 +296,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/lt-LT.xml view
@@ -71,7 +71,6 @@     <term name="in"></term>     <term name="in press">priimta spaudai</term>     <term name="internet">prieiga per internetą</term>-    <term name="interview">interviu</term>     <term name="letter">laiškas</term>     <term name="no date">sine anno</term>     <term name="no date" form="short">s.a.</term>@@ -95,9 +94,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -109,7 +108,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">interviu</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -140,8 +139,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -316,39 +315,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/lv-LV.xml view
@@ -49,14 +49,12 @@     <term name="video">video</term>     <term name="working-paper">working paper</term>     <term name="accessed">skatīts</term>-    <term name="ad">m.ē.</term>     <term name="and">un</term>     <term name="and others">un citi</term>     <term name="anonymous">anonīms</term>     <term name="anonymous" form="short">anon.</term>     <term name="at"></term>     <term name="available at">pieejams</term>-    <term name="bc">p.m.ē.</term>     <term name="by"></term>     <term name="circa">apmēram</term>     <term name="circa" form="short">apm.</term>@@ -73,7 +71,6 @@     <term name="in">no</term>     <term name="in press">presē</term>     <term name="internet">internets</term>-    <term name="interview">intervija</term>     <term name="letter">vēstule</term>     <term name="no date">bez datuma</term>     <term name="no date" form="short">b.g.</term>@@ -97,9 +94,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -111,7 +108,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">intervija</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -142,8 +139,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -156,8 +153,8 @@     <term name="song" form="short">audio rec.</term>      <!-- HISTORICAL ERA TERMS -->-    <term name="ad">AD</term>-    <term name="bc">BC</term>+    <term name="ad">m.ē.</term>+    <term name="bc">p.m.ē.</term>     <term name="bce">BCE</term>     <term name="ce">CE</term> @@ -313,39 +310,39 @@     </term>          <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/mn-MN.xml view
@@ -66,7 +66,6 @@     <term name="in">in</term>     <term name="in press">in press</term>     <term name="internet">internet</term>-    <term name="interview">interview</term>     <term name="letter">захиа</term>     <term name="no date">no date</term>     <term name="no date" form="short">n.d.</term>@@ -90,9 +89,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -135,8 +134,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -294,39 +293,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/nb-NO.xml view
@@ -69,7 +69,6 @@     <term name="in">i</term>     <term name="in press">i trykk</term>     <term name="internet">Internett</term>-    <term name="interview">intervju</term>     <term name="letter">brev</term>     <term name="no date">ingen dato</term>     <term name="no date" form="short">u.å.</term>@@ -93,9 +92,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -107,7 +106,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">intervju</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -138,8 +137,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -297,39 +296,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/nl-NL.xml view
@@ -70,7 +70,6 @@     <term name="in">in</term>     <term name="in press">in druk</term>     <term name="internet">internet</term>-    <term name="interview">interview</term>     <term name="letter">brief</term>     <term name="no date">zonder datum</term>     <term name="no date" form="short">z.d.</term>@@ -94,9 +93,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -139,8 +138,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -316,39 +315,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/nn-NO.xml view
@@ -69,7 +69,6 @@     <term name="in">i</term>     <term name="in press">i trykk</term>     <term name="internet">Internett</term>-    <term name="interview">intervju</term>     <term name="letter">brev</term>     <term name="no date">ingen dato</term>     <term name="no date" form="short">u.å.</term>@@ -93,9 +92,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -107,7 +106,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">intervju</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -138,8 +137,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -297,39 +296,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/pl-PL.xml view
@@ -75,7 +75,6 @@     <term name="in">w</term>     <term name="in press">w druku</term>     <term name="internet">internet</term>-    <term name="interview">wywiad</term>     <term name="letter">list</term>     <term name="no date">brak daty</term>     <term name="no date" form="short">b.d.</term>@@ -99,9 +98,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -113,7 +112,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">wywiad</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -144,8 +143,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -303,39 +302,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/pt-BR.xml view
@@ -72,7 +72,6 @@     <term name="in">em</term>     <term name="in press">no prelo</term>     <term name="internet">internet</term>-    <term name="interview">entrevista</term>     <term name="letter">carta</term>     <term name="no date">sem data</term>     <term name="no date" form="short">[s.d.]</term>@@ -96,9 +95,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -110,7 +109,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">entrevista</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -141,8 +140,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -312,39 +311,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/pt-PT.xml view
@@ -69,7 +69,6 @@     <term name="in">em</term>     <term name="in press">no prelo</term>     <term name="internet">internet</term>-    <term name="interview">entrevista</term>     <term name="letter">carta</term>     <term name="no date">sem data</term>     <term name="no date" form="short">sem data</term>@@ -93,9 +92,9 @@     <term name="article-magazine">artigo de revista</term>     <term name="article-newspaper">artigo de jornal</term>     <term name="bill">bill</term>-    <term name="book">livro</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">transmissão</term>-    <term name="chapter">capítulo de livro</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">clássico</term>     <term name="collection">coleção</term>     <term name="dataset">dataset</term>@@ -138,8 +137,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">gráf.</term>@@ -308,39 +307,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tít.</single>       <multiple>títs.</multiple>     </term>
locales/ro-RO.xml view
@@ -70,7 +70,6 @@     <term name="in">în</term>     <term name="in press">sub tipar</term>     <term name="internet">internet</term>-    <term name="interview">interviu</term>     <term name="letter">scrisoare</term>     <term name="no date">fără dată</term>     <term name="no date" form="short">f.a.</term>@@ -94,9 +93,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -108,7 +107,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">interviu</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -139,8 +138,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -299,39 +298,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/ru-RU.xml view
@@ -71,7 +71,6 @@     <term name="in">в</term>     <term name="in press">в печати</term>     <term name="internet">Интернет</term>-    <term name="interview">интервью</term>     <term name="letter">письмо</term>     <term name="no date">без даты</term>     <term name="no date" form="short">б. д.</term>@@ -97,9 +96,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -111,7 +110,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">интервью</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -142,8 +141,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -321,39 +320,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/sk-SK.xml view
@@ -72,7 +72,6 @@     <term name="in">v</term>     <term name="in press">v tlači</term>     <term name="internet">internet</term>-    <term name="interview">osobná komunikácia</term>     <term name="letter">list</term>     <term name="no date">no date</term>     <term name="no date" form="short">n.d.</term>@@ -96,9 +95,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -110,7 +109,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">osobná komunikácia</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -141,8 +140,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -306,39 +305,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/sl-SI.xml view
@@ -72,7 +72,6 @@     <term name="in">v</term>     <term name="in press">v tisku</term>     <term name="internet">internet</term>-    <term name="interview">intervju</term>     <term name="letter">pismo</term>     <term name="no date">brez datuma</term>     <term name="no date" form="short">b. d.</term>@@ -96,9 +95,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -110,7 +109,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">intervju</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -141,8 +140,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -300,39 +299,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/sr-RS.xml view
@@ -66,7 +66,6 @@     <term name="in">у</term>     <term name="in press">у штампи</term>     <term name="internet">Интернет</term>-    <term name="interview">интервју</term>     <term name="letter">писмо</term>     <term name="no date">no date</term>     <term name="no date" form="short">без датума</term>@@ -90,9 +89,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -104,7 +103,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">интервју</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -135,8 +134,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -300,39 +299,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/sv-SE.xml view
@@ -78,7 +78,6 @@     <term name="in">i</term>     <term name="in press">i tryck</term>     <term name="internet">internet</term>-    <term name="interview">intervju</term>     <term name="letter">brev</term>     <term name="no date">utan årtal</term>     <term name="no date" form="short">u.å.</term>@@ -102,9 +101,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -116,7 +115,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">intervju</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -147,8 +146,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -310,39 +309,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/th-TH.xml view
@@ -69,7 +69,6 @@     <term name="in">ใน</term>     <term name="in press">กำลังรอตีพิมพ์</term>     <term name="internet">อินเทอร์เน็ต</term>-    <term name="interview">การสัมภาษณ์</term>     <term name="letter">จดหมาย</term>     <term name="no date">ไม่ปรากฏปีที่พิมพ์</term>     <term name="no date" form="short">ม.ป.ป.</term>@@ -93,9 +92,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -107,7 +106,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">การสัมภาษณ์</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -138,8 +137,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -297,39 +296,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/tr-TR.xml view
@@ -79,7 +79,6 @@     <term name="in">içinde</term>     <term name="in press">basımda</term>     <term name="internet">internet</term>-    <term name="interview">mülakat</term>     <term name="letter">mektup</term>     <term name="no date">tarih yok</term>     <term name="no date" form="short">t.y.</term>@@ -103,9 +102,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -117,7 +116,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">mülakat</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -148,8 +147,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -307,39 +306,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/uk-UA.xml view
@@ -63,7 +63,6 @@     <term name="in">в</term>     <term name="in press">у пресі</term>     <term name="internet">інтернет</term>-    <term name="interview">інтервю</term>     <term name="letter">лист</term>     <term name="no date">без дати</term>     <term name="no date" form="short">б. д.</term>@@ -81,9 +80,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -95,7 +94,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">інтервю</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -126,8 +125,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -276,39 +275,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/vi-VN.xml view
@@ -69,7 +69,6 @@     <term name="in">trong</term>     <term name="in press">in press</term>     <term name="internet">internet</term>-    <term name="interview">interview</term>     <term name="letter">thư</term>     <term name="no date">không ngày</term>     <term name="no date" form="short">không ngày</term>@@ -93,9 +92,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -138,8 +137,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -303,39 +302,39 @@     </term>      <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
locales/zh-CN.xml view
@@ -72,7 +72,6 @@     <term name="in">收入</term>     <term name="in press">送印中</term>     <term name="internet">网际网络</term>-    <term name="interview">访谈</term>     <term name="letter">信函</term>     <term name="no date">日期不详</term>     <term name="no date" form="short">不详</term>@@ -90,9 +89,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -104,7 +103,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">访谈</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -135,8 +134,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -243,39 +242,39 @@     <term name="volume">卷</term>          <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>@@ -459,7 +458,7 @@     <term name="illustrator" form="verb-short">绘</term>     <term name="translator" form="verb-short">译</term>     <term name="editortranslator" form="verb-short">编译</term>-    <term name="reviewed-author" form="verb">校</term>+    <term name="reviewed-author" form="verb-short">校</term>      <!-- LONG MONTH FORMS -->     <term name="month-01">一月</term>
locales/zh-TW.xml view
@@ -66,7 +66,6 @@     <term name="in">收入</term>     <term name="in press">印行中</term>     <term name="internet">互聯網</term>-    <term name="interview">訪談</term>     <term name="letter">信函</term>     <term name="no date">日期不詳</term>     <term name="no date" form="short">不詳</term>@@ -84,9 +83,9 @@     <term name="article-magazine">magazine article</term>     <term name="article-newspaper">newspaper article</term>     <term name="bill">bill</term>-    <term name="book">book</term>+    <!-- book is in the list of locator terms -->     <term name="broadcast">broadcast</term>-    <term name="chapter">book chapter</term>+    <!-- chapter is in the list of locator terms -->     <term name="classic">classic</term>     <term name="collection">collection</term>     <term name="dataset">dataset</term>@@ -98,7 +97,7 @@     <!-- figure is in the list of locator terms -->     <term name="graphic">graphic</term>     <term name="hearing">hearing</term>-    <term name="interview">interview</term>+    <term name="interview">訪談</term>     <term name="legal_case">legal case</term>     <term name="legislation">legislation</term>     <term name="manuscript">manuscript</term>@@ -129,8 +128,8 @@     <term name="article-journal" form="short">journal art.</term>     <term name="article-magazine" form="short">mag. art.</term>     <term name="article-newspaper" form="short">newspaper art.</term>-    <term name="book" form="short">bk.</term>-    <term name="chapter" form="short">bk. chap.</term>+    <!-- book is in the list of locator terms -->+    <!-- chapter is in the list of locator terms -->     <term name="document" form="short">doc.</term>     <!-- figure is in the list of locator terms -->     <term name="graphic" form="short">graph.</term>@@ -237,39 +236,39 @@     <term name="volume">卷</term>          <!-- SHORT LOCATOR FORMS -->-    <term name="appendix">			 +    <term name="appendix" form="short">			        <single>app.</single>       <multiple>apps.</multiple>						      </term>-    <term name="article-locator">			 +    <term name="article-locator" form="short">			        <single>art.</single>       <multiple>arts.</multiple>     </term>-    <term name="elocation">			 +    <term name="elocation" form="short">			        <single>loc.</single>       <multiple>locs.</multiple>     </term>-    <term name="equation">			 +    <term name="equation" form="short">			        <single>eq.</single>       <multiple>eqs.</multiple>     </term>-    <term name="rule">			 +    <term name="rule" form="short">			        <single>r.</single>       <multiple>rr.</multiple>						      </term>-    <term name="scene">			 +    <term name="scene" form="short">			        <single>sc.</single>       <multiple>scs.</multiple>						      </term>-    <term name="table">			 +    <term name="table" form="short">			        <single>tbl.</single>       <multiple>tbls.</multiple>						      </term>-    <term name="timestamp"> <!-- generally blank -->+    <term name="timestamp" form="short"> <!-- generally blank -->       <single></single>       <multiple></multiple>						      </term>-    <term name="title-locator">			 +    <term name="title-locator" form="short">			        <single>tit.</single>       <multiple>tits.</multiple>     </term>
src/Citeproc/CslJson.hs view
@@ -33,7 +33,7 @@ import Citeproc.Locale (lookupQuotes) import Citeproc.CaseTransform import Data.Ord ()-import Data.Char (isAlphaNum, isSpace, isAscii)+import Data.Char (isAlphaNum, isSpace, isAscii, isPunctuation) import Data.Text (Text) import qualified Data.Text as T import Data.Foldable (fold)@@ -562,7 +562,8 @@   hasWordBreak = any (T.any isWordBreak)   splitUp = T.groupBy sameType   sameType c d =-    (isAlphaNum c && isAlphaNum d) || (isSpace c && isSpace d)+    (isAlphaNum c && isAlphaNum d) || (isSpace c && isSpace d) ||+      (isPunctuation c && isPunctuation d)  caseTransform :: Maybe Lang               -> CaseTransformer
src/Citeproc/Eval.hs view
@@ -137,6 +137,8 @@                            ref{ referenceVariables =                                  M.insert "citation-number"                                     (NumVal num) .+                                 M.insert "citation-key"+                                     (TextVal (unItemId citeId)) .                                  M.alter (addIfMissing (citationLabel ref))                                     "citation-label"                                  $ referenceVariables ref@@ -1861,54 +1863,76 @@       | otherwise -> return Nothing     Nothing  -> return Nothing -+formatSortDate :: CiteprocOutput a+               => [DP] -> (Maybe Int, Maybe Int, Maybe Int) -> Output a+formatSortDate dpSpecs (mbyr, mbmo, mbda) =+  Literal $ fromText $ T.pack $  sortyr <> sortmo <> sortda+ where+  sortyr = case mbyr of+             Just yr | any ((== DPYear) . dpName) dpSpecs+                -> printf "%04d" (yr + 5000) -- to work with BC and AD+             _  -> ""+  sortmo = case mbmo of+             Just mo | any ((== DPMonth) . dpName) dpSpecs+                -> printf "%02d" mo+             _  -> ""+  sortda = case mbda of+             Just da | any ((== DPDay) . dpName) dpSpecs+                -> printf "%02d" da+             _  -> ""  formatDateParts :: CiteprocOutput a           => [DP] -> (DateParts, Maybe DateParts) -> Eval a [Output a] formatDateParts dpSpecs (date, mbNextDate) = do+  inSortKey <- asks contextInSortKey   let (yr,mo,da) = bindDateParts date-  case mbNextDate of-    Nothing -> mapM (eDP (yr,mo,da)) dpSpecs-    Just nextDate -> do-      let (nextyr,nextmo,nextda) = bindDateParts nextDate-      let isOpenRange = nextyr == Just 0 &&-                        isNothing nextmo &&-                        isNothing nextda-      -- figure out where the range goes:-      -- first to differ out of the items selected by dpSpecs, in order y->m->d-      let dpToNs DPYear  = (yr, nextyr)-          dpToNs DPMonth = (mo, nextmo)-          dpToNs DPDay   = (da, nextda)-      let areSame = takeWhile (uncurry (==) . dpToNs) $-                      sort $ map dpName dpSpecs-      let (sames1, rest) = span (\dp -> dpName dp `elem` areSame) dpSpecs-      let (diffs, sames2) = span (\dp -> dpName dp `notElem` areSame) rest-      let cleanup = filter (/= NullOutput)-      sames1' <- cleanup <$> mapM (eDP (yr,mo,da)) sames1-      diffsLeft' <- cleanup <$> mapM (eDP (yr,mo,da)) diffs-      diffsRight' <- cleanup <$> mapM (eDP (nextyr,nextmo,nextda)) diffs-      sames2' <- cleanup <$> mapM (eDP (yr,mo,da)) sames2-      let rangeDelim = case sortOn dpName diffs of-                              []     -> Nothing-                              (dp:_) -> Just $ dpRangeDelimiter dp-      let toRange xs ys =-            case lastMay xs of-              Just xlast ->-                   initSafe xs ++-                     [Formatted mempty{ formatDelimiter = rangeDelim }-                     [xlast, headDef (Literal mempty) ys]] ++-                   tailSafe ys-              _ -> xs ++ ys+  case bindDateParts <$> mbNextDate of+    Nothing+      | inSortKey -> return [formatSortDate dpSpecs (yr, mo, da)]+      | otherwise -> mapM (eDP (yr,mo,da)) dpSpecs+    Just (nextyr, nextmo, nextda)+      | inSortKey -> return [formatSortDate dpSpecs (yr, mo, da),+                             Literal (fromText "-"),+                             formatSortDate dpSpecs (nextyr, nextmo, nextda)]+      | otherwise -> do+        let isOpenRange = nextyr == Just 0 &&+                          isNothing nextmo &&+                          isNothing nextda+        -- figure out where the range goes:+        -- first to differ out of the items selected by dpSpecs, in order y->m->d+        let dpToNs DPYear  = (yr, nextyr)+            dpToNs DPMonth = (mo, nextmo)+            dpToNs DPDay   = (da, nextda)+        let areSame = takeWhile (uncurry (==) . dpToNs) $+                        sort $ map dpName dpSpecs+        let (sames1, rest) = span (\dp -> dpName dp `elem` areSame) dpSpecs+        let (diffs, sames2) = span (\dp -> dpName dp `notElem` areSame) rest+        let cleanup = filter (/= NullOutput)+        sames1' <- cleanup <$> mapM (eDP (yr,mo,da)) sames1+        diffsLeft' <- cleanup <$> mapM (eDP (yr,mo,da)) diffs+        diffsRight' <- cleanup <$> mapM (eDP (nextyr,nextmo,nextda)) diffs+        sames2' <- cleanup <$> mapM (eDP (yr,mo,da)) sames2+        let rangeDelim = case sortOn dpName diffs of+                                []     -> Nothing+                                (dp:_) -> Just $ dpRangeDelimiter dp+        let toRange xs ys =+              case lastMay xs of+                Just xlast ->+                     initSafe xs +++                       [Formatted mempty{ formatDelimiter = rangeDelim }+                       [xlast, headDef (Literal mempty) ys]] +++                     tailSafe ys+                _ -> xs ++ ys -      return $-        if isOpenRange-           then [Formatted mempty{ formatSuffix = rangeDelim }-                    (removeLastSuffix $ sames1' ++ diffsLeft')]-           else removeLastSuffix $-                 sames1' ++-                 toRange (removeLastSuffix diffsLeft')-                         (removeFirstPrefix diffsRight') ++-                 sames2'+        return $+          if isOpenRange+             then [Formatted mempty{ formatSuffix = rangeDelim }+                      (removeLastSuffix $ sames1' ++ diffsLeft')]+             else removeLastSuffix $+                   sames1' +++                   toRange (removeLastSuffix diffsLeft')+                           (removeFirstPrefix diffsRight') +++                   sames2'  removeFirstPrefix :: [Output a] -> [Output a] removeFirstPrefix (Formatted f xs : rest) =
src/Citeproc/Pandoc.hs view
@@ -300,4 +300,5 @@   hasWordBreak = T.any isWordBreak   splitUp = T.groupBy sameType   sameType c d =-    (isAlphaNum c && isAlphaNum d) || (isSpace c && isSpace d)+    (isAlphaNum c && isAlphaNum d) || (isSpace c && isSpace d) ||+      (isPunctuation c && isPunctuation d)
src/Citeproc/Style.hs view
@@ -530,9 +530,15 @@   local (<> attrmap) $ do     node' <- expandMacros macroMap node     let layouts = getChildren "layout" node'-    let formatting = mconcat $ map (getFormatting . getAttributes) layouts+    -- In case there are multiple layouts (as CSL-M allows), we raise an error+    let elname = T.unpack $ X.nameLocalName $ X.elementName node+    layout <- case layouts of+                [] -> parseFailure $ "No layout element present in " <> elname+                [l] -> return l+                (_:_) -> parseFailure $ "Multiple layout elements present in " <> elname+    let formatting = getFormatting . getAttributes $ layout     let sorts   = getChildren "sort" node'-    elements <- mapM pElement (concatMap allChildren layouts)+    elements <- mapM pElement $ allChildren layout     let opts = LayoutOptions                { layoutCollapse =                    case lookupAttribute "collapse" attr of
+ test/extra/issue_126.txt view
@@ -0,0 +1,1779 @@+>>===== MODE =====>>+bibliography+<<===== MODE =====<<+++++>>===== RESULT =====>>+<div class="csl-bib-body">+  <div class="csl-entry">American College of Sports Medicine. (1975). <i>Guidelines for graded exercise testing and exercise prescription</i>.</div>+  <div class="csl-entry">American College of Sports Medicine. (2013). <i>ACSM’s resource manual for guidelines for exercise testing and prescription</i>.</div>+  <div class="csl-entry">American College of Sports Medicine. (2018). <i>ACSM’s exercise testing and prescription</i>.</div>+  <div class="csl-entry">American College of Sports Medicine. (2021a). <i>ACSM’s guidelines for exercise testing and prescription</i>.</div>+  <div class="csl-entry">American College of Sports Medicine. (2021b, November 10). <i>The American College of Sports Medicine</i>. https://bit.ly/3DSQHc8</div>+</div>+<<===== RESULT =====<<+++>>===== CSL =====>>+<?xml version="1.0" encoding="utf-8"?>+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">+  <info>+    <title>American Psychological Association 7th edition</title>+    <title-short>APA</title-short>+    <id>http://www.zotero.org/styles/apa</id>+    <link href="http://www.zotero.org/styles/apa" rel="self"/>+    <link href="http://www.zotero.org/styles/apa-6th-edition" rel="template"/>+    <link href="https://apastyle.apa.org/style-grammar-guidelines/references/examples" rel="documentation"/>+    <author>+      <name>Brenton M. Wiernik</name>+      <email>zotero@wiernik.org</email>+    </author>+    <category citation-format="author-date"/>+    <category field="psychology"/>+    <category field="generic-base"/>+    <updated>2022-01-31T14:30:00+00:00</updated>+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>+  </info>+  <locale xml:lang="en">+    <terms>+      <term name="editortranslator" form="short">+        <single>ed. &amp; trans.</single>+        <multiple>eds. &amp; trans.</multiple>+      </term>+      <term name="translator" form="short">trans.</term>+      <term name="interviewer" form="short">+        <single>interviewer</single>+        <multiple>interviewers</multiple>+      </term>+      <term name="collection-editor" form="short">+        <single>ed.</single>+        <multiple>eds.</multiple>+      </term>+      <term name="circa" form="short">ca.</term>+      <term name="bc"> B.C.E.</term>+      <term name="ad"> C.E.</term>+      <term name="letter">personal communication</term>+      <term name="letter" form="short">letter</term>+      <term name="issue" form="long">+        <single>issue</single>+        <multiple>issues</multiple>+      </term>+    </terms>+  </locale>+  <macro name="author-bib">+    <names variable="composer" delimiter=", ">+      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>+      <substitute>+        <names variable="author"/>+        <names variable="illustrator"/>+        <names variable="director">+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>+          <label form="long" prefix=" (" suffix=")" text-case="title"/>+        </names>+        <choose>+          <if variable="container-title">+            <choose>+              <if type="book entry entry-dictionary entry-encyclopedia" match="any">+                <choose>+                  <if variable="title">+                    <group delimiter=" ">+                      <text macro="title"/>+                      <text macro="parenthetical"/>+                    </group>+                  </if>+                  <else>+                    <text macro="title-and-descriptions"/>+                  </else>+                </choose>+              </if>+            </choose>+          </if>+        </choose>+        <!-- Test for editortranslator and put that first as that becomes available -->+        <names variable="editor" delimiter=", ">+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>+          <label form="short" prefix=" (" suffix=")" text-case="title"/>+        </names>+        <names variable="editorial-director">+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>+          <label form="short" prefix=" (" suffix=")" text-case="title"/>+        </names>+        <names variable="collection-editor">+          <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>+          <label form="short" prefix=" (" suffix=")" text-case="title"/>+        </names>+        <choose>+          <if variable="title">+            <group delimiter=" ">+              <text macro="title"/>+              <text macro="parenthetical"/>+            </group>+          </if>+          <else>+            <text macro="title-and-descriptions"/>+          </else>+        </choose>+      </substitute>+    </names>+  </macro>+  <macro name="author-intext">+    <choose>+      <if type="bill legal_case legislation treaty" match="any">+        <text macro="title-intext"/>+      </if>+      <else-if type="interview personal_communication" match="any">+        <choose>+          <!-- These variables indicate that the letter is retrievable by the reader.+                If not, then use the APA in-text-only personal communication format -->+          <if variable="archive container-title DOI publisher URL" match="none">+            <group delimiter=", ">+              <names variable="author">+                <name and="symbol" delimiter=", " initialize-with=". "/>+                <substitute>+                  <text macro="title-intext"/>+                </substitute>+              </names>+              <!-- Replace with term="personal-communication" if that becomes available -->+              <text term="letter"/>+            </group>+          </if>+          <else>+            <names variable="author" delimiter=", ">+              <name form="short" and="symbol" delimiter=", " initialize-with=". "/>+              <substitute>+                <text macro="title-intext"/>+              </substitute>+            </names>+          </else>+        </choose>+      </else-if>+      <else>+        <names variable="composer" delimiter=", ">+          <name form="short" and="symbol" delimiter=", " initialize-with=". "/>+          <substitute>+            <names variable="author"/>+            <names variable="illustrator"/>+            <names variable="director"/>+            <choose>+              <if variable="container-title">+                <choose>+                  <if type="book entry entry-dictionary entry-encyclopedia" match="any">+                    <text macro="title-intext"/>+                  </if>+                </choose>+              </if>+            </choose>+            <names variable="editor"/>+            <names variable="editorial-director"/>+            <text macro="title-intext"/>+          </substitute>+        </names>+      </else>+    </choose>+  </macro>+  <macro name="date-bib">+    <group delimiter=" " prefix="(" suffix=")">+      <choose>+        <if is-uncertain-date="issued">+          <text term="circa" form="short"/>+        </if>+      </choose>+      <group>+        <choose>+          <if variable="issued">+            <date variable="issued">+              <date-part name="year"/>+            </date>+            <text variable="year-suffix"/>+            <choose>+              <if type="article-magazine article-newspaper broadcast interview motion_picture pamphlet personal_communication post post-weblog song speech webpage" match="any">+                <!-- Many video and audio examples in manual give full dates. Err on the side of too much information. -->+                <date variable="issued">+                  <date-part prefix=", " name="month"/>+                  <date-part prefix=" " name="day"/>+                </date>+              </if>+              <else-if type="paper-conference">+                <!-- Capture 'speech' stored as 'paper-conference' -->+                <choose>+                  <if variable="collection-editor editor editorial-director issue page volume" match="none">+                    <date variable="issued">+                      <date-part prefix=", " name="month"/>+                      <date-part prefix=" " name="day"/>+                    </date>+                  </if>+                </choose>+              </else-if>+              <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic+                   manuscript map musical_score paper-conference[published] patent report review review-book thesis -->+            </choose>+          </if>+          <else-if variable="status">+            <group>+              <text variable="status" text-case="lowercase"/>+              <text variable="year-suffix" prefix="-"/>+            </group>+          </else-if>+          <else>+            <text term="no date" form="short"/>+            <text variable="year-suffix" prefix="-"/>+          </else>+        </choose>+      </group>+    </group>+  </macro>+  <macro name="date-sort-group">+    <!-- APA sorts 1. no-date items, 2. items with dates, 3. in-press (status) items -->+    <choose>+      <if variable="issued">+        <text value="1"/>+      </if>+      <else-if variable="status">+        <text value="2"/>+      </else-if>+      <else>+        <text value="0"/>+      </else>+    </choose>+  </macro>+  <macro name="date-sort-date">+    <date variable="issued" form="numeric"/>+  </macro>+  <macro name="date-intext">+    <choose>+      <if variable="issued">+        <group delimiter="/">+          <group delimiter=" ">+            <choose>+              <if is-uncertain-date="original-date">+                <text term="circa" form="short"/>+              </if>+            </choose>+            <date variable="original-date">+              <date-part name="year"/>+            </date>+          </group>+          <group delimiter=" ">+            <choose>+              <if is-uncertain-date="issued">+                <text term="circa" form="short"/>+              </if>+            </choose>+            <group>+              <choose>+                <if type="interview personal_communication" match="any">+                  <choose>+                    <if variable="archive container-title DOI publisher URL" match="none">+                      <!-- These variables indicate that the communication is retrievable by the reader.+                           If not, then use the in-text-only personal communication format -->+                      <date variable="issued" form="text"/>+                    </if>+                    <else>+                      <date variable="issued">+                        <date-part name="year"/>+                      </date>+                    </else>+                  </choose>+                </if>+                <else>+                  <date variable="issued">+                    <date-part name="year"/>+                  </date>+                </else>+              </choose>+              <text variable="year-suffix"/>+            </group>+          </group>+        </group>+      </if>+      <else-if variable="status">+        <text variable="status" text-case="lowercase"/>+        <text variable="year-suffix" prefix="-"/>+      </else-if>+      <else>+        <text term="no date" form="short"/>+        <text variable="year-suffix" prefix="-"/>+      </else>+    </choose>+  </macro>+  <!-- APA has two description elements following the title:+       title (parenthetical) [bracketed]  -->+  <macro name="title-and-descriptions">+    <choose>+      <if variable="title">+        <group delimiter=" ">+          <text macro="title"/>+          <text macro="parenthetical"/>+          <text macro="bracketed"/>+        </group>+      </if>+      <else>+        <group delimiter=" ">+          <text macro="bracketed"/>+          <text macro="parenthetical"/>+        </group>+      </else>+    </choose>+  </macro>+  <macro name="title">+    <choose>+      <if type="post webpage" match="any">+        <!-- Webpages are always italicized -->+        <text variable="title" font-style="italic"/>+      </if>+      <else-if variable="container-title" match="any">+        <!-- Other types are italicized based on presence of container-title.+             Assume that review and review-book are published in periodicals/blogs,+             not just on a web page (ex. 69) -->+        <text variable="title"/>+      </else-if>+      <else>+        <choose>+          <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">+            <text variable="title" font-style="italic"/>+          </if>+          <else-if type="paper-conference">+            <choose>+              <if variable="collection-editor editor editorial-director" match="any">+                <group delimiter=": " font-style="italic">+                  <text variable="title"/>+                  <!-- Replace with volume-title as that becomes available -->+                  <choose>+                    <if is-numeric="volume" match="none">+                      <group delimiter=" ">+                        <label variable="volume" form="short" text-case="capitalize-first"/>+                        <text variable="volume"/>+                      </group>+                    </if>+                  </choose>+                </group>+              </if>+              <else>+                <text variable="title" font-style="italic"/>+              </else>+            </choose>+          </else-if>+          <else>+            <group delimiter=": " font-style="italic">+              <text variable="title"/>+              <!-- Replace with volume-title as that becomes available -->+              <choose>+                <if is-numeric="volume" match="none">+                  <group delimiter=" ">+                    <label variable="volume" form="short" text-case="capitalize-first"/>+                    <text variable="volume"/>+                  </group>+                </if>+              </choose>+            </group>+          </else>+        </choose>+      </else>+    </choose>+  </macro>+  <macro name="title-intext">+    <choose>+      <if variable="title" match="none">+        <text macro="bracketed-intext" prefix="[" suffix="]"/>+      </if>+      <else-if type="bill">+        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->+        <choose>+          <if variable="number container-title" match="none">+            <text variable="title" form="short" font-style="italic" text-case="title"/>+          </if>+          <else-if variable="title">+            <text variable="title" form="short" text-case="title"/>+          </else-if>+          <else>+            <group delimiter=" ">+              <text variable="genre"/>+              <group delimiter=" ">+                <choose>+                  <if variable="chapter-number container-title" match="none">+                    <!-- Replace with label variable="number" as that becomes available -->+                    <text term="issue" form="short"/>+                  </if>+                </choose>+                <text variable="number"/>+              </group>+            </group>+          </else>+        </choose>+      </else-if>+      <else-if type="legal_case" match="any">+        <!-- Cases are italicized -->+        <text variable="title" font-style="italic"/>+      </else-if>+      <else-if type="legislation treaty" match="any">+        <!-- Legislation and treaties not italicized or quoted -->+        <text variable="title" form="short" text-case="title"/>+      </else-if>+      <else-if type="post webpage" match="any">+        <!-- Webpages are always italicized -->+        <text variable="title" form="short" font-style="italic" text-case="title"/>+      </else-if>+      <else-if variable="container-title" match="any">+        <!-- Other types are italicized or quoted based on presence of container-title. As in title macro. -->+        <text variable="title" form="short" quotes="true" text-case="title"/>+      </else-if>+      <else>+        <text variable="title" form="short" font-style="italic" text-case="title"/>+      </else>+    </choose>+  </macro>+  <macro name="parenthetical">+    <!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->+    <group prefix="(" suffix=")">+      <choose>+        <if type="patent">+          <!-- authority: U.S. ; genre: patent ; number: 123,445 -->+          <group delimiter=" ">+            <text variable="authority" form="short"/>+            <choose>+              <if variable="genre">+                <text variable="genre" text-case="capitalize-first"/>+              </if>+              <else>+                <!-- This should be localized -->+                <text value="patent" text-case="capitalize-first"/>+              </else>+            </choose>+            <group delimiter=" ">+              <!-- Replace with label variable="number" if that becomes available -->+              <text term="issue" form="short" text-case="capitalize-first"/>+              <text variable="number"/>+            </group>+          </group>+        </if>+        <else-if type="post webpage" match="any">+          <!-- For post webpage, container-title is treated as publisher -->+          <group delimiter="; ">+            <text macro="secondary-contributors"/>+            <text macro="database-location"/>+            <text macro="number"/>+            <text macro="locators-booklike"/>+          </group>+        </else-if>+        <else-if variable="container-title">+          <group delimiter="; ">+            <text macro="secondary-contributors"/>+            <choose>+              <if type="broadcast graphic map motion_picture song" match="any">+                <!-- For audiovisual media, number information comes after title, not container-title -->+                <text macro="number"/>+              </if>+            </choose>+          </group>+        </else-if>+        <else>+          <group delimiter="; ">+            <text macro="secondary-contributors"/>+            <text macro="database-location"/>+            <text macro="number"/>+            <text macro="locators-booklike"/>+          </group>+        </else>+      </choose>+    </group>+  </macro>+  <macro name="parenthetical-container">+    <choose>+      <if variable="container-title" match="any">+        <group prefix="(" suffix=")">+          <group delimiter="; ">+            <text macro="database-location"/>+            <choose>+              <if type="broadcast graphic map motion_picture song" match="none">+                <!-- For audiovisual media, number information comes after title, not container-title -->+                <text macro="number"/>+              </if>+            </choose>+            <text macro="locators-booklike"/>+          </group>+        </group>+      </if>+    </choose>+  </macro>+  <macro name="bracketed">+    <!-- [Descriptive information] -->+    <!-- If there is a number, genre is already printed in macro="number" -->+    <group prefix="[" suffix="]">+      <choose>+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">+          <!-- Reviewed item -->+          <group delimiter="; ">+            <group delimiter=", ">+              <group delimiter=" ">+                <!-- Assume that genre is entered as 'Review of the book' or similar -->+                <choose>+                  <if variable="number" match="none">+                    <choose>+                      <if variable="genre">+                        <text variable="genre" text-case="capitalize-first"/>+                      </if>+                      <else-if variable="medium">+                        <text variable="medium" text-case="capitalize-first"/>+                      </else-if>+                      <else>+                        <!-- Replace with term="review" as that becomes available -->+                        <text value="Review of"/>+                      </else>+                    </choose>+                  </if>+                  <else>+                    <choose>+                      <if variable="medium">+                        <text variable="medium" text-case="capitalize-first"/>+                      </if>+                      <else>+                        <!-- Replace with term="review" as that becomes available -->+                        <text value="Review of"/>+                      </else>+                    </choose>+                  </else>+                </choose>+                <text macro="reviewed-title"/>+              </group>+              <names variable="reviewed-author">+                <label form="verb-short" suffix=" "/>+                <name and="symbol" initialize-with=". " delimiter=", "/>+              </names>+            </group>+            <choose>+              <if variable="genre" match="any">+                <choose>+                  <if variable="number" match="none">+                    <text variable="medium" text-case="capitalize-first"/>+                  </if>+                </choose>+              </if>+            </choose>+          </group>+        </if>+        <else-if type="thesis">+          <!-- Thesis type and institution -->+          <group delimiter="; ">+            <choose>+              <if variable="number" match="none">+                <group delimiter=", ">+                  <text variable="genre" text-case="capitalize-first"/>+                  <choose>+                    <if variable="archive DOI URL" match="any">+                      <!-- Include the university in brackets if thesis is published -->+                      <text variable="publisher"/>+                    </if>+                  </choose>+                </group>+              </if>+            </choose>+            <text variable="medium" text-case="capitalize-first"/>+          </group>+        </else-if>+        <else-if variable="interviewer" type="interview" match="any">+          <!-- Interview information -->+          <choose>+            <if variable="title">+              <text macro="format"/>+            </if>+            <else-if variable="genre">+              <group delimiter="; ">+                <group delimiter=" ">+                  <text variable="genre" text-case="capitalize-first"/>+                  <group delimiter=" ">+                    <text term="author" form="verb"/>+                    <names variable="interviewer">+                      <name and="symbol" initialize-with=". " delimiter=", "/>+                    </names>+                  </group>+                </group>+              </group>+            </else-if>+            <else-if variable="interviewer">+              <group delimiter="; ">+                <names variable="interviewer">+                  <label form="verb" suffix=" " text-case="capitalize-first"/>+                  <name and="symbol" initialize-with=". " delimiter=", "/>+                </names>+                <text variable="medium" text-case="capitalize-first"/>+              </group>+            </else-if>+            <else>+              <text macro="format"/>+            </else>+          </choose>+        </else-if>+        <else-if type="personal_communication">+          <!-- Letter information -->+          <choose>+            <if variable="recipient">+              <group delimiter="; ">+                <group delimiter=" ">+                  <choose>+                    <if variable="number" match="none">+                      <choose>+                        <if variable="genre">+                          <text variable="genre" text-case="capitalize-first"/>+                        </if>+                        <else-if variable="medium">+                          <text variable="medium" text-case="capitalize-first"/>+                        </else-if>+                        <else>+                          <text term="letter" form="short" text-case="capitalize-first"/>+                        </else>+                      </choose>+                    </if>+                    <else>+                      <choose>+                        <if variable="medium">+                          <text variable="medium" text-case="capitalize-first"/>+                        </if>+                        <else>+                          <text term="letter" form="short" text-case="capitalize-first"/>+                        </else>+                      </choose>+                    </else>+                  </choose>+                  <names variable="recipient" delimiter=", ">+                    <label form="verb" suffix=" "/>+                    <name and="symbol" delimiter=", "/>+                  </names>+                </group>+                <choose>+                  <if variable="genre" match="any">+                    <choose>+                      <if variable="number" match="none">+                        <text variable="medium" text-case="capitalize-first"/>+                      </if>+                    </choose>+                  </if>+                </choose>+              </group>+            </if>+            <else>+              <text macro="format"/>+            </else>+          </choose>+        </else-if>+        <else-if variable="composer" type="song" match="all">+          <!-- Performer of classical music works -->+          <group delimiter="; ">+            <choose>+              <if variable="number" match="none">+                <group delimiter=" ">+                  <choose>+                    <if variable="genre">+                      <text variable="genre" text-case="capitalize-first"/>+                      <!-- Replace prefix with performer label as that becomes available -->+                      <names variable="author" prefix="recorded by ">+                        <name and="symbol" initialize-with=". " delimiter=", "/>+                      </names>+                    </if>+                    <else-if variable="medium">+                      <text variable="medium" text-case="capitalize-first"/>+                      <!-- Replace prefix with performer label as that becomes available -->+                      <names variable="author" prefix="recorded by ">+                        <name and="symbol" initialize-with=". " delimiter=", "/>+                      </names>+                    </else-if>+                    <else>+                      <!-- Replace prefix with performer label as that becomes available -->+                      <names variable="author" prefix="Recorded by ">+                        <name and="symbol" initialize-with=". " delimiter=", "/>+                      </names>+                    </else>+                  </choose>+                </group>+              </if>+              <else>+                <group delimiter=" ">+                  <choose>+                    <if variable="medium">+                      <text variable="medium" text-case="capitalize-first"/>+                      <!-- Replace prefix with performer label as that becomes available -->+                      <names variable="author" prefix="recorded by ">+                        <name and="symbol" initialize-with=". " delimiter=", "/>+                      </names>+                    </if>+                    <else>+                      <!-- Replace prefix with performer label as that becomes available -->+                      <names variable="author" prefix="Recorded by ">+                        <name and="symbol" initialize-with=". " delimiter=", "/>+                      </names>+                    </else>+                  </choose>+                </group>+              </else>+            </choose>+            <choose>+              <if variable="genre" match="any">+                <choose>+                  <if variable="number" match="none">+                    <text variable="medium" text-case="capitalize-first"/>+                  </if>+                </choose>+              </if>+            </choose>+          </group>+        </else-if>+        <else-if variable="container-title" match="none">+          <!-- Other description -->+          <text macro="format"/>+        </else-if>+        <else>+          <!-- For conference presentations, chapters in reports, software, place bracketed after the container title -->+          <choose>+            <if type="paper-conference speech" match="any">+              <choose>+                <if variable="collection-editor editor editorial-director issue page volume" match="any">+                  <text macro="format"/>+                </if>+              </choose>+            </if>+            <else-if type="book">+              <choose>+                <if variable="version" match="none">+                  <text macro="format"/>+                </if>+              </choose>+            </else-if>+            <else-if type="report" match="none">+              <text macro="format"/>+            </else-if>+          </choose>+        </else>+      </choose>+    </group>+  </macro>+  <macro name="bracketed-intext">+    <group prefix="[" suffix="]">+      <choose>+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">+          <!-- This should be localized -->+          <text macro="reviewed-title-intext" prefix="Review of "/>+        </if>+        <else-if variable="interviewer" type="interview" match="any">+          <names variable="interviewer">+            <label form="verb" suffix=" " text-case="capitalize-first"/>+            <name and="symbol" initialize-with=". " delimiter=", "/>+            <substitute>+              <text macro="format-intext"/>+            </substitute>+          </names>+        </else-if>+        <else-if type="personal_communication">+          <!-- Letter information -->+          <choose>+            <if variable="recipient">+              <group delimiter=" ">+                <choose>+                  <if variable="number" match="none">+                    <text variable="genre" text-case="capitalize-first"/>+                  </if>+                  <else>+                    <text term="letter" form="short" text-case="capitalize-first"/>+                  </else>+                </choose>+                <names variable="recipient" delimiter=", ">+                  <label form="verb" suffix=" "/>+                  <name and="symbol" delimiter=", "/>+                </names>+              </group>+            </if>+            <else>+              <text macro="format-intext"/>+            </else>+          </choose>+        </else-if>+        <else>+          <text macro="format-intext"/>+        </else>+      </choose>+    </group>+  </macro>+  <macro name="bracketed-container">+    <group prefix="[" suffix="]">+      <choose>+        <if type="paper-conference speech" match="any">+          <!-- Conference presentations should describe the session [container] in bracketed unless published in a proceedings -->+          <choose>+            <if variable="collection-editor editor editorial-director issue page volume" match="none">+              <text macro="format"/>+            </if>+          </choose>+        </if>+        <else-if type="book" variable="version" match="all">+          <!-- For entries in mobile app reference works, place bracketed after the container-title -->+          <text macro="format"/>+        </else-if>+        <else-if type="report">+          <!-- For chapters in reports, place bracketed after the container title -->+          <text macro="format"/>+        </else-if>+      </choose>+    </group>+  </macro>+  <macro name="secondary-contributors">+    <choose>+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">+        <text macro="secondary-contributors-periodical"/>+      </if>+      <else-if type="paper-conference">+        <choose>+          <if variable="collection-editor editor editorial-director" match="any">+            <text macro="secondary-contributors-booklike"/>+          </if>+          <else>+            <text macro="secondary-contributors-periodical"/>+          </else>+        </choose>+      </else-if>+      <else>+        <text macro="secondary-contributors-booklike"/>+      </else>+    </choose>+  </macro>+  <macro name="secondary-contributors-periodical">+    <group delimiter="; ">+      <choose>+        <if variable="title">+          <names variable="interviewer" delimiter="; ">+            <name and="symbol" initialize-with=". " delimiter=", "/>+            <label form="short" prefix=", " text-case="title"/>+          </names>+        </if>+      </choose>+      <names variable="translator" delimiter="; ">+        <name and="symbol" initialize-with=". " delimiter=", "/>+        <label form="short" prefix=", " text-case="title"/>+      </names>+    </group>+  </macro>+  <macro name="secondary-contributors-booklike">+    <group delimiter="; ">+      <choose>+        <if variable="title">+          <names variable="interviewer">+            <name and="symbol" initialize-with=". " delimiter=", "/>+            <label form="short" prefix=", " text-case="title"/>+          </names>+        </if>+      </choose>+      <!-- When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->+      <choose>+        <if type="post webpage" match="none">+          <!-- Webpages treat container-title like publisher -->+          <choose>+            <if variable="container-title" match="none">+              <group delimiter="; ">+                <names variable="container-author">+                  <label form="verb-short" suffix=" " text-case="title"/>+                  <name and="symbol" initialize-with=". " delimiter=", "/>+                </names>+                <names variable="editor translator" delimiter="; ">+                  <name and="symbol" initialize-with=". " delimiter=", "/>+                  <label form="short" prefix=", " text-case="title"/>+                </names>+              </group>+            </if>+          </choose>+        </if>+        <else>+          <group delimiter="; ">+            <names variable="container-author">+              <label form="verb-short" suffix=" " text-case="title"/>+              <name and="symbol" initialize-with=". " delimiter=", "/>+            </names>+            <names variable="editor translator" delimiter="; ">+              <name and="symbol" initialize-with=". " delimiter=", "/>+              <label form="short" prefix=", " text-case="title"/>+            </names>+          </group>+        </else>+      </choose>+    </group>+  </macro>+  <macro name="database-location">+    <choose>+      <if variable="archive-place" match="none">+        <!-- With `archive-place`: physical archives. Without: online archives. -->+        <!-- Add archive_collection as that becomes available -->+        <text variable="archive_location"/>+      </if>+    </choose>+  </macro>+  <macro name="number">+    <choose>+      <if variable="number">+        <group delimiter=", ">+          <group delimiter=" ">+            <text variable="genre" text-case="title"/>+            <choose>+              <if is-numeric="number">+                <!-- Replace with label variable="number" if that becomes available -->+                <text term="issue" form="short" text-case="capitalize-first"/>+                <text variable="number"/>+              </if>+              <else>+                <text variable="number"/>+              </else>+            </choose>+          </group>+          <choose>+            <if type="thesis">+              <choose>+                <!-- Include the university in brackets if thesis is published -->+                <if variable="archive DOI URL" match="any">+                  <text variable="publisher"/>+                </if>+              </choose>+            </if>+          </choose>+        </group>+      </if>+    </choose>+  </macro>+  <macro name="locators-booklike">+    <choose>+      <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>+      <else-if type="paper-conference">+        <choose>+          <if variable="collection-editor editor editorial-director" match="any">+            <group delimiter=", ">+              <text macro="version"/>+              <text macro="edition"/>+              <text macro="volume-booklike"/>+            </group>+          </if>+        </choose>+      </else-if>+      <else>+        <group delimiter=", ">+          <text macro="version"/>+          <text macro="edition"/>+          <text macro="volume-booklike"/>+        </group>+      </else>+    </choose>+  </macro>+  <macro name="version">+    <choose>+      <if is-numeric="version">+        <group delimiter=" ">+          <!-- replace with label variable="version" if that becomes available -->+          <text term="version" text-case="capitalize-first"/>+          <text variable="version"/>+        </group>+      </if>+      <else>+        <text variable="version"/>+      </else>+    </choose>+  </macro>+  <macro name="edition">+    <choose>+      <if is-numeric="edition">+        <group delimiter=" ">+          <number variable="edition" form="ordinal"/>+          <label variable="edition" form="short"/>+        </group>+      </if>+      <else>+        <text variable="edition"/>+      </else>+    </choose>+  </macro>+  <macro name="volume-booklike">+    <group delimiter=", ">+      <!-- Report series [ex. 52] -->+      <choose>+        <if type="report">+          <group delimiter=" ">+            <text variable="collection-title" text-case="title"/>+            <text variable="collection-number"/>+          </group>+        </if>+      </choose>+      <choose>+        <if variable="volume" match="any">+          <choose>+            <!-- Non-numeric volumes are already printed as part of the book title -->+            <if is-numeric="volume" match="none"/>+            <else>+              <group delimiter=" ">+                <label variable="volume" form="short" text-case="capitalize-first"/>+                <number variable="volume" form="numeric"/>+              </group>+            </else>+          </choose>+        </if>+        <else>+          <group>+            <!-- Replace with label variable="number-of-volumes" if that becomes available -->+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>+            <text term="page-range-delimiter" prefix="1"/>+            <number variable="number-of-volumes" form="numeric"/>+          </group>+        </else>+      </choose>+      <group delimiter=" ">+        <label variable="issue" text-case="capitalize-first"/>+        <text variable="issue"/>+      </group>+      <group delimiter=" ">+        <label variable="page" form="short" suffix=" "/>+        <text variable="page"/>+      </group>+    </group>+  </macro>+  <macro name="reviewed-title">+    <choose>+      <if variable="reviewed-title">+        <!-- Not possible to distinguish TV series episode from other reviewed+              works [Ex. 69] -->+        <text variable="reviewed-title" font-style="italic"/>+      </if>+      <else>+        <!-- Assume title is title of reviewed work -->+        <text variable="title" font-style="italic"/>+      </else>+    </choose>+  </macro>+  <macro name="reviewed-title-intext">+    <choose>+      <if variable="reviewed-title">+        <!-- Not possible to distinguish TV series episode from other reviewed works [Ex. 69] -->+        <text variable="reviewed-title" form="short" font-style="italic" text-case="title"/>+      </if>+      <else>+        <!-- Assume title is title of reviewed work -->+        <text variable="title" form="short" font-style="italic" text-case="title"/>+      </else>+    </choose>+  </macro>+  <macro name="format">+    <choose>+      <if variable="genre medium" match="any">+        <group delimiter="; ">+          <choose>+            <if variable="number" match="none">+              <text variable="genre" text-case="capitalize-first"/>+            </if>+          </choose>+          <text variable="medium" text-case="capitalize-first"/>+        </group>+      </if>+      <!-- Generic labels for specific types -->+      <!-- These should be localized when possible -->+      <else-if type="dataset">+        <text value="Data set"/>+      </else-if>+      <else-if type="book" variable="version" match="all">+        <!-- Replace with type="software" and term="software" as that becomes available -->+        <text value="Computer software"/>+      </else-if>+      <else-if type="interview personal_communication" match="any">+        <choose>+          <if variable="archive container-title DOI publisher URL" match="none">+            <text term="letter" text-case="capitalize-first"/>+          </if>+          <else-if type="interview">+            <text term="interview" text-case="capitalize-first"/>+          </else-if>+        </choose>+      </else-if>+      <else-if type="map">+        <text value="Map"/>+      </else-if>+    </choose>+  </macro>+  <macro name="format-intext">+    <choose>+      <if variable="genre" match="any">+        <text variable="genre" text-case="capitalize-first"/>+      </if>+      <else-if variable="medium">+        <text variable="medium" text-case="capitalize-first"/>+      </else-if>+      <!-- Generic labels for specific types -->+      <!-- These should be localized when possible -->+      <else-if type="dataset">+        <text value="Data set"/>+      </else-if>+      <else-if type="book" variable="version" match="all">+        <!-- Replace with type="software" and term="software" as that becomes available -->+        <text value="Computer software"/>+      </else-if>+      <else-if type="interview personal_communication" match="any">+        <choose>+          <if variable="archive container-title DOI publisher URL" match="none">+            <text term="letter" text-case="capitalize-first"/>+          </if>+          <else-if type="interview">+            <text term="interview" text-case="capitalize-first"/>+          </else-if>+        </choose>+      </else-if>+      <else-if type="map">+        <text value="Map"/>+      </else-if>+    </choose>+  </macro>+  <!-- APA 'source' element contains four parts:+       container, event, publisher, access -->+  <macro name="container">+    <choose>+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">+        <!-- Periodical items -->+        <text macro="container-periodical"/>+      </if>+      <else-if type="paper-conference">+        <!-- Determine if paper-conference is a periodical or booklike -->+        <choose>+          <if variable="editor editorial-director collection-editor container-author" match="any">+            <text macro="container-booklike"/>+          </if>+          <else>+            <text macro="container-periodical"/>+          </else>+        </choose>+      </else-if>+      <else-if type="post webpage" match="none">+        <!-- post and webpage treat container-title like publisher -->+        <text macro="container-booklike"/>+      </else-if>+    </choose>+  </macro>+  <macro name="container-periodical">+    <group delimiter=". ">+      <group delimiter=", ">+        <text variable="container-title" font-style="italic" text-case="title"/>+        <choose>+          <if variable="volume">+            <group>+              <text variable="volume" font-style="italic"/>+              <text variable="issue" prefix="(" suffix=")"/>+            </group>+          </if>+          <else>+            <text variable="issue" font-style="italic"/>+          </else>+        </choose>+        <choose>+          <if variable="number">+            <!-- Ex. 6: Journal article with article number or eLocator -->+            <!-- This should be localized -->+            <group delimiter=" ">+              <text term="article-locator" text-case="capitalize-first"/>+              <text variable="number"/>+            </group>+          </if>+          <else>+            <text variable="page"/>+          </else>+        </choose>+      </group>+      <choose>+        <if variable="issued">+          <choose>+            <if variable="issue page volume" match="none">+              <text variable="status" text-case="capitalize-first"/>+            </if>+          </choose>+        </if>+      </choose>+    </group>+  </macro>+  <macro name="container-booklike">+    <choose>+      <if variable="container-title" match="any">+        <group delimiter=" ">+          <text term="in" text-case="capitalize-first"/>+          <group delimiter=", ">+            <names variable="editor translator" delimiter=", &amp; ">+              <!-- Change to editortranslator and move editor to substitute as that becomes available -->+              <name and="symbol" initialize-with=". " delimiter=", "/>+              <label form="short" text-case="title" prefix=" (" suffix=")"/>+              <substitute>+                <names variable="editorial-director"/>+                <names variable="collection-editor"/>+                <names variable="container-author"/>+              </substitute>+            </names>+            <group delimiter=": " font-style="italic">+              <text variable="container-title"/>+              <!-- Replace with volume-title as that becomes available -->+              <choose>+                <if is-numeric="volume" match="none">+                  <group delimiter=" ">+                    <label variable="volume" form="short" text-case="capitalize-first"/>+                    <text variable="volume"/>+                  </group>+                </if>+              </choose>+            </group>+          </group>+          <text macro="parenthetical-container"/>+          <text macro="bracketed-container"/>+        </group>+      </if>+    </choose>+  </macro>+  <macro name="publisher">+    <group delimiter="; ">+      <choose>+        <if type="thesis">+          <choose>+            <if variable="archive DOI URL" match="none">+              <text variable="publisher"/>+            </if>+          </choose>+        </if>+        <else-if type="post webpage" match="any">+          <!-- For websites, treat container title like publisher -->+          <group delimiter="; ">+            <text variable="container-title" text-case="title"/>+            <text variable="publisher"/>+          </group>+        </else-if>+        <else-if type="paper-conference">+          <!-- For paper-conference, don't print publisher if in a journal-like proceedings -->+          <choose>+            <if variable="collection-editor editor editorial-director" match="any">+              <text variable="publisher"/>+            </if>+          </choose>+        </else-if>+        <else-if type="article-journal article-magazine article-newspaper post-weblog" match="none">+          <text variable="publisher"/>+        </else-if>+      </choose>+      <group delimiter=", ">+        <choose>+          <if variable="archive-place">+            <!-- With `archive-place`: physical archives. Without: online archives. -->+            <!-- For physical archives, print the location before the archive name.+                For electronic archives, these are printed in macro="description". -->+            <!-- Split "archive_location" into "archive_collection" and "archive_location" as that becomes available -->+            <!-- Must test for archive_collection:+                With collection: archive_collection (archive_location), archive, archive-place+                No collection: archive (archive_location), archive-place+            -->+            <text variable="archive_location"/>+          </if>+        </choose>+        <text variable="archive"/>+        <text variable="archive-place"/>+      </group>+    </group>+  </macro>+  <macro name="access">+    <choose>+      <if variable="DOI" match="any">+        <text variable="DOI" prefix="https://doi.org/"/>+      </if>+      <else-if variable="URL">+        <group delimiter=" ">+          <choose>+            <if variable="issued status" match="none">+              <group delimiter=" ">+                <text term="retrieved" text-case="capitalize-first"/>+                <date variable="accessed" form="text" suffix=","/>+                <text term="from"/>+              </group>+            </if>+          </choose>+          <text variable="URL"/>+        </group>+      </else-if>+    </choose>+  </macro>+  <macro name="event">+    <choose>+      <if variable="event event-title" match="any">+        <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to+             both publisher-place and event-place. Remove this 'choose' when that is changed. -->+        <choose>+          <if variable="collection-editor editor editorial-director issue page volume" match="none">+            <!-- Don't print event info if published in a proceedings -->+            <group delimiter=", ">+              <text macro="event-title"/>+              <text variable="event-place"/>+            </group>+          </if>+        </choose>+      </if>+    </choose>+  </macro>+  <macro name="event-title">+    <choose>+      <!-- TODO: We expect "event-title" to be used,+           but processors and applications may not be updated yet.+           This macro ensures that either "event" or "event-title" can be accpeted.+           Remove if procesor logic and application adoption can handle this. -->+      <if variable="event-title">+        <text variable="event-title"/>+      </if>+      <else>+        <text variable="event"/>+      </else>+    </choose>+  </macro>+  <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->+  <macro name="publication-history">+    <choose>+      <if type="patent" match="none">+        <group prefix="(" suffix=")">+          <choose>+            <if variable="references">+              <!-- This provides the option for more elaborate description+                   of publication history, such as full "reprinted" references+                   (examples 11, 43, 44) or retracted references -->+              <text variable="references"/>+            </if>+            <else>+              <group delimiter=" ">+                <text value="Original work published"/>+                <choose>+                  <if is-uncertain-date="original-date">+                    <text term="circa" form="short"/>+                  </if>+                </choose>+                <date variable="original-date">+                  <date-part name="year"/>+                </date>+              </group>+            </else>+          </choose>+        </group>+      </if>+      <else>+        <text variable="references" prefix="(" suffix=")"/>+      </else>+    </choose>+  </macro>+  <!-- Legal citations have their own rules -->+  <macro name="legal-cites">+    <choose>+      <if type="legal_case">+        <group delimiter=". ">+          <group delimiter=", ">+            <text variable="title"/>+            <group delimiter=" ">+              <text macro="container-legal"/>+              <text macro="date-legal"/>+            </group>+            <text variable="references"/>+          </group>+          <text macro="access"/>+        </group>+      </if>+      <else-if type="bill">+        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->+        <group delimiter=". ">+          <group delimiter=", ">+            <choose>+              <if variable="number container-title" match="none">+                <!-- If no number or container-title, then assume it is a hearing -->+                <text variable="title" font-style="italic"/>+              </if>+              <else>+                <text variable="title"/>+              </else>+            </choose>+            <group delimiter=" ">+              <text macro="container-legal"/>+              <text macro="date-legal"/>+              <choose>+                <if variable="number container-title" match="none">+                  <!-- If no number or container-title, then assume it is a hearing -->+                  <names variable="author" prefix="(testimony of " suffix=")">+                    <name and="symbol" delimiter=", "/>+                  </names>+                </if>+                <else>+                  <text variable="status" prefix="(" suffix=")"/>+                </else>+              </choose>+            </group>+            <text variable="references"/>+          </group>+          <text macro="access"/>+        </group>+      </else-if>+      <else-if type="legislation">+        <!-- Currently designed to handle statutes, codified regulations, executive orders.+             For uncodified regulations, assume future code section is in status. -->+        <group delimiter=". ">+          <group delimiter=", ">+            <text variable="title"/>+            <group delimiter=" ">+              <text macro="container-legal"/>+              <text macro="date-legal"/>+              <text variable="status" prefix="(" suffix=")"/>+            </group>+            <text variable="references"/>+          </group>+          <text macro="access"/>+        </group>+      </else-if>+      <else-if type="treaty">+        <!-- APA generally defers to Bluebook for legal citations, but diverges without+             explanation for treaty items. The Bluebook format that was used in APA 6th+             ed. is used here. -->+        <group delimiter=", ">+          <text variable="title" text-case="title"/>+          <names variable="author">+            <name initialize-with="." form="short" delimiter="-"/>+          </names>+          <text macro="date-legal"/>+          <text macro="container-legal"/>+          <text macro="access"/>+        </group>+      </else-if>+    </choose>+  </macro>+  <macro name="date-legal">+    <choose>+      <if type="legal_case">+        <group prefix="(" suffix=")" delimiter=" ">+          <text variable="authority"/>+          <choose>+            <if variable="container-title" match="any">+              <!-- Print only year for cases published in reporters-->+              <date variable="issued" form="numeric" date-parts="year"/>+            </if>+            <else>+              <date variable="issued" form="text"/>+            </else>+          </choose>+        </group>+      </if>+      <else-if type="bill legislation" match="any">+        <group prefix="(" suffix=")" delimiter=" ">+          <group delimiter=" ">+            <date variable="original-date">+              <date-part name="year"/>+            </date>+            <text term="and" form="symbol"/>+          </group>+          <date variable="issued">+            <date-part name="year"/>+          </date>+        </group>+      </else-if>+      <else-if type="treaty">+        <date variable="issued" form="text"/>+      </else-if>+    </choose>+  </macro>+  <macro name="container-legal">+    <!-- Expect legal item container-titles to be stored in short form -->+    <choose>+      <if type="legal_case">+        <group delimiter=" ">+          <choose>+            <if variable="container-title">+              <group delimiter=" ">+                <text variable="volume"/>+                <text variable="container-title"/>+                <group delimiter=" ">+                  <!-- Change to label variable="section" as that becomes available -->+                  <text term="section" form="symbol"/>+                  <text variable="section"/>+                </group>+                <choose>+                  <if variable="page page-first" match="any">+                    <text variable="page-first"/>+                  </if>+                  <else>+                    <text value="___"/>+                  </else>+                </choose>+              </group>+            </if>+            <else>+              <group delimiter=" ">+                <choose>+                  <if is-numeric="number">+                    <!-- Replace with label variable="number" if that becomes available -->+                    <text term="issue" form="short" text-case="capitalize-first"/>+                  </if>+                </choose>+                <text variable="number"/>+              </group>+            </else>+          </choose>+        </group>+      </if>+      <else-if type="bill">+        <group delimiter=", ">+          <group delimiter=" ">+            <text variable="genre"/>+            <group delimiter=" ">+              <choose>+                <if variable="chapter-number container-title" match="none">+                  <!-- Replace with label variable="number" as that becomes available -->+                  <text term="issue" form="short"/>+                </if>+              </choose>+              <text variable="number"/>+            </group>+          </group>+          <text variable="authority"/>+          <text variable="chapter-number"/>+          <group delimiter=" ">+            <text variable="volume"/>+            <text variable="container-title"/>+            <text variable="page-first"/>+          </group>+        </group>+      </else-if>+      <else-if type="legislation">+        <choose>+          <if variable="number">+            <!--There's a public law number-->+            <group delimiter=", ">+              <text variable="number" prefix="Pub. L. No. "/>+              <group delimiter=" ">+                <text variable="volume"/>+                <text variable="container-title"/>+                <text variable="page-first"/>+              </group>+            </group>+          </if>+          <else>+            <group delimiter=" ">+              <text variable="volume"/>+              <text variable="container-title"/>+              <choose>+                <if variable="section">+                  <group delimiter=" ">+                    <!-- Change to label variable="section" as that becomes available -->+                    <text term="section" form="symbol"/>+                    <text variable="section"/>+                  </group>+                </if>+                <else>+                  <text variable="page-first"/>+                </else>+              </choose>+            </group>+          </else>+        </choose>+      </else-if>+      <else-if type="treaty">+        <group delimiter=" ">+          <number variable="volume"/>+          <text variable="container-title"/>+          <choose>+            <if variable="page page-first" match="any">+              <text variable="page-first"/>+            </if>+            <else>+              <group delimiter=" ">+                <!-- Replace with label variable="number" if that becomes available -->+                <text term="issue" form="short" text-case="capitalize-first"/>+                <text variable="number"/>+              </group>+            </else>+          </choose>+        </group>+      </else-if>+    </choose>+  </macro>+  <macro name="citation-locator">+    <group delimiter=" ">+      <choose>+        <if locator="chapter">+          <label variable="locator" text-case="capitalize-first"/>+        </if>+        <else>+          <label variable="locator" form="short"/>+        </else>+      </choose>+      <text variable="locator"/>+    </group>+  </macro>+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name-with-initials">+    <sort>+      <key macro="author-bib" names-min="3" names-use-first="1"/>+      <key macro="date-sort-group"/>+      <key macro="date-sort-date" sort="ascending"/>+      <key variable="status"/>+    </sort>+    <layout prefix="(" suffix=")" delimiter="; ">+      <group delimiter=", ">+        <text macro="author-intext"/>+        <text macro="date-intext"/>+        <text macro="citation-locator"/>+      </group>+    </layout>+  </citation>+  <bibliography hanging-indent="true" et-al-min="21" et-al-use-first="19" et-al-use-last="true" entry-spacing="0" line-spacing="2">+    <sort>+      <key macro="author-bib"/>+      <key macro="date-sort-group"/>+      <key macro="date-sort-date" sort="ascending"/>+      <key variable="status"/>+      <key macro="title"/>+    </sort>+    <layout>+      <choose>+        <if type="bill legal_case legislation treaty" match="any">+          <!-- Legal items have different orders and delimiters -->+          <choose>+            <if variable="DOI URL" match="any">+              <text macro="legal-cites"/>+            </if>+            <else>+              <text macro="legal-cites" suffix="."/>+            </else>+          </choose>+        </if>+        <else>+          <group delimiter=" ">+            <group delimiter=". " suffix=".">+              <text macro="author-bib"/>+              <text macro="date-bib"/>+              <text macro="title-and-descriptions"/>+              <text macro="container"/>+              <text macro="event"/>+              <text macro="publisher"/>+            </group>+            <text macro="access"/>+            <text macro="publication-history"/>+          </group>+        </else>+      </choose>+    </layout>+  </bibliography>+</style>+<<===== CSL =====<<+++>>===== CITATION-ITEMS =====>>+[[  ]]+<<===== CITATION-ITEMS =====<<++++>>===== INPUT =====>>+[+  {+    "author": [+      {+        "family": "American College of Sports Medicine",+        "given": ""+      }+    ],+    "citation-key": "americancollegeofsportsmedicine1975",+    "id": "americancollegeofsportsmedicine1975",+    "issued": {+      "date-parts": [+        [+          1975+        ]+      ]+    },+    "title": "Guidelines for graded exercise testing and exercise prescription",+    "type": "book"+  },+  {+    "author": [+      {+        "family": "American College of Sports Medicine",+        "given": ""+      }+    ],+    "citation-key": "americancollegeofsportsmedicine2013",+    "id": "americancollegeofsportsmedicine2013",+    "issued": {+      "date-parts": [+        [+          2013+        ]+      ]+    },+    "title": "ACSM’s resource manual for guidelines for exercise testing and prescription",+    "type": "book"+  },+  {+    "author": [+      {+        "family": "American College of Sports Medicine",+        "given": ""+      }+    ],+    "citation-key": "americancollegeofsportsmedicine2018",+    "id": "americancollegeofsportsmedicine2018",+    "issued": {+      "date-parts": [+        [+          2018+        ]+      ]+    },+    "title": "ACSM’s exercise testing and prescription",+    "type": "book"+  },+  {+    "URL": "https://bit.ly/3DSQHc8",+    "accessed": {+      "date-parts": [+        [+          2021,+          12,+          15+        ]+      ]+    },+    "author": [+      {+        "family": "American College of Sports Medicine",+        "given": ""+      }+    ],+    "citation-key": "americancollegeofsportsmedicine2021",+    "id": "americancollegeofsportsmedicine2021",+    "issued": {+      "date-parts": [+        [+          2021,+          11,+          10+        ]+      ]+    },+    "title": "The American College of Sports Medicine",+    "type": "webpage"+  },+  {+    "author": [+      {+        "family": "American College of Sports Medicine",+        "given": ""+      }+    ],+    "citation-key": "americancollegeofsportsmedicine2021a",+    "id": "americancollegeofsportsmedicine2021a",+    "issued": {+      "date-parts": [+        [+          2021+        ]+      ]+    },+    "title": "ACSM’s guidelines for exercise testing and prescription",+    "type": "book"+  }+]+<<===== INPUT =====<<+++>>===== VERSION =====>>+1.0+<<===== VERSION =====<<+
test/extra/issue_37.txt view
@@ -18,7 +18,6 @@       </names>     </layout>     </citation>-    <bibliography/> </style> <<===== CSL =====<< 
test/extra/issue_38.txt view
@@ -634,7 +634,6 @@       </group>     </layout>   </citation>-  <bibliography/> </style> <<===== CSL =====<<