Skip to content

Commit 2f6a2c7

Browse files
rdeltourscottaohara
rdeltour
and
scottaohara
committed
feat: update to latest schemas from the Nu HTML Checker
--------------------- Add `plaintext-only` value to `contenteditable` attribute validator/validator@228ea687b Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- add warnings for deprecated ARIA attributes (#1560) validator/validator@e61fbeb2c Co-authored-by: Steve Faulkner <faulkner.steve@gmail.com> --------------------- disallow aria attributes on datalist (#1557) validator/validator@b4849c04b Co-authored-by: Steve Faulkner <faulkner.steve@gmail.com> --------------------- allow role=button on area validator/validator@89ff1fc2b Co-authored-by: stevefaulkner <faulkner.steve@gmail.com> --------------------- fix: allow -1 for aria-colcount validator/validator@2466e73c4 Co-authored-by: Nick Schonning <nschonni@gmail.com> --------------------- fix: Allow -1 for aria-rowcount validator/validator@eac205b6b Co-authored-by: Nick Schonning <nschonni@gmail.com> --------------------- Add `fetchpriority` attribute validator/validator@7c9991405 Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- Script type importmap (#1478) validator/validator@4054c56f5 Co-authored-by: Michał Niedziółka <niedziolek@hotmail.com> --------------------- Move “manifest” attribute to legacy-attributes list validator/validator@175e62d3a Co-authored-by: Michael[tm] Smith <mike@w3.org> --------------------- Pointer Events (#1481) validator/validator@5eb52a931 Co-authored-by: Michał Niedziółka <niedziolek@hotmail.com> --------------------- Report a better error message for obsolete “manifest” attribute validator/validator@ae924b625 Co-authored-by: Michael[tm] Smith <mike@w3.org> --------------------- onscrollend validator/validator@87287a97f Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- slot element validator/validator@d6cf423c1 Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- Allow paragraphs in hgroup (#1467) validator/validator@3ff53973f Co-authored-by: Michał Niedziółka <niedziolek@hotmail.com> --------------------- blocking="render" (#1466) validator/validator@df5d4e23a Co-authored-by: Michał Niedziółka <niedziolek@hotmail.com> --------------------- inert validator/validator@507f551b2 Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- hidden=until-found validator/validator@a424d55a8 Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- media attribute in meta element validator/validator@af3e94d22 Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- Sync event handlers validator/validator@58bea51c7 Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- Remove manifest attribute validator/validator@66510f3ca Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- enterkeyhint validator/validator@70f3044d7 Co-authored-by: Niedziolka Michal <niedziolek@hotmail.com> --------------------- Form method dialog (#1443) validator/validator@0db229a44 Co-authored-by: Michał Niedziółka <niedziolek@hotmail.com> --------------------- imagesrcset and imagesizes in link (#1444) validator/validator@49656dbfc Co-authored-by: Michał Niedziółka <niedziolek@hotmail.com> --------------------- feat: add support width and height of source in picture validator/validator@176d98e4f Co-authored-by: Takeshi Kurosawa <kurosawa-takeshi@mitsue.co.jp> --------------------- Update: allow none/presentation on nav element (#1323) validator/validator@5e25edb39 Co-authored-by: Scott O'Hara <scottaohara@users.noreply.github.com> --------------------- Update schema/html5/web-forms.rnc validator/validator@95ba6c7cf Co-authored-by: Michael[tm] Smith <mike@w3.org> --------------------- update role allowances for button and input type=button validator/validator@6cc14c4d7 Co-authored-by: Scott O'Hara <scottaohara@users.noreply.github.com> --------------------- adds role=radio alowance to img alt=foo validator/validator@b013aa02b Co-authored-by: Scott O'Hara <scottaohara@users.noreply.github.com> --------------------- remove deprecated dpub role allowances validator/validator@b0fb152c0 Co-authored-by: Scott O'Hara <scottaohara@users.noreply.github.com> --------------------- allow section element to have role=group validator/validator@078341d37 Co-authored-by: Scott O'Hara <scottaohara@users.noreply.github.com>
1 parent d916df0 commit 2f6a2c7

14 files changed

Lines changed: 222 additions & 92 deletions

File tree

‎src/build/update-validator-schemas.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ git fetch $UPSTREAM
5757

5858
## Create patches since last update (to the `latest` tag)
5959
echo "Creating paches of changes since the last update"
60-
git format-patch -o $EPUBCHECK_DIR $LAST_SHA1..latest schema
60+
git format-patch -o $EPUBCHECK_DIR/ $LAST_SHA1..latest schema
6161

6262
## Get the SHA-1 of the `latest` tag
6363
LATEST=`git rev-list -n 1 latest`
@@ -85,4 +85,5 @@ git am *.patch
8585
# Remaing tasks:
8686
# - commit new last commit ID
8787
# - squash commits (add "Co-Authored by" credits)
88+
# `git log --pretty=format:"---------------------%n%n%s%n%nhttps://github.com/validator/validator/commit/%h%n%nCo-authored-by: %aN <%aE>%n" $LAST-SHA1..latest schema``
8889
# - remove patch files

‎src/main/resources/com/adobe/epubcheck/schema/30/mod/html5/LAST_UPDATE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9b11254fbe3c5cb2339794101e17e7d8ec844223
1+
b118bf6031b0b06797f3ccdc25d0f74c1447139a

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

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
( common.attrs.contenteditable?
1111
& common.attrs.draggable?
1212
& common.attrs.hidden?
13-
& common.attrs.spellcheck?
14-
& common.attrs.autocapitalize?
1513
)
1614

1715
common.attrs.other &= common.attrs.interact
@@ -20,7 +18,7 @@
2018

2119
common.attrs.contenteditable =
2220
attribute contenteditable {
23-
"true" | "false" | ""
21+
"true" | "plaintext-only" | "false" | ""
2422
}
2523

2624
## Draggable Element: draggable
@@ -34,13 +32,39 @@
3432

3533
common.attrs.hidden =
3634
attribute hidden {
37-
"hidden" | ""
35+
"hidden" | "until-found" | ""
36+
}
37+
38+
## Global attributes applicable on elements with editable content
39+
40+
common.attrs.editing &=
41+
( common.attrs.inputmode?
42+
& common.attrs.spellcheck?
43+
& common.attrs.autocapitalize?
44+
& common.attrs.enterkeyhint?
45+
)
46+
47+
common.attrs.other &= common.attrs.editing
48+
49+
## Hint expected data type: inputmode
50+
51+
common.attrs.inputmode =
52+
attribute inputmode {
53+
( "none"
54+
| "text"
55+
| "tel"
56+
| "url"
57+
| "email"
58+
| "numeric"
59+
| "decimal"
60+
| "search"
61+
)
3862
}
3963

4064
## Spellchecking and grammar checking: spellcheck
4165

4266
common.attrs.spellcheck =
43-
attribute spellcheck{
67+
attribute spellcheck {
4468
"true" | "false" | ""
4569
}
4670

@@ -57,14 +81,19 @@
5781
)
5882
}
5983

