--- a/testsuite/Animation/Animation005.xml Wed Apr 15 18:38:49 2009 +0000
+++ b/testsuite/Animation/Animation005.xml Wed Apr 15 18:39:39 2009 +0000
@@ -14,7 +14,7 @@
<body>
<div timeContainer="seq" dur="20s">
<p dur="10s" tts:fontSize="20px 20px" >
- <set tts:fontSize="40px 20px" begin="5s" />This font height of this sentence should go from 20px to 40px at 5s</p>
+ <set tts:fontSize="20px 40px" begin="5s" />This font height of this sentence should go from 20px to 40px at 5s</p>
</div>
</body>
</tt>
\ No newline at end of file
--- a/testsuite/Animation/Animation012.xml Wed Apr 15 18:38:49 2009 +0000
+++ b/testsuite/Animation/Animation012.xml Wed Apr 15 18:39:39 2009 +0000
@@ -4,19 +4,21 @@
xmlns:tts="http://www.w3.org/2006/10/ttaf1#styling"
xmlns:ttm="http://www.w3.org/2006/10/ttaf1#metadata"
xmlns:ttp="http://www.w3.org/2006/10/ttaf1#parameter">
- <head>
- <metadata>
- <ttm:title>Animation Test - Animate 012</ttm:title>
- <ttm:desc>Set displayAlign</ttm:desc>
- <ttm:copyright>Copyright (C) 2008 W3C (MIT, ERCIM, Keio).</ttm:copyright>
- </metadata>
- </head>
- <body>
- <div timeContainer="seq" dur="20s">
- <p dur="10s" tts:displayAlign="left">
- <set tts:displayAlign="right" begin="5s" />This sentence should move right at 5s for 5 seconds</p>
- <p dur="10s" tts:displayAlign="right">
- <set tts:displayAlign="left" begin="6s" />This sentence should move left at 6s for 4 seconds</p>
- </div>
- </body>
- </tt>
\ No newline at end of file
+ <head>
+ <metadata>
+ <ttm:title>Animation Test - Animate 001</ttm:title>
+ <ttm:desc>Set textAlign</ttm:desc>
+ <ttm:copyright>Copyright (C) 2008 W3C (MIT, ERCIM, Keio).</ttm:copyright>
+ </metadata>
+ </head>
+ <body>
+ <div timeContainer="seq" dur="20s">
+ <p dur="10s" tts:textAlign="left">
+ <set tts:textAlign="right" begin="5s" />This sentence should move right at 5s for 5 seconds
+ </p>
+ <p dur="10s" tts:textAlign="right">
+ <set tts:textAlign="left" begin="6s" />This sentence should move left at 6s for 4 seconds
+ </p>
+ </div>
+ </body>
+</tt>
\ No newline at end of file
--- a/testsuite/Animation/Animation016.xml Wed Apr 15 18:38:49 2009 +0000
+++ b/testsuite/Animation/Animation016.xml Wed Apr 15 18:39:39 2009 +0000
@@ -13,8 +13,8 @@
</head>
<body>
<div timeContainer="seq" dur="10s">
- <p dur="10s" tts:wrapOption="visible">
- <set tts:wrapOption ="hidden" begin="3s" dur="5s"/>This text should start to wrap from 3s to 8s it is a very long piece of text in order to ensure that it does in fact hit the region edges and thus require some wrapping action. Wrapping is not required to support hyphenation, so this text should wrap at whole word boundaries.</p>
+ <p dur="10s" tts:wrapOption="noWrap">
+ <set tts:wrapOption ="wrap" begin="3s" dur="5s"/>This text should start to wrap from 3s to 8s it is a very long piece of text in order to ensure that it does in fact hit the region edges and thus require some wrapping action. Wrapping is not required to support hyphenation, so this text should wrap at whole word boundaries.</p>
</div>
</body>
</tt>
\ No newline at end of file
--- a/testsuite/Animation/Animation017.xml Wed Apr 15 18:38:49 2009 +0000
+++ b/testsuite/Animation/Animation017.xml Wed Apr 15 18:39:39 2009 +0000
@@ -4,33 +4,33 @@
xmlns:tts="http://www.w3.org/2006/10/ttaf1#styling"
xmlns:ttm="http://www.w3.org/2006/10/ttaf1#metadata"
xmlns:ttp="http://www.w3.org/2006/10/ttaf1#parameter">
- <head>
- <metadata>
- <ttm:title>Animation Test - Animate 017</ttm:title>
- <ttm:desc>Set zIndex </ttm:desc>
- <ttm:copyright>Copyright (C) 2008 W3C (MIT, ERCIM, Keio).</ttm:copyright>
- </metadata>
- <styling>
- <style xml:id="s1"
- tts:origin="100px 180px"
- tts:extent="400px 100px"
- tts:padding="5px"
- tts:backgroundColor="red"
- tts:color="white"
- tts:textAlign="end"
+ <head>
+ <metadata>
+ <ttm:title>Animation Test - Animate 017</ttm:title>
+ <ttm:desc>Set zIndex </ttm:desc>
+ <ttm:copyright>Copyright (C) 2008 W3C (MIT, ERCIM, Keio).</ttm:copyright>
+ </metadata>
+ <styling>
+ <style xml:id="s1"
+ tts:origin="10px 18px"
+ tts:extent="350px 100px"
+ tts:padding="5px"
+ tts:backgroundColor="red"
+ tts:color="white"
+ tts:textAlign="center"
/>
- </styling>
- <layout>
- <region dur="10s" xml:id="r1" style="s1" tts:zIndex="1"/>
- <region dur="10s" xml:id="r2" style="s1" tts:zIndex="0">
- <set begin="5s" end="10s" tts:zIndex="2" />
- </region>
- </layout>
- </head>
- <body region="r1 r2">
- <div region="r1 r2" timeContainer="par" dur="10s">
- <p region="r1" dur="10s" tts:wrapOption="visible">This text should appear from 0 to 5s</p>
- <p region="r2" dur="10s" tts:wrapOption="visible">This text should appear from 5s to 10s</p>
- </div>
- </body>
- </tt>
\ No newline at end of file
+ </styling>
+ <layout>
+ <region dur="10s" xml:id="r1" style="s1" tts:zIndex="1"/>
+ <region dur="10s" xml:id="r2" style="s1" tts:zIndex="0">
+ <set begin="5s" end="10s" tts:zIndex="2" />
+ </region>
+ </layout>
+ </head>
+ <body region="r1 r2">
+ <div region="r1 r2" timeContainer="par" dur="10s">
+ <p region="r1" dur="10s" tts:wrapOption="visible">This text should appear from 0 to 5s</p>
+ <p region="r2" dur="10s" tts:wrapOption="visible">This text should appear from 5s to 10s</p>
+ </div>
+ </body>
+</tt>
\ No newline at end of file
--- a/testsuite/Animation/BasicTiming005.xml Wed Apr 15 18:38:49 2009 +0000
+++ b/testsuite/Animation/BasicTiming005.xml Wed Apr 15 18:39:39 2009 +0000
@@ -10,24 +10,36 @@
<ttm:desc>Testing multiple set expressions in par context</ttm:desc>
<ttm:copyright>Copyright (C) 2008 W3C (MIT, ERCIM, Keio).</ttm:copyright>
</metadata>
+ <region xml:id="r1">
+ <style tts:origin="0px 0px"/>
+ <style tts:opacity="0" />
+ <style tts:extent="240px 200px"/>
+ <style tts:backgroundColor="black"/>
+ <style tts:color="white"/>
+ <style tts:textAlign="start"/>
+ <style tts:fontSize="12px"/>
+ <style tts:zIndex="1"/>
+ <set begin="1s" dur="00:00:01:00" tts:opacity="0.05" />
+ <set begin="2s" dur="00:00:01:00" tts:opacity="0.1" />
+ <set begin="3s" dur="00:00:01:00" tts:opacity="0.2" />
+ <set begin="4s" dur="00:00:01:00" tts:opacity="0.3" />
+ <set begin="5s" dur="00:00:01:00" tts:opacity="0.4" />
+ <set begin="6s" dur="00:00:01:00" tts:opacity="0.5" />
+ <set begin="7s" dur="00:00:01:00" tts:opacity="0.6" />
+ <set begin="8s" dur="00:00:01:00" tts:opacity="0.7" />
+ <set begin="9s" dur="00:00:01:00" tts:opacity="0.8" />
+ <set begin="10s" dur="00:00:01:00" tts:opacity="0.9" />
+ <set begin="11s" dur="00:00:01:00" tts:opacity="1" />
+ <set begin="12s" dur="00:00:01:00" tts:opacity="0.75" />
+ <set begin="13s" dur="00:00:01:00" tts:opacity="0.5" />
+ <set begin="14s" dur="00:00:01:00" tts:opacity="0.25" />
+ </region>
</head>
- <body timeContainer="par">
+ <body timeContainer="par">
<div timeContainer="seq">
- <p tts:opacity="0" begin="0s" dur="00:00:15:00">
- <set begin="1s" dur="00:00:01:00" tts:opacity="0.05" />
- <set begin="2s" dur="00:00:01:00" tts:opacity="0.1" />
- <set begin="3s" dur="00:00:01:00" tts:opacity="0.2" />
- <set begin="4s" dur="00:00:01:00" tts:opacity="0.3" />
- <set begin="5s" dur="00:00:01:00" tts:opacity="0.4" />
- <set begin="6s" dur="00:00:01:00" tts:opacity="0.5" />
- <set begin="7s" dur="00:00:01:00" tts:opacity="0.6" />
- <set begin="8s" dur="00:00:01:00" tts:opacity="0.7" />
- <set begin="9s" dur="00:00:01:00" tts:opacity="0.8" />
- <set begin="10s" dur="00:00:01:00" tts:opacity="0.9" />
- <set begin="11s" dur="00:00:01:00" tts:opacity="1" />
- <set begin="12s" dur="00:00:01:00" tts:opacity="0.75" />
- <set begin="13s" dur="00:00:01:00" tts:opacity="0.5" />
- <set begin="14s" dur="00:00:01:00" tts:opacity="0.25" />This text must start to appear at 1 seconds<br/>and fade in to 10 seconds then fade out to 15 seconds</p>
+ <p region="r1" begin="0s" dur="00:00:15:00">
+ This text must start to appear at 1 seconds<br/>
+ and fade in to 10 seconds then fade out to 15 seconds</p>
</div>
</body>
</tt>
\ No newline at end of file
--- a/testsuite/Content/Br001.xml Wed Apr 15 18:38:49 2009 +0000
+++ b/testsuite/Content/Br001.xml Wed Apr 15 18:39:39 2009 +0000
@@ -12,7 +12,7 @@
</head>
<body>
<div>
- <p begin="0s" end="10s">This text must be appear<br/>on two lines.</p>
+ <p begin="0s" end="10s">This text must be on the first line.<br/>This text on a second line.</p>
</div>
</body>
</tt>
--- a/testsuite/Content/Paragraph002.xml Wed Apr 15 18:38:49 2009 +0000
+++ b/testsuite/Content/Paragraph002.xml Wed Apr 15 18:39:39 2009 +0000
@@ -10,7 +10,7 @@
<ttm:copyright>Copyright (C) 2008 W3C (MIT, ERCIM, Keio).</ttm:copyright>
</metadata>
</head>
- <body>
+ <body timeContainer="seq">
<div>
<p>This text must not be visible.</p>
</div>
--- a/testsuite/Timing/BasicTiming010.xml Wed Apr 15 18:38:49 2009 +0000
+++ b/testsuite/Timing/BasicTiming010.xml Wed Apr 15 18:39:39 2009 +0000
@@ -14,7 +14,7 @@
<body timeContainer="par">
<div timeContainer="par">
<p begin="10000ms" dur="00:00:30:00">
- <span end="0.001h">This text must appear at 10 seconds and disappear at 14.4 seconds</span>
+ <span end="0.004h">This text must appear at 10 seconds and disappear at 24.4 seconds</span>
<br/>
<span begin="0.25m" dur="300f">This text must appear at 25 seconds and disappear at 35 seconds</span>
</p>
--- a/testsuite/Timing/BasicTiming012.xml Wed Apr 15 18:38:49 2009 +0000
+++ b/testsuite/Timing/BasicTiming012.xml Wed Apr 15 18:39:39 2009 +0000
@@ -11,16 +11,14 @@
</metadata>
<styling>
<style xml:id="s2"
- tts:displayAlign="after"
+ tts:textAlign="end"
tts:backgroundColor="black"
tts:color="white"
- tts:origin="0px 4em"
+ tts:origin="10px 4em"
tts:extent="20em 3em"
tts:wrapOption="noWrap"
- tts:overflow="scroll"
+ tts:overflow="hidden"
/>
- <style xml:id="p20" tts:padding="20em 0em 0em 0em" />
- <style xml:id="p4" tts:padding="4em 0em 0em 0em" />
</styling>
<layout>
<region xml:id="crawl" style="s2" />
@@ -28,8 +26,8 @@
</head>
<body timeContainer="par">
<div region="crawl" timeContainer="par">
- <p timeContainer="par">
- <span begin="0.1875s" style="p20">This </span>
+ <p timeContainer="par" >
+ <span begin="0.1875s" >This </span>
<span begin="0.375s" >text </span>
<span begin="0.5625s" >should </span>
<span begin="0.75s" >appear </span>
@@ -41,10 +39,12 @@
<span begin="1.875s" >right </span>
<span begin="2.0625s" >to </span>
<span begin="2.25s" >left </span>
- <span begin="2.4375s" style="p4"/>
- <span begin="2.625s" style="p4"/>
- <span begin="2.8125s" style="p4"/>
- <span begin="3s" style="p4"/>
+ <span begin="2.4375s" xml:space='preserve'> </span>
+ <span begin="2.625s" xml:space='preserve'> </span>
+ <span begin="2.8125s" xml:space='preserve'> </span>
+ <span begin="3s" xml:space='preserve'> </span>
+ <span begin="3.1875s" xml:space='preserve'> </span>
+ <span begin="3.375s" xml:space='preserve'> </span>
</p>
</div>
</body>
--- a/testsuite/filelist.xml Wed Apr 15 18:38:49 2009 +0000
+++ b/testsuite/filelist.xml Wed Apr 15 18:39:39 2009 +0000
@@ -221,15 +221,12 @@
<file>Animation/Animation006.xml</file>
<file>Animation/Animation007.xml</file>
<file>Animation/Animation008.xml</file>
-<file>Animation/Animation009.xml</file>
-<file>Animation/Animation010.xml</file>
<file>Animation/Animation012.xml</file>
<file>Animation/Animation013.xml</file>
<file>Animation/Animation014.xml</file>
<file>Animation/Animation015.xml</file>
<file>Animation/Animation016.xml</file>
<file>Animation/Animation017.xml</file>
-<file>Animation/Animation101.xml</file>
<file>Animation/BasicTiming004.xml</file>
<file>Animation/BasicTiming005.xml</file>
<file>Animation/BasicTiming009.xml</file>