Skip to content

Commit 56dcbd1

Browse files
sideshowbarkerrdeltour
sideshowbarker
authored and
rdeltour
committed
feat: update HTML schemas from the HTML Checker
Import changes up to commit validator/validator@224d49b9
1 parent 33f2f99 commit 56dcbd1

File tree

6 files changed

+56
-29
lines changed

6 files changed

+56
-29
lines changed

‎src/main/resources/com/adobe/epubcheck/schema/30/mod/html5/applications.rnc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,11 @@
217217
)
218218
summary.inner =
219219
( common.inner.phrasing
220-
| h1.elem
221-
| h2.elem
222-
| h3.elem
223-
| h4.elem
224-
| h5.elem
225-
| h6.elem
226-
| hgroup.elem
220+
& h1.elem?
221+
& h2.elem?
222+
& h3.elem?
223+
& h4.elem?
224+
& h5.elem?
225+
& h6.elem?
226+
& hgroup.elem?
227227
)

‎src/main/resources/com/adobe/epubcheck/schema/30/mod/html5/core-scripting.rnc‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@
129129
& scripting.attr.ondrag?
130130
& scripting.attr.ondragend?
131131
& scripting.attr.ondragenter?
132-
& scripting.attr.ondragexit?
133132
& scripting.attr.ondragleave?
134133
& scripting.attr.ondragover?
135134
& scripting.attr.ondragstart?
@@ -139,6 +138,8 @@
139138
& scripting.attr.onended?
140139
& scripting.attr.onerror?
141140
& scripting.attr.onfocus?
141+
& scripting.attr.onfocusin?
142+
& scripting.attr.onfocusout?
142143
& scripting.attr.onformdata?
143144
& scripting.attr.oninput?
144145
& scripting.attr.oninvalid?
@@ -175,6 +176,10 @@
175176
& scripting.attr.onsuspend?
176177
& scripting.attr.ontimeupdate?
177178
& scripting.attr.ontoggle?
179+
& scripting.attr.ontransitioncancel?
180+
& scripting.attr.ontransitionend?
181+
& scripting.attr.ontransitionrun?
182+
& scripting.attr.ontransitionstart?
178183
& scripting.attr.onvolumechange?
179184
& scripting.attr.onwaiting?
180185
& scripting.attr.onwheel?
@@ -216,8 +221,6 @@
216221
attribute ondragend { common.data.functionbody }
217222
scripting.attr.ondragenter =
218223
attribute ondragenter { common.data.functionbody }
219-
scripting.attr.ondragexit =
220-
attribute ondragexit { common.data.functionbody }
221224
scripting.attr.ondragleave =
222225
attribute ondragleave { common.data.functionbody }
223226
scripting.attr.ondragover =
@@ -236,6 +239,10 @@
236239
attribute onerror { common.data.functionbody }
237240
scripting.attr.onfocus =
238241
attribute onfocus { common.data.functionbody }
242+
scripting.attr.onfocusin =
243+
attribute onfocusin { common.data.functionbody }
244+
scripting.attr.onfocusout =
245+
attribute onfocusout { common.data.functionbody }
239246
scripting.attr.onformchange =
240247
attribute onformchange { common.data.functionbody }
241248
scripting.attr.onformdata =
@@ -314,6 +321,14 @@
314321
attribute ontimeupdate { common.data.functionbody }
315322
scripting.attr.ontoggle =
316323
attribute ontoggle { common.data.functionbody }
324+
scripting.attr.ontransitioncancel =
325+
attribute ontransitioncancel { common.data.functionbody }
326+
scripting.attr.ontransitionend =
327+
attribute ontransitionend { common.data.functionbody }
328+
scripting.attr.ontransitionrun =
329+
attribute ontransitionrun { common.data.functionbody }
330+
scripting.attr.ontransitionstart =
331+
attribute ontransitionstart { common.data.functionbody }
317332
scripting.attr.onvolumechange =
318333
attribute onvolumechange { common.data.functionbody }
319334
scripting.attr.onwaiting =

‎src/main/resources/com/adobe/epubcheck/schema/30/mod/html5/embed.rnc‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,12 @@ namespace local = ""
2727
& embedded.content.attrs.crossorigin?
2828
)
2929