60-
## Application Cache: manifest
84+
## Type of Enter button on virtual keyboards: enterkeyhint
6185

62-
html.attrs.manifest =
63-
attribute manifest {
64-
common.data.uri.non-empty
86+
common.attrs.enterkeyhint =
87+
attribute enterkeyhint {
88+
( "enter"
89+
| "done"
90+
| "go"
91+
| "next"
92+
| "previous"
93+
| "search"
94+
| "send"
95+
)
6596
}
66-
67-
html.attrs &= html.attrs.manifest?
6897

6998
## Progess Indicator: <progress>
7099

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

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ aria.global =
1717
& aria.prop.describedby?
1818
& aria.prop.details?
1919
& aria.state.disabled?
20-
& aria.state.dropeffect?
2120
& aria.prop.errormessage?
2221
& aria.prop.flowto?
23-
& aria.state.grabbed?
2422
& aria.prop.haspopup?
2523
& aria.state.hidden?
2624
& aria.state.invalid?
@@ -288,13 +286,6 @@ common.attrs.aria.implicit.navigation |= common.attrs.aria.implicit.landmark
288286
| string "false" #default
289287
}
290288

291-
## dropeffect
292-
aria.state.dropeffect =
293-
attribute aria-dropeffect
294-
{
295-
list { ("copy" | "execute" | "link" | "move" | "none" | "popup") + }
296-
}
297-
298289
## expanded
299290
aria.state.expanded =
300291
attribute aria-expanded
@@ -303,14 +294,6 @@ common.attrs.aria.implicit.navigation |= common.attrs.aria.implicit.landmark
303294
| string "undefined" #default
304295
}
305296

306-
## grabbed
307-
aria.state.grabbed =
308-
attribute aria-grabbed
309-
{ string "true"
310-
| string "false"
311-
| string "undefined" #default
312-
}
313-
314297
## hidden
315298
aria.state.hidden =
316299
attribute aria-hidden
@@ -374,7 +357,9 @@ common.attrs.aria.implicit.navigation |= common.attrs.aria.implicit.landmark
374357
## colcount
375358
aria.prop.colcount =
376359
attribute aria-colcount {
377-
common.data.integer.positive
360+
( common.data.integer.non-negative
361+
| string "-1"
362+
)
378363
}
379364

380365
## colindex
@@ -576,7 +561,9 @@ common.attrs.aria.implicit.navigation |= common.attrs.aria.implicit.landmark
576561
## rowcount
577562
aria.prop.rowcount =
578563
attribute aria-rowcount {
579-
common.data.integer.positive
564+
( common.data.integer.non-negative
565+
| string "-1"
566+
)
580567
}
581568

582569
## rowindex

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@
101101
| common.attrs.aria.role.treeitem
102102
| common.attrs.aria.role.separator
103103
| common.attrs.aria.role.presentation
104-
| common.attrs.aria.role.doc-biblioentry
105-
| common.attrs.aria.role.doc-endnote
106104
)?
107105
)
108106
li.inner =

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

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,25 +202,35 @@ common.attrs.present =
202202

203203
common.attrs.other =
204204
( common.attrs.autofocus?
205-
& common.attrs.inputmode?
206205
& common.attrs.nonce?
206+
& common.attrs.inert?
207207
)
208208

209209
common.attrs.autofocus =
210210
attribute autofocus {
211211
"autofocus" | ""
212212
}
213213

214-
common.attrs.inputmode =
215-
attribute inputmode {
216-
string
214+
common.attrs.blocking =
215+
attribute blocking {
216+
list { "render" }
217+
}
218+
219+
common.attrs.fetchpriority =
220+
attribute fetchpriority {
221+
"high" | "low" | "auto"
217222
}
218223

219224
common.attrs.nonce =
220225
attribute nonce {
221226
string
222227
}
223228

229+
common.attrs.inert =
230+
attribute inert {
231+
string "inert" | string ""
232+
}
233+
224234
# #####################################################################
225235
## Common Datatypes #
226236
# #####################################################################

0 commit comments

Comments
 (0)