Add locator term sub-verbo, remove legacy workaround (#292)

This changes sub verbo to sub-verbo so this will be testable as is.
citation-style-language · Jul 8, 2020 · 608d8ac · 608d8ac
1 parent 8fb2a98
commit 608d8ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/schemas/styles/csl-choose.rnc b/schemas/styles/csl-choose.rnc
@@ -40,7 +40,7 @@ div {
     | 
       ## Tests whether the locator matches the given locator types.
       attribute locator {
-        list { (terms.locator.testable | "sub-verbo")+ }
+        list { (terms.locator)+ }
       }
     | 
       ## Tests whether the cite position matches the given positions.

diff --git a/schemas/styles/csl-terms.rnc b/schemas/styles/csl-terms.rnc
@@ -125,15 +125,6 @@ div {
 
   ## Locators
   terms.locator =
-    terms.locator.testable
-    | 
-      ## "sub verbo" is recognized as "sub" & "verbo" in attribute lists; term
-      ## should be renamed to "sub-verbo"
-      "sub verbo"
-
-  ## Locator terms that can be tested with the "locator" conditional
-  ## ("sub verbo" can be tested with "sub-verbo")
-  terms.locator.testable =
     "act"
     | "appendix"
     | "article-locator"
@@ -151,6 +142,7 @@ div {
     | "paragraph"
     | "rule"
     | "scene"
+    | "sub-verbo"
     | "table"
     | "timestamp"
     | "title"