Skip to content

Commit c4d9e45

Browse files
Merge branch 'w3c:main' into main
2 parents 0361e1e + bc3c4e1 commit c4d9e45

File tree

17 files changed

+1100
-281
lines changed

17 files changed

+1100
-281
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Validate-YAML-Core-Concept-List
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
paths: ['_data/core.yml']
7+
pull_request:
8+
branches: [ main ]
9+
paths: ['_data/core.yml']
10+
11+
jobs:
12+
validate-yaml-core-concept-list:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Validate YAML intent lists
17+
run: yamllint -c _data/_config_yamllint.yml _data/core.yml
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Validate-YAML-Core-Properties-List
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
paths: ['_data/core-properties.yml']
7+
pull_request:
8+
branches: [ main ]
9+
paths: ['_data/core-properties.yml']
10+
11+
jobs:
12+
validate-yaml-core-properties-concept-list:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Validate YAML intent lists
17+
run: yamllint -c _data/_config_yamllint.yml _data/core-properties.yml
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Validate-YAML-Open-Concept-List
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
paths: ['_data/open.yml']
7+
pull_request:
8+
branches: [ main ]
9+
paths: ['_data/open.yml']
10+
11+
jobs:
12+
validate-yaml-open-concept-list:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Validate YAML intent lists
17+
run: yamllint -c _data/_config_yamllint.yml _data/open.yml

.travis.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

_data/_config_yamllint.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
3+
extends: default
4+
5+
rules:
6+
braces:
7+
level: warning
8+
max-spaces-inside: 1
9+
brackets:
10+
level: warning
11+
max-spaces-inside: 1
12+
colons:
13+
level: warning
14+
commas:
15+
level: warning
16+
comments: disable
17+
comments-indentation: disable
18+
document-start: disable
19+
empty-lines:
20+
level: warning
21+
hyphens:
22+
level: warning
23+
indentation:
24+
level: warning
25+
indent-sequences: consistent
26+
line-length:
27+
max: 240
28+
level: warning
29+
allow-non-breakable-inline-mappings: true
30+
truthy: disable
31+
trailing-spaces: disable

_data/core-properties.yml