30-
no-alt-img.elem =
31-
element img { img.inner & shared-img.attrs }
32-
3330
img.elem =
3431
element img { img.inner & img.attrs }
3532
img.attrs =
3633
( shared-img.attrs
37-
& img.attrs.alt
34+
& img.attrs.alt?
3835
& ( common.attrs.aria.implicit.img
39-
| common.attrs.aria.implicit.img
4036
| common.attrs.aria.role.button
4137
| common.attrs.aria.role.checkbox
4238
| common.attrs.aria.role.img
@@ -112,7 +108,6 @@ namespace local = ""
112108
img.inner =
113109
empty
114110

115-
common.elem.phrasing |= no-alt-img.elem
116111
common.elem.phrasing |= img.elem
117112

118113
## Image with multiple sources: <picture>
@@ -234,7 +229,6 @@ namespace local = ""
234229
| ondrag
235230
| ondragend
236231
| ondragenter
237-
| ondragexit
238232
| ondragleave
239233
| ondragover
240234
| ondragstart
@@ -244,6 +238,8 @@ namespace local = ""
244238
| onended
245239
| onerror
246240
| onfocus
241+
| onfocusin
242+
| onfocusout
247243
| onformdata
248244
| oninput
249245
| oninvalid
@@ -280,6 +276,10 @@ namespace local = ""
280276
| onsuspend
281277
| ontimeupdate
282278
| ontoggle
279+
| ontransitioncancel
280+
| ontransitionend
281+
| ontransitionrun
282+
| ontransitionstart
283283
| onvolumechange
284284
| onwaiting
285285
| onwheel
@@ -479,10 +479,9 @@ namespace local = ""
479479
& iframe.attrs.name?
480480
& iframe.attrs.width?
481481
& iframe.attrs.height?
482+
& iframe.attrs.loading?
482483
& iframe.attrs.sandbox?
483484
& iframe.attrs.allowfullscreen?
484-
& iframe.attrs.allowpaymentrequest?
485-
& iframe.attrs.allowusermedia?
486485
& iframe.attrs.allow?
487486
& referrerpolicy?
488487
& ( common.attrs.aria.role.application
@@ -507,6 +506,10 @@ namespace local = ""
507506
attribute height {
508507
common.data.integer.non-negative
509508
}
509+
iframe.attrs.loading =
510+
attribute loading {
511+
"lazy" | "eager"
512+
}
510513
iframe.attrs.width =
511514
attribute width {
512515
common.data.integer.non-negative
@@ -519,14 +522,6 @@ namespace local = ""
519522
attribute allowfullscreen {
520523
"allowfullscreen" | ""
521524
} & v5only
522-
iframe.attrs.allowpaymentrequest =
523-
attribute allowpaymentrequest {
524-
"allowpaymentrequest" | ""
525-
} & v5only
526-
iframe.attrs.allowusermedia =
527-
attribute allowusermedia {
528-
"allowusermedia" | ""
529-
} & v5only
530525
iframe.attrs.allow =
531526
attribute allow {
532527
common.data.feature-policy

‎src/main/resources/com/adobe/epubcheck/schema/30/mod/html5/meta.rnc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@
175175
| string "audioworklet"
176176
| string "document"
177177
| string "embed"
178+
| string "fetch"
178179
| string "font"
179180
| string "image"
180181
| string "manifest"

‎src/main/resources/com/adobe/epubcheck/schema/30/mod/html5/web-forms2.rnc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@
210210
input.file.attrs &=
211211
( shared-input.attrs
212212
& input.attrs.multiple?
213+
& aria.prop.required?
213214
& input.input.attrs.capture?
214215
)
215216
input.input.attrs.capture =

‎src/main/resources/com/adobe/epubcheck/schema/30/mod/svg11/svg-basic-filter.rnc‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,22 @@ grammar {
131131
attribute in2 { text },
132132
[ a:defaultValue = "normal" ]
133133
attribute mode {
134-
string "normal" | string "multiply" | string "screen" | string "darken" | string "lighten"
134+
string "normal"
135+
| string "multiply"
136+
| string "screen"
137+
| string "overlay"
138+
| string "darken"
139+
| string "lighten"
140+
| string "color-dodge"
141+
| string "color-burn"
142+
| string "hard-light"
143+
| string "soft-light"
144+
| string "difference"
145+
| string "exclusion"
146+
| string "hue"
147+
| string "saturation"
148+
| string "color"
149+
| string "luminosity"
135150
}?
136151
a:documentation [
137152
"\x{a}" ~
@@ -184,7 +199,7 @@ grammar {
184199
attribute in2 { text },
185200
[ a:defaultValue = "over" ]
186201
attribute operator {
187-
string "over" | string "in" | string "out" | string "atop" | string "xor" | string "arithmetic"
202+
string "over" | string "in" | string "out" | string "atop" | string "xor" | string "lighter" | string "arithmetic"
188203
}?,
189204
attribute k1 { Number.datatype }?,
190205
attribute k2 { Number.datatype }?,

0 commit comments

Comments
 (0)