diff --git a/accname/index.html b/accname/index.html index 9d0a72a6d..4259868b6 100644 --- a/accname/index.html +++ b/accname/index.html @@ -138,6 +138,11 @@ xref: ["dom", "core-aam-1.2", "wai-aria-1.2", "infra"], }; +
@@ -432,11 +437,11 @@

Computation steps

  • Computation: Compute the text alternative for the current node: -
      +
      1. Hidden Not Referenced: If the current node is [=element/hidden=] and is: -
          +
          1. Not part of an aria-labelledby or aria-describedby traversal, where the node directly referenced by that relation was hidden.
          2. Nor part of a native host language text alternative element (e.g. label in HTML) or @@ -497,13 +502,13 @@

            Computation steps

            LabelledBy: Otherwise, if the current node has an aria-labelledby [=attribute=] that contains at least one valid IDREF, and the current node is not already part of an ongoing aria-labelledby or aria-describedby traversal, process its IDREFs in the order they occur: -
              +
              1. Set the accumulated text to the empty string.
              2. For each IDREF: -
                  +
                  1. Set the current node to the node referenced by the IDREF.
                  2. @@ -551,7 +556,7 @@

                    Computation steps

                    Embedded Control: Otherwise, if the current node is a control embedded within the label (e.g. any element directly referenced by aria-labelledby) for another widget, where the user can adjust the embedded control's value, then return the embedded control as part of the text alternative in the following manner: -
                      +
                      1. Textbox: If the embedded control has role textbox, return its value.
                      2. Combobox/Listbox: If the embedded control has role combobox or listbox, @@ -560,7 +565,7 @@

                        Computation steps

                      3. Range: If the embedded control has role range (e.g., a spinbutton or slider): -
                          +
                          1. If the aria-valuetext property is present, return its value,
                          2. Otherwise, if the aria-valuenow property is present, return its value,
                          3. Otherwise, use the value as specified by a host language attribute.
                          4. @@ -581,7 +586,7 @@

                            Computation steps

                          5. AriaLabel: Otherwise, if the current node has an aria-label [=attribute=] whose value is not undefined, not the empty string, nor, when trimmed of [=ascii whitespace|whitespace=], is not the empty string: -
                              +
                              1. If traversal of the current node is due to recursion and the current node is an embedded control, ignore aria-label and skip to rule Embedded Control. @@ -627,7 +632,7 @@

                                Computation steps

                                Name From Content: Otherwise, if the current node's role allows name from content, or if the current node is referenced by aria-labelledby, aria-describedby, or is a native host language text alternative [=element=] (e.g. label in HTML), or is a descendant of a native host language text alternative [=element=]: -
                                  +
                                  1. Name From Content Reset: Set the accumulated text to the empty string.
                                  2. @@ -636,7 +641,7 @@

                                    Computation steps

                                    CSS generated textual content associated with the current node and include it in the accumulated text. The CSS ::before and ::after pseudo elements [[!CSS2]] can provide textual content for [=element|elements=] that have a content model. -
                                      +
                                      1. For ::before pseudo elements, User agents MUST prepend CSS textual content, without a space, to the textual content of the current node. @@ -650,7 +655,7 @@

                                        Computation steps

                                      2. Determine Child Nodes: Determine the rendered child nodes of the current node: -
                                          +
                                          1. If the current node has an attached [=shadow root=], set the rendered child nodes to be the child nodes of the [=shadow root=].
                                          2. @@ -664,7 +669,7 @@

                                            Computation steps

                                          3. Name From Each Child: For each rendered child node of the current node: -
                                              +
                                              1. Set the current node to the rendered child node.
                                              2. diff --git a/common/css/common.css b/common/css/common.css index 9dc5be9e1..7e2ce3bf8 100644 --- a/common/css/common.css +++ b/common/css/common.css @@ -1,39 +1,4 @@ -ol{ list-style:decimal; } -ol ol{ list-style:upper-alpha; } -ol ol ol{ list-style:lower-roman; } -ol ol ol ol{ list-style:lower-alpha; } - -/* following rules are specifically for the complex nested list in #textequivalentcomputation */ -/* but perhaps we should abstract this out to a more general classname (like .stepbystep or .nested) instead */ -#textequivalentcomputation li{ - margin-top:0.5em; - margin-bottom:0.5em; -} -#textequivalentcomputation > ol{ - padding-top:0.5em; - padding-bottom:0.7em; - border:solid 1px #ccc; -} -#textequivalentcomputation > ol > li{ - margin-right:2em; -} - -/* not clear where/why the following two blocks are used; spacing on .role causes problem in html-aam; commenting out for now - * -.role, .state, .property, .widget { - margin-left: 2em; - margin-bottom: 4ex; -} - -.role-name, .state-name, .property-name, .widget-name { - /* margin-left: -2em; */ -/* font-size: 100%; - font-weight: bold; - font-style: normal; - font-variant: normal; -} -*/ .role-parent ul, .role-base ul, .role-children ul, @@ -58,22 +23,6 @@ ol ol ol ol{ list-style:lower-alpha; } padding:0; list-style-type:none; } -/* -.role-parent ul li, .role-children ul li, .role-related ul li, .role-scope ul li, .role-mustcontain ul li, .role-required-properties ul li, .role-properties ul li, .role-inherited ul li, .role-namefrom ul li, .state-value ul li, .state-related ul li, .state-applicability ul li, .state-descendants ul li, .property-value ul li, .property-related ul li, .property-applicability ul li, .property-descendants ul li { - display: inline; -} -.role-parent ul li:after, .role-children ul li:after, .role-related ul li:after, .role-scope ul li:after, .role-mustcontain ul li:after, .role-required-properties ul li:after, .role-properties ul li:after, .role-inherited ul li:after, .role-namefrom ul li:after, .state-value ul li:after, .state-related ul li:after, .state-applicability ul li:after, .state-descendants ul li:after, .property-value ul li:after, .property-related ul li:after, .property-applicability ul li:after, .property-descendants ul li:after { - content: " "; -} -*/ -/* -.widget-description ul, .widget-keyboard ul, .widget-mouse ul, .widget-styling ul, .widget-aria ul, .widget-example ul { - margin: 0; - padding: 0; - list-style-type: none; -} -*/ - table{ border:solid 2px #999; border-width:1px 0 0 1px; @@ -108,147 +57,3 @@ table.role-features tbody th, table.state-features tbody th, table.property-feat th+th, td+td{ width:auto; } -/* -.role-abstract-head, .role-parent-head, .role-children-head, .role-related-head, .role-scope-head, .role-mustcontain-head, .role-required-properties-head, .role-properties-head, .role-inherited-head, .role-namefrom-head, .role-child-presentational-head, .role-presentational-inherited-head, .state-value-head, .state-related-head, .state-applicability-head, .property-value-head, .property-related-head, .property-applicability-head, .widget-description-head, .widget-keyboard-head, .widget-mouse-head, .widget-styling-head, .widget-aria-head, .widget-example-head { - width: 20em; -} -table.role-features, table.role-features tbody tr td, table.role-features thead tr th, table.state-features, table.state-features tbody tr td, table.state-features thead tr th, table.property-features, table.property-features tbody tr td, table.property-features thead tr th, table.widget-features, table.widget-features tbody tr td, table.widget-features tbody tr th { - border: 1px solid #000000; -} -table.role-properties tbody tr th, table.state-properties tbody tr th, table.property-properties tbody tr th { - padding-right: 1em; -} -table.value-descriptions caption { - margin-top: 1em; -} -*/ - -html code, html pre, html kbd{ /* more specific selector than the default W3C style sheet */ - /* Most browsers default 'monospace' to Courier, which has an ex-height of about 60% normal size. */ - /* Monaco has a normal ex-height so font sizes appear more consistent with surrounding non-monospaced text. */ - font-family: "Monaco", "Courier New", "Courier", monospace; - font-family: "Monaco", "Courier New", "Courier"; /* declare as separate rule to account for browser font-size inconsistencies, monospace fallback from previous rule should still work in the [almost non-existant] case that a user system does not have Courier */ - font-size:0.9em; -} -html pre { /* more specific selector than the default W3C style sheet */ - border: solid 1px #999; - background-color: #fcfcfc; - margin:1em 0; - padding:0.5em 0.8em; - font-size:0.75em; /* text in blocks code blocks looked too big now that font is back to normal size */ - line-height:1.4; /* [sic] unitless multiplier, not EM size */ -} -pre .tag, code .tag, code.tag{ - color:#00c; /* blue */ -} -pre .str, code .str, code.str{ - color:#090; /* green */ -} -pre .comment, code .comment, code.comment, .comment .str, .comment .tag{ - color:#777; /* gray */ -} -/* -.role-reference, .role-reference:link, .role-reference:visited { - background-color: #eee; -} -.state-reference, .state-reference:link, .state-reference:visited { - background-color: #ffc; -} -.property-reference, .property-reference:link, .property-reference:visited { - background-color: #ccf; -} -.widget-reference, .widget-reference:link, .widget-reference:visited { - background-color: #9f6; -} -*/ -.termref, a.termref:link { - color:#006400; - text-decoration:none; - font-style:italic; -} -a.termref:visited { - color:inherit; -} -a.termref:hover, a.termref:focus { - background-color: #fafad2; - color: #006400; -} -.empty { - display: none; -} -.note { - color:#444; - border:solid 1px #ccc; - margin:1em 0; - padding:1em 2em; -} -.ednote { - border:solid 3px #cca; - background-color:#ffd; - padding:0 0.8em; -} -.role-screenshot { - float: right; - margin-left: 1em; - margin-bottom: 1ex; -} -.role-screenshot p { - text-align: center; - font-size: smaller; -} -.image { - text-align: center; -} -.img { - margin-left: auto; - margin-right: auto; -} -.img p { - text-align: center; - font-weight: bold; - font-size: smaller; -} -.img-caption { - font-weight: bold; -} -/* -dl.runin dt { - display: run-in; -} -dl.runin dt:after { - content: ": "; -} -*/ -dl.compact dt { - font-weight:normal; -} -/* -dl.compact dd { - margin-left: 5em; -} -*/ -.rfc2119 { - font-weight: bold; - text-transform: uppercase; -} -.todo { - background-color:#f99; -} -.issue { - background-color:#0c0; -} -abbr.symbol { - border-bottom:none; -} - -.aref { - font-family: monospace; - font-weight: bold; - color: #ff4500 !important; -} - -/* prevent
                                                from butting up against previous
                                                in .termlist (terms.html) */ -.termlist dt {margin-top: 1em;} - - - diff --git a/core-aam/css/core-aam.css b/core-aam/css/core-aam.css deleted file mode 100644 index f71ede309..000000000 --- a/core-aam/css/core-aam.css +++ /dev/null @@ -1,178 +0,0 @@ -ol{ list-style:decimal; } -ol ol{ list-style:upper-alpha; } -ol ol ol{ list-style:lower-roman; } -ol ol ol ol{ list-style:lower-alpha; } - -table{ - border:solid 2px #999; - border-width:1px 0 0 1px; - margin:0.1em 0 1em; - padding:0; - border-spacing:0; - border-collapse:collapse; -} -th, td{ - border:solid 2px #999; - border-width:0 1px 1px 0; - padding:0.15em 0.3em 0.1em; - /*min-width:20em;*/ - vertical-align:top; - text-align:left; -} -th+th, td+td{ - width:auto; -} -th{ - background-color:#eee; -} -caption{ - text-align:left; - color:#555; - font-style:normal; - margin:1em 0 0.1em; - padding:0 0 0 0.3em; -} -html code, html pre, html kbd{ /* more specific selector than the default W3C style sheet */ - /* Most browsers default 'monospace' to Courier, which has an ex-height of about 60% normal size. */ - /* Monaco has a normal ex-height so font sizes appear more consistent with surrounding non-monospaced text. */ - font-family: "Monaco", "Courier New", "Courier", monospace; - font-family: "Monaco", "Courier New", "Courier"; /* declare as separate rule to account for browser font-size inconsistencies, monospace fallback from previous rule should still work in the [almost non-existant] case that a user system does not have Courier */ - font-size:0.9em; -} -html pre { /* more specific selector than the default W3C style sheet */ - border: solid 1px #999; - background-color: #fcfcfc; - margin:1em 0; - padding:0.5em 0.8em; - font-size:0.75em; /* text in blocks code blocks looked too big now that font is back to normal size */ -} -pre .tag, code .tag, code.tag{ - color:#00c; /* blue */ -} -pre .str, code .str, code.str{ - color:#090; /* green */ -} -pre .comment, code .comment, code.comment, .comment .str, .comment .tag{ - color:#777; /* gray */ -} -/* -.role-reference, .role-reference:link, .role-reference:visited { - background-color: #eee; -} -.state-reference, .state-reference:link, .state-reference:visited { - background-color: #ffc; -} -.property-reference, .property-reference:link, .property-reference:visited { - background-color: #ccf; -} -.widget-reference, .widget-reference:link, .widget-reference:visited { - background-color: #9f6; -} -*/ -.role-reference, .state-reference, .property-reference, .widget-reference, .design-pattern-reference {} -.termref, a.termref:link { - color:#006400; - text-decoration:none; - font-style:italic; -} -a.termref:visited { - color:inherit; -} -a.termref:hover, a.termref:focus { - background-color: #fafad2; - color: #006400; -} -.empty { - display: none; -} -.note { - color:#444; - border:solid 1px #ccc; - margin:1em 0; - padding:1em 2em; -} -.ednote { - border:solid 3px #cca; - background-color:#ffd; - padding:0 0.8em; -} -.role-screenshot { - float: right; - margin-left: 1em; - margin-bottom: 1ex; -} -.role-screenshot p { - text-align: center; - font-size: smaller; -} -.image { - text-align: center; -} -.img { - margin-left: auto; - margin-right: auto; -} -.img p { - text-align: center; - font-weight: bold; - font-size: smaller; -} -.img-caption { - font-weight: bold; -} -/* -dl.runin dt { - display: run-in; -} -dl.runin dt:after { - content: ": "; -} -*/ -dl.compact dt { - font-weight:normal; -} -/* -dl.compact dd { - margin-left: 5em; -} -*/ -.rfc2119 { - font-weight: bold; - text-transform: uppercase; -} -.tocnum {} -.section {} -.todo { - background-color:#f99; -} -.issue { - background-color:#0c0; - text-transform:uppercase; -} - -.script-function, .script-property, .api-role, .api-method, .api-property, .api-state, .api-relation, .api-interface, .api-event, .api-object, .dom-property, .dom-method, .dom-event, .css-selector, .css-property { - font-family: monospace; -} -.script-function:after, .api-method:after, .dom-method:after { - font-family: monospace; - content: "()"; -} -.property-value, .api-property-value, .dom-property-value, .script-property-value, .css-property-value { - font-weight: bold; -} -.xsd-type {} - -/* Permalinks */ -.permalink { - float: right; - margin-top: -2.5em; - /*color:#333 !important;*/ -} -.permalink a, .permalink a:link, .permalink a:visited, .permalink a:hover, .permalink a:focus, .permalink a:active -{ - background:transparent !important; - text-decoration:none; -} -.permalink abbr { - border:0; -} diff --git a/core-aam/index.html b/core-aam/index.html index e98f9fa5f..f72c90e55 100644 --- a/core-aam/index.html +++ b/core-aam/index.html @@ -11,7 +11,6 @@ - -