Lines changed: 99 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,30 @@
5555
- property: literal
5656
type: inference
5757
applicability: all presentation elements
58-
effect: >
58+
effect: |
5959
Assistive technology should not infer any semantics and just speak the elements with a literal interpretation.
6060
This includes speaking leaf content literally (e.g., `|` is spoken as "vertical bar").
61-
If `intent` is present on a child element, it overrides this property.
62-
examples:
63-
- intent:
64-
mathml: |
65-
<mrow intent=':literal'>
66-
<msup intent='power($base, $exp)'> <mi arg='base'>x</mi><mn arg='exp'>2</mn> </msup>
67-
<mtext> is literally </mtext>
68-
<msup> <mi>x</mi><mn>2</mn> </msup>
69-
</mrow>
70-
en: "x squared is literally x superscript 2 end superscript"
61+
If `intent` is present on a child element, it overrides this property.
62+
See [literal property](../literal-common-properties#literal-property)
7163
64+
- property: common
65+
type: inference
66+
applicability: all presentation elements
67+
effect: |
68+
Assistive technology should use the specified `common` defaults.
69+
See [common property](../literal-common-properties#common-property)
70+
71+
- property: legacy
72+
type: inference
73+
applicability: all presentation elements
74+
effect: |
75+
Assistive technology should use its system specified defaults.
76+
This is the default behavior if neither the
77+
[literal property](../literal-common-properties#literal-property)
78+
nor
79+
[common property](../literal-common-properties#common-property)
80+
is in effect.
81+
See [legacy property](../literal-common-properties#legacy-property)
7282
7383
- property: array
7484
type: table
@@ -184,6 +194,18 @@
184194
applicability: mtable
185195
effect: indicates that the table should be read column by column
186196

197+
- property: equation-label
198+
type: table
199+
applicability: mtd
200+
effect: indicates that the cell holds an equation label.
201+
This may influence the way the surrounding `mtr` is announced.
202+
203+
- property: no-equation-label
204+
type: table
205+
applicability: mtd
206+
effect: indicates that the cell does not hold a label.
207+
This may be used if a table column is being used solely to hold labels
208+
to highlight empty cells for unlabeled rows.
187209

188210
- property: number-set
189211
type: mathematical-category
@@ -272,16 +294,22 @@
272294
applicability: mn
273295
comment: some braille codes (e.g., CMU) have special rules for roman numerals
274296
examples:
275-
- mathml: "<mi intent=':roman-numeral'>cd</mi>"
276-
en: c d
277-
- mathml: "<mi intent=':roman-numeral'>XVI</mi>"
278-
en: x v i
297+
- mathml: "<mn intent=':roman-numeral'>cd</mn>"
298+
en:
299+
-c d
300+
- four hundred
301+
- mathml: "<mn intent=':roman-numeral'>XVI</mn>"
302+
en:
303+
- x v i
304+
- sixteen
279305
- mathml: "<mrow intent=':roman-numeral'>
280-
<menclose notation='top'><menclose notation='top'><mi>VI</mi></menclose></menclose>
281-
<menclose notation='top'><mi>XL</mi></menclose>
282-
<mi>DXXI</mi>
306+
<menclose notation='top'><menclose notation='top'><mn>VI</mn></menclose></menclose>
307+
<menclose notation='top'><mn>XL</mn></menclose>
308+
<mn>DXXI</mn>
283309
</mrow>"
284-
en: ???
310+
en:
311+
- v i double vinculm ; x l vinculum ; d x x i
312+
- six million? ; forty thousand ; five hundred and twenty one
285313

286314
- property: shape
287315
type: geometry
@@ -345,4 +373,55 @@
345373
</mrow>
346374
</mrow>
347375
en: '2, cap h, sub 2; cap o; reacts to form; 2 cap h, sub 2; plus cap o, sub 2'
348-
376+
377+
378+
379+
- property: pause-short
380+
type: pause
381+
applicability: all
382+
effect: "short pause before processing the element as usual."
383+
examples:
384+
- mathml: '<math><mi>a</mi><mspace intent=":pause-short" width=".2em"/><mi>b</mi></math>'
385+
en: "a [pause.] b"
386+
387+
- property: pause-medium
388+
type: pause
389+
applicability: all
390+
effect: "medium pause before processing the element as usual."
391+
examples:
392+
- mathml: |
393+
<math display="block" xmlns="http://www.w3.org/1998/Math/MathML">
394+
<mtable displaystyle="true" intent=":system-of-equations">
395+
<mtr>
396+
<mtd intent=":equation-label"><mtext>(10)</mtext></mtd>
397+
<mtd><mi>𝑎</mi><mi>+</mi><mi>𝑎</mi></mtd>
398+
<mtd><mo form="infix">=</mo><mi>𝑏</mi><mo>+</mo><mi>𝑏</mi></mtd>
399+
<mtd intent=":pause-medium"><mi>𝑐</mi><mo>+</mo><mi>𝑐</mi></mtd>
400+
<mtd><mo form="infix">=</mo><mi>𝑑</mi><mo>+</mo><mi>𝑑</mi></mtd>
401+
</mtr>
402+
<mtr>
403+
<mtd intent=":equation-label"><mtext>(11)</mtext></mtd>
404+
<mtd><mi>𝑎</mi></mtd>
405+
<mtd><mo form="infix">=</mo><mi>𝑏</mi></mtd>
406+
<mtd intent=":pause-medium"><mi>𝑐</mi></mtd>
407+
<mtd><mo form="infix">=</mo><mi>𝑑</mi></mtd>
408+
</mtr>
409+
</mtable>
410+
</math>
411+
en: "line one label 10; a plus a equals b plus b [pause..] c plus c equals d plus d; line two label 11; a equals b [pause..] c equals d"
412+
413+
- property: pause-long
414+
type: pause
415+
applicability: all
416+
effect: "long pause before processing the element as usual."
417+
examples:
418+
- mathml: '<math><mi>a</mi><mspace intent=":pause-long" width="2em"/><mi>b</mi></math>'
419+
en: "a [pause...] b"
420+
421+
- property: pause-xlong
422+
type: pause
423+
applicability: all
424+
effect: "extra long pause before processing the element as usual."
425+
examples:
426+
- mathml: '<math><mi>a</mi><mspace intent=":pause-xlong" width="4cm"/><mi>b</mi></math>'
427+
en: "a [pause....] b"

_data/core.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ concepts:
380380
- condition: ""
381381
en: "$2<i>th</i> root of $1"
382382

383-
- concept: greatest-common-divsor
383+
- concept: greatest-common-divisor
384384
arity: ">=2"
385385
property: function
386386
en: greatest common divisor of $1, $2, ...
@@ -1104,7 +1104,7 @@ concepts:
11041104

11051105
- concept: transpose
11061106
arity: 1
1107-
property: suffix
1107+
property: function
11081108
default: false
11091109
en: "transpose of $1"
11101110
fr: "transposée de $1"

_data/open-properties.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
2-
31
- property: example
4-
type: example-type
5-
applicability: mi
6-
examples:
7-
- mathml: "<mrow><mi mathvariant='normal' intent=':example'>$</mi><mn>1.50</mn></mrow>"
8-
en: 1.50 dollars
9-
- mathml: "<mrow><mn>1.50</mn><mi intent=':example'>USD</mi></mrow>"
10-
en: 1.50 U S dollars
11-
- mathml: "<mrow><mi mathvariant='normal' intent=':example'>£</mi><mn>1.50</mn></mrow>"
12-
en: 1.50 pounds
13-
2+
type: example
3+
applicability: none
4+
effect: placeholder for any future use of this list

_data/open.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10245,9 +10245,9 @@ concepts:
1024510245
urls:
1024610246
- "https://dlmf.nist.gov/21.2#i"
1024710247
- "https://dlmf.nist.gov/21.2#E1"
10248-
10248+
1024910249
- concept: schlaefli-symbol
10250-
arity: ">=0"
10250+
arity: ">=0"
1025110251
en: schlaefli symbol of $1, ...
1025210252
property: fenced
1025310253
area: "geometry"

_data/unicode-speech.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
---
2+
-
3+
- char: +
4+
- u: "002B"
5+
- t: plus
26
-
37
- char: ¡
48
- u: "00A1"
@@ -1561,9 +1565,8 @@
15611565
-
15621566
- char:
15631567
- u: "210F"
1564-
- choose:
1565-
- terse: h bar
1566-
- default: reduced planck constant
1568+
- t: "h bar"
1569+
15671570
# just Weierstrass, others handled with alphabet
15681571
# -
15691572
# - char: ℐℒ℘ℬℰℱℳ
@@ -8014,7 +8017,7 @@
80148017
-
80158018
- char:
80168019
- u: "FF0B"
8017-
- t: equals sign
8020+
- t: full width plus
80188021
-
80198022
- char:
80208023
- u: "FF1C"

0 commit comments

Comments
 (0)