Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update to latest schemas from the Nu HTML Checker #1530

Merged
merged 2 commits into from
Jul 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/build/update-validator-schemas.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ git fetch $UPSTREAM

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

## Get the SHA-1 of the `latest` tag
LATEST=`git rev-list -n 1 latest`
Expand Down Expand Up @@ -85,4 +85,5 @@ git am *.patch
# Remaing tasks:
# - commit new last commit ID
# - squash commits (add "Co-Authored by" credits)
# `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``
# - remove patch files
Original file line number Diff line number Diff line change
Expand Up @@ -396,5 +396,14 @@
select="local-name(ancestor::$ancestor)"/> elements.</report>
</rule>
</pattern>

<pattern id="dpub-aria.doc-endnote.deprecated">
<rule context="h:*[@role]">
<report test="tokenize(@role,'\s+')='doc-endnote'"
>WARNING: The "doc-endnote" role is deprecated and should not be used.</report>
<report test="tokenize(@role,'\s+')='doc-biblioentry'"
>WARNING: The "doc-biblioentry" role is deprecated and should not be used.</report>
</rule>
</pattern>

</schema>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9b11254fbe3c5cb2339794101e17e7d8ec844223
b118bf6031b0b06797f3ccdc25d0f74c1447139a
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
( common.attrs.contenteditable?
& common.attrs.draggable?
& common.attrs.hidden?
& common.attrs.spellcheck?
& common.attrs.autocapitalize?
)

common.attrs.other &= common.attrs.interact
Expand All @@ -20,7 +18,7 @@

common.attrs.contenteditable =
attribute contenteditable {
"true" | "false" | ""
"true" | "plaintext-only" | "false" | ""
}

## Draggable Element: draggable
Expand All @@ -34,13 +32,39 @@

common.attrs.hidden =
attribute hidden {
"hidden" | ""
"hidden" | "until-found" | ""
}

## Global attributes applicable on elements with editable content

common.attrs.editing &=
( common.attrs.inputmode?
& common.attrs.spellcheck?
& common.attrs.autocapitalize?
& common.attrs.enterkeyhint?
)

common.attrs.other &= common.attrs.editing

## Hint expected data type: inputmode

common.attrs.inputmode =
attribute inputmode {
( "none"
| "text"
| "tel"
| "url"
| "email"
| "numeric"
| "decimal"
| "search"
)
}

## Spellchecking and grammar checking: spellcheck

common.attrs.spellcheck =
attribute spellcheck{
attribute spellcheck {
"true" | "false" | ""
}

Expand All @@ -57,14 +81,19 @@
)
}

## Application Cache: manifest
## Type of Enter button on virtual keyboards: enterkeyhint

html.attrs.manifest =
attribute manifest {
common.data.uri.non-empty
common.attrs.enterkeyhint =
attribute enterkeyhint {
( "enter"
| "done"
| "go"
| "next"
| "previous"
| "search"
| "send"
)
}

html.attrs &= html.attrs.manifest?

## Progess Indicator: <progress>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ aria.global =
& aria.prop.describedby?
& aria.prop.details?
& aria.state.disabled?
& aria.state.dropeffect?
& aria.prop.errormessage?
& aria.prop.flowto?
& aria.state.grabbed?
& aria.prop.haspopup?
& aria.state.hidden?
& aria.state.invalid?
Expand Down Expand Up @@ -288,13 +286,6 @@ common.attrs.aria.implicit.navigation |= common.attrs.aria.implicit.landmark
| string "false" #default
}

## dropeffect
aria.state.dropeffect =
attribute aria-dropeffect
{
list { ("copy" | "execute" | "link" | "move" | "none" | "popup") + }
}

## expanded
aria.state.expanded =
attribute aria-expanded
Expand All @@ -303,14 +294,6 @@ common.attrs.aria.implicit.navigation |= common.attrs.aria.implicit.landmark
| string "undefined" #default
}

## grabbed
aria.state.grabbed =
attribute aria-grabbed
{ string "true"
| string "false"
| string "undefined" #default
}

## hidden
aria.state.hidden =
attribute aria-hidden
Expand Down Expand Up @@ -374,7 +357,9 @@ common.attrs.aria.implicit.navigation |= common.attrs.aria.implicit.landmark
## colcount
aria.prop.colcount =
attribute aria-colcount {
common.data.integer.positive
( common.data.integer.non-negative
| string "-1"
)
}

## colindex
Expand Down Expand Up @@ -576,7 +561,9 @@ common.attrs.aria.implicit.navigation |= common.attrs.aria.implicit.landmark
## rowcount
aria.prop.rowcount =
attribute aria-rowcount {
common.data.integer.positive
( common.data.integer.non-negative
| string "-1"
)
}

## rowindex
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,25 +202,35 @@ common.attrs.present =

common.attrs.other =
( common.attrs.autofocus?
& common.attrs.inputmode?
& common.attrs.nonce?
& common.attrs.inert?
)

common.attrs.autofocus =
attribute autofocus {
"autofocus" | ""
}

common.attrs.inputmode =
attribute inputmode {
string
common.attrs.blocking =
attribute blocking {
list { "render" }
}

common.attrs.fetchpriority =
attribute fetchpriority {
"high" | "low" | "auto"
}

common.attrs.nonce =
attribute nonce {
string
}

common.attrs.inert =
attribute inert {
string "inert" | string ""
}

# #####################################################################
## Common Datatypes #
# #####################################################################
Expand Down
Loading