Merge pull request #393 from denismaier/fix-form-again

bwiernik · web-flow · commit ea19f7ab45b1 · 2021-06-18T19:11:12.000-04:00
Bugfixes for 1.0.2
diff --git a/schemas/styles/csl-variables.rnc b/schemas/styles/csl-variables.rnc
@@ -80,6 +80,9 @@ div {
     | "reviewed-title"
     | "title"
     | "volume-title"
+    | # Short title forms. Will be removed in CSL 1.1
+      "title-short"
+    | "container-title-short"
   
   ## String variables
   variables.strings =
diff --git a/schemas/styles/csl.rnc b/schemas/styles/csl.rnc
@@ -634,8 +634,10 @@ div {
     | 
       ## Specify verbatim text.
       attribute value { text }
-    | (attribute variable { variables.standard },
-       [ a:defaultValue = "long" ] attribute form { "short" | "long" })?
+    | (
+       ## Select a variable.
+       attribute variable { variables.standard },
+       [ a:defaultValue = "long" ] attribute form { "short" | "long" }?)
 }
 # ==============================================================================
 

Original file line number	Diff line number	Diff line change
`@@ -634,8 +634,10 @@ div {`
`634`	`634`	`\|`
`635`	`635`	`## Specify verbatim text.`
`636`	`636`	`attribute value { text }`
`637`		`- \| (attribute variable { variables.standard },`
`638`		`- [ a:defaultValue = "long" ] attribute form { "short" \| "long" })?`
	`637`	`+ \| (`
	`638`	`+ ## Select a variable.`
	`639`	`+ attribute variable { variables.standard },`
	`640`	`+ [ a:defaultValue = "long" ] attribute form { "short" \| "long" }?)`
`639`	`641`	`}`
`640`	`642`	`# ==============================================================================`
`641`	`643`