1 files changed, 17 insertions(+), 9 deletions(-)

M useragent.css

@@ 9,17 9,20 @@ button[type=submit] {speak: always}
 input[type=submit][value] {speak: always; content: attr(value)}
 
 /** Tables **/
-table::before {content: 'Table'; voice-volume: x-soft}
+table::before {content: "Table"; voice-volume: x-soft}
 tr {cue-before: url(about:bulletpoint.wav);}
-td, th {cue-before: url(about:bulletpoint.wav) -1db;}
-/* TODO Do we actually want this feature, would take significant processing. */
-th > :th /* Rhapsode-specific, selects inlined table headers */ {speak: never;}
+td, th {
+    cue-before: url(about:bulletpoint.wav) -1db;
+    -rhaps-marker: "-rhaps-tablecell" counter(-rhaps-tablerow) "x" counter(-rhaps-tablecol);
+    counter-increment: -rhaps-tablerow, -rhaps-tablecol;
+}
 table caption {voice-volume: soft}
 
 /** Sectioning **/
 footer, header {voice-volume: soft}
 nav {speak: never} /* Expose the links for navigation, but not narration */
 h1, h2, h3, h4, h5, h6, legend, th, summary, dt {voice-stress: strong}
+h1, h2, h3, h4, h5, h6, section, aside {-rhaps-marker: -rhaps-section}
 h1 {pause: x-strong; voice-rate: x-slow}
 h2 {pause: strong; voice-rate: slow}
 h3, th, summary, legend, dt {pause: medium; voice-rate: medium}


@@ 29,11 32,11 @@ h6 {voice-pitch: high}
 
 /** Text **/
 hr {pause: x-strong}
-p, pre, samp, blockquote {pause: strong}
+p, pre, samp, blockquote {pause: strong; -rhaps-marker: -rhaps-paragraph}
 pre, address, samp {speak-as: literal-punctuation}
 pre, samp, code {voice: neutral 2; white-space: pre;}
-[href], :link {cue-after: url(about:link.wav) !important; voice-pitch: low}
-:link:visited {cue-after: url(about:link.wav) -1db !important}
+:link {cue-after: url(about:link.wav) !important; voice-pitch: low}
+:visited {cue-after: url(about:link.wav) -1db !important}
 img {voice-volume: soft; content: attr(src)}
 img[alt] {content: attr(alt)}
 


@@ 45,7 48,11 @@ s, del {voice-volume: x-soft}
 u, ins {voice-volume: loud}
 
 /** lists **/
-li, dt, dd {cue-before: url(about:bulletpoint.wav); pause: strong}
+li, dt, dd {
+    cue-before: url(about:bulletpoint.wav);
+    pause: strong;
+    -rhaps-marker: -rhaps-paragraph;
+}
 li::before, dt::before, dd::before {content: 'd'} /* Since the cue-before isn't coming accross */
 li li, dd dt, dd dd {cue-before: url(about:bulletpoint.wav) -1db}
 li li li, dd dd dt, dd dd dd {cue-before: url(about:bulletpoint.wav) -2db}


@@ 62,6 69,7 @@ ol li::before {
     counter-increment: -rhaps-ol;
     content: counters(-rhaps-ol, ' ')
 }
+ul, ol {-rhaps-marker: -rhaps-section}
 
 /** HTML5 **/
 abbr[title]::after {content: attr(title); voice-volume: x-soft}


@@ 71,7 79,7 @@ q, blockquote {voice-family: female 2}
 cite {voice-stress: reduce}
 dialog {speak: never} dialog[open] {speak: always}
 kbd {speak-as: spell-out}
-progress {content: attr(value) ' of ' attr(max)}
+progress {content: attr(value) " of " attr(max)}
 sub {voice-rate: x-fast}
 sup {voice-rate: fast}
 var {voice-rate: slow}