csl 1.5.0 → 2.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (19) hide show
  1. checksums.yaml +5 -5
  2. data/.github/workflows/ci.yml +26 -0
  3. data/BSDL +1 -1
  4. data/Gemfile +0 -1
  5. data/README.md +1 -5
  6. data/Rakefile +0 -8
  7. data/csl.gemspec +3 -3
  8. data/cucumber.yml +1 -1
  9. data/lib/csl/locale.rb +4 -4
  10. data/lib/csl/node.rb +2 -2
  11. data/lib/csl/schema.rb +148 -22
  12. data/lib/csl/treelike.rb +11 -7
  13. data/lib/csl/version.rb +1 -1
  14. data/vendor/schema/csl-choose.rng +130 -0
  15. data/vendor/schema/csl-terms.rng +53 -17
  16. data/vendor/schema/csl-types.rng +10 -0
  17. data/vendor/schema/csl-variables.rng +51 -18
  18. data/vendor/schema/csl.rng +81 -252
  19. metadata +23 -7
data/vendor/schema/csl-terms.rng CHANGED
@@ -7,6 +7,7 @@
7
7
  <ref name="terms.gender-assignable"/>
8
8
  <ref name="terms.gender-variants"/>
9
9
  <ref name="terms.locator"/>
10
+ <ref name="item-types"/>
10
11
  <ref name="variables.names">
11
12
  <a:documentation>Contributor roles</a:documentation>
12
13
  </ref>
@@ -14,45 +15,72 @@
14
15
  <value>accessed</value>
15
16
  <a:documentation>Miscellaneous terms</a:documentation>
16
17
  <value>ad</value>
18
+ <value>advance-online-publication</value>
19
+ <value>album</value>
17
20
  <value>and</value>
18
21
  <value>and others</value>
19
22
  <value>anonymous</value>
20
23
  <value>at</value>
24
+ <value>audio-recording</value>
21
25
  <value>available at</value>
22
26
  <value>bc</value>
27
+ <value>bce</value>
23
28
  <value>by</value>
29
+ <value>ce</value>
24
30
  <value>circa</value>
25
31
  <value>cited</value>
26
32
  <value>et-al</value>
33
+ <value>film</value>
27
34
  <value>forthcoming</value>
28
35
  <value>from</value>
36
+ <value>henceforth</value>
29
37
  <value>ibid</value>
30
38
  <value>in</value>
31
39
  <value>in press</value>
32
40
  <value>internet</value>
33
41
  <value>interview</value>
34
42
  <value>letter</value>
43
+ <value>loc-cit</value>
35
44
  <value>no date</value>
45
+ <value>no-place</value>
46
+ <value>no-publisher</value>
47
+ <value>on</value>
36
48
  <value>online</value>
49
+ <value>op-cit</value>
50
+ <value>original-work-published</value>
51
+ <value>personal-communication</value>
52
+ <value>podcast</value>
53
+ <value>podcast-episode</value>
54
+ <value>preprint</value>
37
55
  <value>presented at</value>
56
+ <value>radio-broadcast</value>
57
+ <value>radio-series</value>
58
+ <value>radio-series-episode</value>
38
59
  <value>reference</value>
39
60
  <value>retrieved</value>
61
+ <value>review-of</value>
40
62
  <value>scale</value>
41
- <value>version</value>
63
+ <value>special-issue</value>
64
+ <value>special-section</value>
65
+ <value>television-broadcast</value>
66
+ <value>television-series</value>
67
+ <value>television-series-episode</value>
68
+ <value>video</value>
69
+ <value>working-paper</value>
42
70
  <value>open-quote</value>
43
71
  <a:documentation>Punctuation</a:documentation>
44
72
  <value>close-quote</value>
45
73
  <value>open-inner-quote</value>
46
74
  <value>close-inner-quote</value>
47
75
  <value>page-range-delimiter</value>
76
+ <value>colon</value>
77
+ <value>comma</value>
78
+ <value>semicolon</value>
48
79
  <value>season-01</value>
49
80
  <a:documentation>Seasons</a:documentation>
50
81
  <value>season-02</value>
51
82
  <value>season-03</value>
52
83
  <value>season-04</value>
53
- <ref name="category.field">
54
- <a:documentation>(legacy; remove in CSL 1.1)</a:documentation>
55
- </ref>
56
84
  </choice>
57
85
  </define>
58
86
  <define name="terms.gender-assignable">
@@ -106,28 +134,27 @@
106
134
  <define name="terms.locator">
107
135
  <a:documentation>Locators</a:documentation>
108
136
  <choice>
