csl-terms.rng in csl-2.0.0

- old
+ new

@@ -5,56 +5,84 @@
     <define name="terms">
       <choice>
         <ref name="terms.gender-assignable"/>
         <ref name="terms.gender-variants"/>
         <ref name="terms.locator"/>
+        <ref name="item-types"/>
         <ref name="variables.names">
           <a:documentation>Contributor roles</a:documentation>
         </ref>
         <value>editortranslator</value>
         <value>accessed</value>
         <a:documentation>Miscellaneous terms</a:documentation>
         <value>ad</value>
+        <value>advance-online-publication</value>
+        <value>album</value>
         <value>and</value>
         <value>and others</value>
         <value>anonymous</value>
         <value>at</value>
+        <value>audio-recording</value>
         <value>available at</value>
         <value>bc</value>
+        <value>bce</value>
         <value>by</value>
+        <value>ce</value>
         <value>circa</value>
         <value>cited</value>
         <value>et-al</value>
+        <value>film</value>
         <value>forthcoming</value>
         <value>from</value>
+        <value>henceforth</value>
         <value>ibid</value>
         <value>in</value>
         <value>in press</value>
         <value>internet</value>
         <value>interview</value>
         <value>letter</value>
+        <value>loc-cit</value>
         <value>no date</value>
+        <value>no-place</value>
+        <value>no-publisher</value>
+        <value>on</value>
         <value>online</value>
+        <value>op-cit</value>
+        <value>original-work-published</value>
+        <value>personal-communication</value>
+        <value>podcast</value>
+        <value>podcast-episode</value>
+        <value>preprint</value>
         <value>presented at</value>
+        <value>radio-broadcast</value>
+        <value>radio-series</value>
+        <value>radio-series-episode</value>
         <value>reference</value>
         <value>retrieved</value>
+        <value>review-of</value>
         <value>scale</value>
-        <value>version</value>
+        <value>special-issue</value>
+        <value>special-section</value>
+        <value>television-broadcast</value>
+        <value>television-series</value>
+        <value>television-series-episode</value>
+        <value>video</value>
+        <value>working-paper</value>
         <value>open-quote</value>
         <a:documentation>Punctuation</a:documentation>
         <value>close-quote</value>
         <value>open-inner-quote</value>
         <value>close-inner-quote</value>
         <value>page-range-delimiter</value>
+        <value>colon</value>
+        <value>comma</value>
+        <value>semicolon</value>
         <value>season-01</value>
         <a:documentation>Seasons</a:documentation>
         <value>season-02</value>
         <value>season-03</value>
         <value>season-04</value>
-        <ref name="category.field">
-          <a:documentation>(legacy; remove in CSL 1.1)</a:documentation>
-        </ref>
       </choice>
     </define>
     <define name="terms.gender-assignable">
       <a:documentation>Terms to which a gender may be assigned</a:documentation>
       <choice>
@@ -104,51 +132,59 @@
       </choice>
     </define>
     <define name="terms.locator">
       <a:documentation>Locators</a:documentation>
       <choice>
-        <ref name="terms.locator.testable"/>
-        <value>sub verbo</value>
-        <a:documentation>"sub verbo" is recognized as "sub" &amp; "verbo" in attribute lists; term
-should be renamed to "sub-verbo"</a:documentation>
-      </choice>
-    </define>
-    <define name="terms.locator.testable">
-      <a:documentation>Locator terms that can be tested with the "locator" conditional
-("sub verbo" can be tested with "sub-verbo")</a:documentation>
-      <choice>
+        <value>act</value>
+        <value>appendix</value>
+        <value>article-locator</value>
         <value>book</value>
+        <value>canon</value>
         <value>chapter</value>
         <value>column</value>
+        <value>elocation</value>
+        <value>equation</value>
         <value>figure</value>
         <value>folio</value>
         <value>line</value>
         <value>note</value>
         <value>opus</value>
-        <value>page</value>
         <value>paragraph</value>
-        <value>part</value>
-        <value>section</value>
+        <value>rule</value>
+        <value>scene</value>
+        <value>sub-verbo</value>
+        <value>table</value>
+        <value>timestamp</value>
+        <value>title-locator</value>
         <value>verse</value>
         <ref name="terms.locator-number-variables"/>
       </choice>
     </define>
     <define name="terms.locator-number-variables">
       <a:documentation>Locator terms with matching number variables</a:documentation>
       <choice>
         <value>issue</value>
+        <value>page</value>
+        <value>part</value>
+        <value>section</value>
+        <value>supplement</value>
+        <value>version</value>
         <value>volume</value>
       </choice>
     </define>
     <define name="terms.non-locator-number-variables">
       <a:documentation>Non-locator terms accompanying number variables</a:documentation>
       <choice>
         <value>chapter-number</value>
+        <value>citation-number</value>
         <value>collection-number</value>
         <value>edition</value>
+        <value>first-reference-note-number</value>
         <value>number</value>
         <value>number-of-pages</value>
         <value>number-of-volumes</value>
+        <value>page-first</value>
+        <value>printing</value>
       </choice>
     </define>
   </div>
 </grammar>