--- a/testsuite/Styling/LineHeight001.xml Thu Dec 11 13:55:19 2008 +0000
+++ b/testsuite/Styling/LineHeight001.xml Thu Dec 11 16:01:19 2008 +0000
@@ -6,7 +6,7 @@
<head>
<metadata>
<ttm:title>Styling Test - LineHeight - 001</ttm:title>
- <ttm:desc>Test tts:lineHeight attribute using the normal value.</ttm:desc>
+ <ttm:desc>Test tts:lineHeight attribute using the normal value in the style element.</ttm:desc>
<ttm:copyright>Copyright (C) 2008 W3C (MIT, ERCIM, Keio).</ttm:copyright>
</metadata>
<styling>
@@ -14,8 +14,8 @@
</styling>
</head>
<body>
- <div style="s1">
- <p begin="0s" end="10s">The line height of this <br />two-row caption is normal.</p>
+ <div>
+ <p begin="0s" end="10s" style="s1">The line height of this <br />two-row caption is normal.</p>
</div>
</body>
</tt>
--- a/testsuite/Styling/LineHeight002.xml Thu Dec 11 13:55:19 2008 +0000
+++ b/testsuite/Styling/LineHeight002.xml Thu Dec 11 16:01:19 2008 +0000
@@ -6,16 +6,13 @@
<head>
<metadata>
<ttm:title>Styling Test - LineHeight - 002</ttm:title>
- <ttm:desc>Test tts:lineHeight attribute using the normal value in a span.</ttm:desc>
+ <ttm:desc>Test tts:lineHeight attribute using the normal value in a paragraph.</ttm:desc>
<ttm:copyright>Copyright (C) 2008 W3C (MIT, ERCIM, Keio).</ttm:copyright>
</metadata>
- <styling>
- <style xml:id="s1" tts:lineHeight="20px"/>
- </styling>
</head>
<body>
- <div style="s1">
- <p begin="0s" end="10s" tts:lineHeight="normal">The line height of this <br />two-row caption is normal.</p>
+ <div>
+ <p begin="0s" end="10s" tts:lineHeight="normal">The line height of this<br />two-row caption is normal.</p>
</div>
</body>
</tt>
--- a/testsuite/Styling/LineHeight003.xml Thu Dec 11 13:55:19 2008 +0000
+++ b/testsuite/Styling/LineHeight003.xml Thu Dec 11 16:01:19 2008 +0000
@@ -6,7 +6,7 @@
<head>
<metadata>
<ttm:title>Styling Test - LineHeight - 003</ttm:title>
- <ttm:desc>Test tts:lineHeight attribute using a length value.</ttm:desc>
+ <ttm:desc>Test tts:lineHeight attribute using a length value in the style element.</ttm:desc>
<ttm:copyright>Copyright (C) 2008 W3C (MIT, ERCIM, Keio).</ttm:copyright>
</metadata>
<styling>
@@ -14,8 +14,8 @@
</styling>
</head>
<body>
- <div style="s1">
- <p begin="0s" end="10s">The line height of this <br />two-row caption is 30 pixels.</p>
+ <div>
+ <p begin="0s" end="10s" style="s1">The line height of this<br />two-row caption is 30 pixels.</p>
</div>
</body>
</tt>
--- a/testsuite/Styling/TextAlign002.xml Thu Dec 11 13:55:19 2008 +0000
+++ b/testsuite/Styling/TextAlign002.xml Thu Dec 11 16:01:19 2008 +0000
@@ -6,13 +6,13 @@
<head>
<metadata>
<ttm:title>Styling Test - TextAlign - 002</ttm:title>
- <ttm:desc>Test tts:textAlign attribute with the left value in a span.</ttm:desc>
+ <ttm:desc>Test tts:textAlign attribute with the left value in a paragraph.</ttm:desc>
<ttm:copyright>Copyright (C) 2008 W3C (MIT, ERCIM, Keio).</ttm:copyright>
</metadata>
</head>
<body>
<div>
- <p begin="0s" end="10s" tts:textAlign="right"><span tts:textAlign="left">This caption is on the left</span>.</p>
+ <p begin="0s" end="10s" tts:textAlign="left">This caption is on the left.</p>
</div>
</body>
</tt>
--- a/testsuite/Styling/TextAlign003.xml Thu Dec 11 13:55:19 2008 +0000
+++ b/testsuite/Styling/TextAlign003.xml Thu Dec 11 16:01:19 2008 +0000
@@ -6,16 +6,16 @@
<head>
<metadata>
<ttm:title>Styling Test - TextAlign - 003</ttm:title>
- <ttm:desc>Test tts:textAlign attribute with the center value in style.</ttm:desc>
+ <ttm:desc>Test tts:textAlign attribute with the center value in the style element.</ttm:desc>
<ttm:copyright>Copyright (C) 2008 W3C (MIT, ERCIM, Keio).</ttm:copyright>
</metadata>
<styling>
- <style xml:id="s1" tts:textAlign="center" />
+ <style xml:id="s1" tts:textAlign="center"/>
</styling>
</head>
<body>
- <div style="s1">
- <p begin="0s" end="10s">This caption is in the center.</p>
+ <div>
+ <p begin="0s" end="10s" style="s1">This caption is in the center.</p>
</div>
</body>
</tt>
--- a/testsuite/Styling/TextAlign004.xml Thu Dec 11 13:55:19 2008 +0000
+++ b/testsuite/Styling/TextAlign004.xml Thu Dec 11 16:01:19 2008 +0000
@@ -6,13 +6,13 @@
<head>
<metadata>
<ttm:title>Styling Test - TextAlign - 004</ttm:title>
- <ttm:desc>Test tts:textAlign attribute with the right value on the body.</ttm:desc>
+ <ttm:desc>Test tts:textAlign attribute with the center value in a pargraph.</ttm:desc>
<ttm:copyright>Copyright (C) 2008 W3C (MIT, ERCIM, Keio).</ttm:copyright>
</metadata>
</head>
- <body tts:textAlign="right">
+ <body>
<div>
- <p begin="0s" end="10s">This caption is on the right.</p>
+ <p begin="0s" end="10s" tts:textAlign="center">This caption is placed<br />in the center.</p>
</div>
</body>
</tt>
--- a/testsuite/Styling/TextAlign005.xml Thu Dec 11 13:55:19 2008 +0000
+++ b/testsuite/Styling/TextAlign005.xml Thu Dec 11 16:01:19 2008 +0000
@@ -5,14 +5,17 @@
xmlns:ttm="http://www.w3.org/2006/10/ttaf1#metadata">
<head>
<metadata>
- <ttm:title>Styling Test - TextAlign - 005</ttm:title>
- <ttm:desc>Test tts:textAlign attribute with the left value on div.</ttm:desc>
+ <ttm:title>Styling Test - TextAlign - 007</ttm:title>
+ <ttm:desc>Test tts:textAlign attribute with the start value in the style element.</ttm:desc>
<ttm:copyright>Copyright (C) 2008 W3C (MIT, ERCIM, Keio).</ttm:copyright>
</metadata>
+ <styling>
+ <style xml:id="s1" tts:textAlign="start"/>
+ </styling>
</head>
<body>
- <div tts:textAlign="left">
- <p begin="0s" end="10s">This caption is on the left.</p>
+ <div>
+ <p begin="0s" end="10s" style="s1">This caption is aligned<br />with the start edge.</p>
</div>
</body>
</tt>
--- a/testsuite/Styling/TextAlign006.xml Thu Dec 11 13:55:19 2008 +0000
+++ b/testsuite/Styling/TextAlign006.xml Thu Dec 11 16:01:19 2008 +0000
@@ -6,13 +6,16 @@
<head>
<metadata>
<ttm:title>Styling Test - TextAlign - 006</ttm:title>
- <ttm:desc>Test tts:textAlign attribute with the center value on a span.</ttm:desc>
+ <ttm:desc>Test tts:textAlign attribute with the end value.</ttm:desc>
<ttm:copyright>Copyright (C) 2008 W3C (MIT, ERCIM, Keio).</ttm:copyright>
</metadata>
+ <styling>
+ <style xml:id="s1" tts:textAlign="end"/>
+ </styling>
</head>
<body>
- <div tts:textAlign="left">
- <p begin="0s" end="10s"><span tts:textAlign="center">This caption is in the center.</span></p>
+ <div>
+ <p begin="0s" end="10s" style="s1">This caption is aligned<br />with the end edge.</p>
</div>
</body>
</tt>
--- a/testsuite/Styling/TextOutline001.xml Thu Dec 11 13:55:19 2008 +0000
+++ b/testsuite/Styling/TextOutline001.xml Thu Dec 11 16:01:19 2008 +0000
@@ -15,7 +15,7 @@
</head>
<body>
<div>
- <p begin="0s" end="10s" tts:textOutline="none" >This text has no outline.</p>
+ <p begin="0s" end="10s" style="s1"><span tts:textOutline="none">This text has no outline.</span></p>
</div>
</body>
</tt>
--- a/testsuite/Styling/TextOutline002.xml Thu Dec 11 13:55:19 2008 +0000
+++ b/testsuite/Styling/TextOutline002.xml Thu Dec 11 16:01:19 2008 +0000
@@ -12,7 +12,7 @@
</head>
<body>
<div>
- <p begin="0s" end="10s" tts:textOutline="3px" >This text has a three-pixel outline that is the same color as the text.</p>
+ <p begin="0s" end="10s"><span tts:textOutline="3px">This text has a three-pixel outline that is the same color as the text.</span></p>
</div>
</body>
</tt>
--- a/testsuite/Styling/TextOutline003.xml Thu Dec 11 13:55:19 2008 +0000
+++ b/testsuite/Styling/TextOutline003.xml Thu Dec 11 16:01:19 2008 +0000
@@ -9,12 +9,15 @@
<ttm:desc>Test tts:textOutline attribute using values for outline thickness and blur radius.</ttm:desc>
<ttm:copyright>Copyright (C) 2008 W3C (MIT, ERCIM, Keio).</ttm:copyright>
</metadata>
+ <styling>
+ <style xml:id="s1" tts:textOutline="2px 3px"/>
+ </styling>
</head>
<body>
- <div>
- <p begin="0s" end="5s" tts:textOutline="2px 3px" >This text has a two-pixel outline that is the same color as the text,</p>
+ <div style="s1">
+ <p begin="0s" end="5s">This text has a two-pixel outline that is the same color as the text,</p>
- <p begin="5s" end="10s" tts:textOutline="2px 3px" >plus a three-pixel blur radius.</p>
+ <p begin="5s" end="10s">plus a three-pixel blur radius.</p>
</div>
</body>
</tt>
--- a/testsuite/Styling/TextOutline004.xml Thu Dec 11 13:55:19 2008 +0000
+++ b/testsuite/Styling/TextOutline004.xml Thu Dec 11 16:01:19 2008 +0000
@@ -14,8 +14,8 @@
</styling>
</head>
<body>
- <div style="s1">
- <p begin="0s" end="5s">This text has a red, two-pixel outline.</p>
+ <div>
+ <p begin="0s" end="10s" style="s1">This text has a red, two-pixel outline.</p>
</div>
</body>
</tt>
--- a/testsuite/Styling/TextOutline005.xml Thu Dec 11 13:55:19 2008 +0000
+++ b/testsuite/Styling/TextOutline005.xml Thu Dec 11 16:01:19 2008 +0000
@@ -14,8 +14,8 @@
</styling>
</head>
<body>
- <div style="s1">
- <p begin="0s" end="10s">This text has a red, three-pixel outline<br />and a two-pixel blur radius.</p>
+ <div>
+ <p begin="0s" end="10s" style="s1">This text has a red, three-pixel outline<br />and a two-pixel blur radius.</p>
</div>
</body>
</tt>
--- a/testsuite/Styling/Visibility001.xml Thu Dec 11 13:55:19 2008 +0000
+++ b/testsuite/Styling/Visibility001.xml Thu Dec 11 16:01:19 2008 +0000
@@ -6,7 +6,7 @@
<head>
<metadata>
<ttm:title>Styling Test - Visibility - 001</ttm:title>
- <ttm:desc>Test tts:visibility attribute using the visible value.</ttm:desc>
+ <ttm:desc>Test tts:visibility attribute using the visible value in the style element.</ttm:desc>
<ttm:copyright>Copyright (C) 2008 W3C (MIT, ERCIM, Keio).</ttm:copyright>
</metadata>
<styling>
--- a/testsuite/Styling/Visibility003.xml Thu Dec 11 13:55:19 2008 +0000
+++ b/testsuite/Styling/Visibility003.xml Thu Dec 11 16:01:19 2008 +0000
@@ -15,7 +15,7 @@
</head>
<body>
<div style="s1">
- <p begin="0s" end="10s">The second row of text is invisible:<br /><span tts:visibility="hidden">invisible text</span>.</p>
+ <p begin="0s" end="10s">The second row of text is invisible:<br /><span tts:visibility="hidden">invisible text.</span></p>
</div>
</body>
</tt>
--- a/testsuite/filelist.xml Thu Dec 11 13:55:19 2008 +0000
+++ b/testsuite/filelist.xml Thu Dec 11 16:01:19 2008 +0000
@@ -68,9 +68,6 @@
<file>Styling/TextAlign004.xml</file>
<file>Styling/TextAlign005.xml</file>
<file>Styling/TextAlign006.xml</file>
-<file>Styling/TextAlign007.xml</file>
-<file>Styling/TextAlign008.xml</file>
-<file>Styling/TextAlign009.xml</file>
<file>Styling/TextDecoration001.xml</file>
<file>Styling/TextDecoration002.xml</file>
<file>Styling/TextDecoration003.xml</file>
--- a/testsuite/web-framework/tests.js Thu Dec 11 13:55:19 2008 +0000
+++ b/testsuite/web-framework/tests.js Thu Dec 11 16:01:19 2008 +0000
@@ -50,10 +50,10 @@
addTest("../Styling/Color007.xml","Color007","Test tts:color attribute using a transparent value.","Styling Test");
addTest("../Styling/Color008.xml","Color008","Test tts:color attribute with span elements.","Styling Test");
addTest("../Styling/Color009.xml","Color009","Test tts:color style using a named color expression.","Styling Test");
-addTest("../Styling/LineHeight001.xml","LineHeight001","Test tts:lineHeight attribute using the normal value.","Styling Test");
-addTest("../Styling/LineHeight002.xml","LineHeight002","Test tts:lineHeight attribute using the normal value in a span.","Styling Test");
-addTest("../Styling/LineHeight003.xml","LineHeight003","Test tts:lineHeight attribute using a length value.","Styling Test");
-addTest("../Styling/LineHeight004.xml","LineHeight004","Test tts:lineHeight attribute using the inherit value.","Styling Test");
+addTest("../Styling/LineHeight001.xml","LineHeight001","Test tts:lineHeight attribute using the normal value in the style element.","Styling Test");
+addTest("../Styling/LineHeight002.xml","LineHeight002","Test tts:lineHeight attribute using the normal value in a paragraph.","Styling Test");
+addTest("../Styling/LineHeight003.xml","LineHeight003","Test tts:lineHeight attribute using a length value in the style element.","Styling Test");
+addTest("../Styling/LineHeight004.xml","LineHeight004","Test tts:lineHeight attribute using an inherited value.","Styling Test");
addTest("../Styling/Padding001.xml","Padding001","Test tts:padding attribute with one value.","Styling Test");
addTest("../Styling/Padding002.xml","Padding002","Test tts:padding attribute with two values.","Styling Test");
addTest("../Styling/Padding003.xml","Padding003","Test tts:padding attribute with three values.","Styling Test");
@@ -62,14 +62,11 @@
addTest("../Styling/Style001.xml","Style001","Test style attributes in the style element.","Styling Test");
addTest("../Styling/Styling001.xml","Styling001","Test two different styles in the style element.","Styling Test");
addTest("../Styling/TextAlign001.xml","TextAlign001","Test tts:textAlign attribute with the right value in a paragraph.","Styling Test");
-addTest("../Styling/TextAlign002.xml","TextAlign002","Test tts:textAlign attribute with the left value in a span.","Styling Test");
-addTest("../Styling/TextAlign003.xml","TextAlign003","Test tts:textAlign attribute with the center value in style.","Styling Test");
-addTest("../Styling/TextAlign004.xml","TextAlign004","Test tts:textAlign attribute with the right value on the body.","Styling Test");
-addTest("../Styling/TextAlign005.xml","TextAlign005","Test tts:textAlign attribute with the left value on div.","Styling Test");
-addTest("../Styling/TextAlign006.xml","TextAlign006","Test tts:textAlign attribute with the center value on a span.","Styling Test");
-addTest("../Styling/TextAlign007.xml","TextAlign007","Test tts:textAlign attribute with the start value.","Styling Test");
-addTest("../Styling/TextAlign008.xml","TextAlign008","Test tts:textAlign attribute with the end value.","Styling Test");
-addTest("../Styling/TextAlign009.xml","TextAlign009","Test tts:textAlign attribute with the inherit value.","Styling Test");
+addTest("../Styling/TextAlign002.xml","TextAlign002","Test tts:textAlign attribute with the left value in a paragraph.","Styling Test");
+addTest("../Styling/TextAlign003.xml","TextAlign003","Test tts:textAlign attribute with the center value in the style element.","Styling Test");
+addTest("../Styling/TextAlign004.xml","TextAlign004","Test tts:textAlign attribute with the center value in a pargraph.","Styling Test");
+addTest("../Styling/TextAlign005.xml","TextAlign005","Test tts:textAlign attribute with the start value in the style element.","Styling Test");
+addTest("../Styling/TextAlign006.xml","TextAlign006","Test tts:textAlign attribute with the end value.","Styling Test");
addTest("../Styling/TextDecoration001.xml","TextDecoration001","Test tts:textDecoration attribute using the none value.","Styling Test");
addTest("../Styling/TextDecoration002.xml","TextDecoration002","Test tts:textDecoration attribute using the underline value in a span.","Styling Test");
addTest("../Styling/TextDecoration003.xml","TextDecoration003","Test tts:textDecoration attribute using the none value in a span.","Styling Test");
@@ -88,7 +85,7 @@
addTest("../Styling/TextOutline004.xml","TextOutline004","Test tts:textOutline attribute using values for color and outline thickness.","Styling Test");
addTest("../Styling/TextOutline005.xml","TextOutline005","Test tts:textOutline attribute using values for color, outline thickness and blur radius.","Styling Test");
addTest("../Styling/TextOutline006.xml","TextOutline006","Test tts:textOutline attribute using the inherit value.","Styling Test");
-addTest("../Styling/Visibility001.xml","Visibility001","Test tts:visibility attribute using the visible value.","Styling Test");
+addTest("../Styling/Visibility001.xml","Visibility001","Test tts:visibility attribute using the visible value in the style element.","Styling Test");
addTest("../Styling/Visibility002.xml","Visibility002","Test tts:visibility attribute using the visible value.","Styling Test");
addTest("../Styling/Visibility003.xml","Visibility003","Test tts:visibility attribute using the hidden value.","Styling Test");
addTest("../Styling/Visibility004.xml","Visibility004","Test tts:visibility attribute using the inherit value.","Styling Test");