109
- <ref name="terms.locator.testable"/>
110
- <value>sub verbo</value>
111
- <a:documentation>"sub verbo" is recognized as "sub" &amp; "verbo" in attribute lists; term
112
- should be renamed to "sub-verbo"</a:documentation>
113
- </choice>
114
- </define>
115
- <define name="terms.locator.testable">
116
- <a:documentation>Locator terms that can be tested with the "locator" conditional
117
- ("sub verbo" can be tested with "sub-verbo")</a:documentation>
118
- <choice>
137
+ <value>act</value>
138
+ <value>appendix</value>
139
+ <value>article-locator</value>
119
140
  <value>book</value>
141
+ <value>canon</value>
120
142
  <value>chapter</value>
121
143
  <value>column</value>
144
+ <value>elocation</value>
145
+ <value>equation</value>
122
146
  <value>figure</value>
123
147
  <value>folio</value>
124
148
  <value>line</value>
125
149
  <value>note</value>
126
150
  <value>opus</value>
127
- <value>page</value>
128
151
  <value>paragraph</value>
129
- <value>part</value>
130
- <value>section</value>
152
+ <value>rule</value>
153
+ <value>scene</value>
154
+ <value>sub-verbo</value>
155
+ <value>table</value>
156
+ <value>timestamp</value>
157
+ <value>title-locator</value>
131
158
  <value>verse</value>
132
159
  <ref name="terms.locator-number-variables"/>
133
160
  </choice>
@@ -136,6 +163,11 @@ should be renamed to "sub-verbo"</a:documentation>
136
163
  <a:documentation>Locator terms with matching number variables</a:documentation>
137
164
  <choice>
138
165
  <value>issue</value>
166
+ <value>page</value>
167
+ <value>part</value>
168
+ <value>section</value>
169
+ <value>supplement</value>
170
+ <value>version</value>
139
171
  <value>volume</value>
140
172
  </choice>
141
173
  </define>
@@ -143,11 +175,15 @@ should be renamed to "sub-verbo"</a:documentation>
143
175
  <a:documentation>Non-locator terms accompanying number variables</a:documentation>
144
176
  <choice>
145
177
  <value>chapter-number</value>
178
+ <value>citation-number</value>
146
179
  <value>collection-number</value>
147
180
  <value>edition</value>
181
+ <value>first-reference-note-number</value>
148
182
  <value>number</value>
149
183
  <value>number-of-pages</value>
150
184
  <value>number-of-volumes</value>
185
+ <value>page-first</value>
186
+ <value>printing</value>
151
187
  </choice>
152
188
  </define>
153
189
  </div>
data/vendor/schema/csl-types.rng CHANGED
@@ -12,12 +12,17 @@
12
12
  <value>book</value>
13
13
  <value>broadcast</value>
14
14
  <value>chapter</value>
15
+ <value>classic</value>
16
+ <value>collection</value>
15
17
  <value>dataset</value>
18
+ <value>document</value>
16
19
  <value>entry</value>
17
20
  <value>entry-dictionary</value>
18
21
  <value>entry-encyclopedia</value>
22
+ <value>event</value>
19
23
  <value>figure</value>
20
24
  <value>graphic</value>
25
+ <value>hearing</value>
21
26
  <value>interview</value>
22
27
  <value>legal_case</value>
23
28
  <value>legislation</value>
@@ -28,14 +33,19 @@
28
33
  <value>pamphlet</value>
29
34
  <value>paper-conference</value>
30
35
  <value>patent</value>
36
+ <value>performance</value>
37
+ <value>periodical</value>
31
38
  <value>personal_communication</value>
32
39
  <value>post</value>
33
40
  <value>post-weblog</value>
41
+ <value>regulation</value>
34
42
  <value>report</value>
35
43
  <value>review</value>
36
44
  <value>review-book</value>
45
+ <value>software</value>
37
46
  <value>song</value>
38
47
  <value>speech</value>
48
+ <value>standard</value>
39
49
  <value>thesis</value>
40
50
  <value>treaty</value>
41
51
  <value>webpage</value>
data/vendor/schema/csl-variables.rng CHANGED
@@ -7,8 +7,7 @@
7
7
  <choice>
8
8
  <ref name="variables.dates"/>
9
9
  <ref name="variables.names"/>
10
- <ref name="variables.numbers"/>
11
- <ref name="variables.strings"/>
10
+ <ref name="variables.standard"/>
12
11
  </choice>
13
12
  </define>
14
13
  <define name="variables.standard">
@@ -16,13 +15,14 @@
16
15
  <choice>
17
16
  <ref name="variables.numbers"/>
18
17
  <ref name="variables.strings"/>
18
+ <ref name="variables.titles"/>
19
19
  </choice>
20
20
  </define>
21
21
  <define name="variables.dates">
22
22
  <a:documentation>Date variables</a:documentation>
23
23
  <choice>
24
24
  <value>accessed</value>
25
- <value>container</value>
25
+ <value>available-date</value>
26
26
  <value>event-date</value>
27
27
  <value>issued</value>
28
28
  <value>original-date</value>
@@ -33,17 +33,31 @@
33
33
  <a:documentation>Name variables</a:documentation>
34
34
  <choice>
35
35
  <value>author</value>
36
+ <value>chair</value>
36
37
  <value>collection-editor</value>
38
+ <value>compiler</value>
37
39
  <value>composer</value>
38
40
  <value>container-author</value>
41
+ <value>contributor</value>
42
+ <value>curator</value>
39
43
  <value>director</value>
40
44
  <value>editor</value>
45
+ <value>editor-translator</value>
41
46
  <value>editorial-director</value>
47
+ <value>executive-producer</value>
48
+ <value>guest</value>
49
+ <value>host</value>
42
50
  <value>illustrator</value>
43
51
  <value>interviewer</value>
52
+ <value>narrator</value>
53
+ <value>organizer</value>
44
54
  <value>original-author</value>
55
+ <value>performer</value>
56
+ <value>producer</value>
45
57
  <value>recipient</value>
46
58
  <value>reviewed-author</value>
59
+ <value>script-writer</value>
60
+ <value>series-creator</value>
47
61
  <value>translator</value>
48
62
  </choice>
49
63
  </define>
@@ -51,62 +65,81 @@
51
65
  <a:documentation>Number variables</a:documentation>
52
66
  <choice>
53
67
  <value>chapter-number</value>
68
+ <value>citation-number</value>
54
69
  <value>collection-number</value>
55
70
  <value>edition</value>
71
+ <value>first-reference-note-number</value>
56
72
  <value>issue</value>
73
+ <value>locator</value>
57
74
  <value>number</value>
58
75
  <value>number-of-pages</value>
59
76
  <value>number-of-volumes</value>
77
+ <value>page</value>
78
+ <value>page-first</value>
79
+ <value>part-number</value>
80
+ <value>printing-number</value>
81
+ <value>section</value>
82
+ <value>supplement-number</value>
83
+ <value>version</value>
60
84
  <value>volume</value>
61
85
  </choice>
62
86
  </define>
87
+ <define name="variables.titles">
88
+ <a:documentation>Title variables</a:documentation>
89
+ <choice>
90
+ <value>collection-title</value>
91
+ <value>container-title</value>
92
+ <value>original-title</value>
93
+ <value>part-title</value>
94
+ <value>reviewed-title</value>
95
+ <value>title</value>
96
+ <value>volume-title</value>
97
+ <!-- Short title forms. Will be removed in CSL 1.1 -->
98
+ <value>title-short</value>
99
+ <value>container-title-short</value>
100
+ </choice>
101
+ </define>
63
102
  <define name="variables.strings">
64
103
  <a:documentation>String variables</a:documentation>
65
104
  <choice>
66
105
  <value>abstract</value>
67
106
  <value>annote</value>
68
107
  <value>archive</value>
108
+ <value>archive_collection</value>
69
109
  <value>archive_location</value>
70
110
  <value>archive-place</value>
71
111
  <value>authority</value>
72
112
  <value>call-number</value>
113
+ <value>citation-key</value>
73
114
  <value>citation-label</value>
74
- <value>citation-number</value>
75
- <value>collection-title</value>
76
- <value>container-title</value>
77
- <value>container-title-short</value>
78
115
  <value>dimensions</value>
116
+ <value>division</value>
79
117
  <value>DOI</value>
118
+ <!-- Alias for 'event-title'. Deprecated. Will be removed in CSL 1.1. -->
80
119
  <value>event</value>
120
+ <value>event-title</value>
81
121
  <value>event-place</value>
82
- <value>first-reference-note-number</value>
83
122
  <value>genre</value>
84
123
  <value>ISBN</value>
85
124
  <value>ISSN</value>
86
125
  <value>jurisdiction</value>
87
126
  <value>keyword</value>
88
- <value>locator</value>
127
+ <value>language</value>
128
+ <value>license</value>
89
129
  <value>medium</value>
90
130
  <value>note</value>
91
131
  <value>original-publisher</value>
92
132
  <value>original-publisher-place</value>
93
- <value>original-title</value>
94
- <value>page</value>
95
- <value>page-first</value>
96
- <value>PMID</value>
97
133
  <value>PMCID</value>
134
+ <value>PMID</value>
98
135
  <value>publisher</value>
99
136
  <value>publisher-place</value>
100
137
  <value>references</value>
101
- <value>reviewed-title</value>
138
+ <value>reviewed-genre</value>
102
139
  <value>scale</value>
103
- <value>section</value>
104
140
  <value>source</value>
105
141
  <value>status</value>
106
- <value>title</value>
107
- <value>title-short</value>
108
142
  <value>URL</value>
109
- <value>version</value>
110
143
  <value>year-suffix</value>
111
144
  </choice>
112
145
  </define>