summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--htdocs/config/doctypes.cfg3
-rw-r--r--htdocs/config/fpis.cfg3
-rwxr-xr-xhtdocs/dev/tests/index.html5
-rw-r--r--htdocs/dev/tests/smil20-profile-doctype.smi24
-rw-r--r--htdocs/sgml-lib/smil.soc30
5 files changed, 60 insertions, 5 deletions
diff --git a/htdocs/config/doctypes.cfg b/htdocs/config/doctypes.cfg
index eb4bd08..c8c1f43 100644
--- a/htdocs/config/doctypes.cfg
+++ b/htdocs/config/doctypes.cfg
@@ -1,7 +1,7 @@
#
# Mapping of HTML Version "names" to DOCTYPEs. Used for DOCTYPE overide.
#
-# $Id: doctypes.cfg,v 1.6 2001-07-29 08:00:50 link Exp $
+# $Id: doctypes.cfg,v 1.7 2001-07-29 09:25:27 link Exp $
HTML 0.0 <!DOCTYPE html PUBLIC "-//IETF//DTD HTML Level 0//EN//2.0">
Strict HTML 0.0 <!DOCTYPE html PUBLIC "-//IETF//DTD HTML Strict Level 0//EN//2.0">
@@ -44,4 +44,5 @@ XHTML Basic 1.0 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http:
XHTML 1.1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
SVG 1.0 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/PR-SVG-20010719/DTD/svg10.dtd">
SMIL 1.0 <!DOCTYPE smil PUBLIC "-//W3C//DTD SMIL 1.0//EN" "http://www.w3.org/TR/REC-smil/SMIL10.dtd">
+SMIL 2.0 <!DOCTYPE smil PUBLIC "-//W3C//DTD SMIL 2.0//EN" "http://www.w3.org/2001/SMIL20/PR/SMIL20.dtd">
diff --git a/htdocs/config/fpis.cfg b/htdocs/config/fpis.cfg
index 9c3c9be..83f0b53 100644
--- a/htdocs/config/fpis.cfg
+++ b/htdocs/config/fpis.cfg
@@ -1,7 +1,7 @@
#
# Mapping of FPIs to plain text version strings.
#
-# $Id: fpis.cfg,v 1.14 2001-07-29 08:00:50 link Exp $
+# $Id: fpis.cfg,v 1.15 2001-07-29 09:25:27 link Exp $
-//IETF//DTD HTML Level 0//EN//2.0 HTML 0.0
-//IETF//DTD HTML Strict Level 0//EN//2.0 Strict HTML 0.0
@@ -62,4 +62,5 @@ ISO/IEC 15445:2000//DTD HTML//EN <a href="http://purl.org/NET/ISO+IEC.15445/1544
-//W3C//DTD SVG 20010719//EN <a href="http://www.w3.org/TR/2001/PR-SVG-20010719/">SVG 1.0 PR 20010719</a>
-//W3C//DTD SMIL 1.0//EN <a href="http://www.w3.org/TR/1998/REC-smil-19980615/">SMIL 1.0</a>
+-//W3C//DTD SMIL 2.0//EN <a href="http://www.w3.org/TR/2001/PR-smil20-20010605/">SMIL 2.0</a>
diff --git a/htdocs/dev/tests/index.html b/htdocs/dev/tests/index.html
index caae2f5..082be44 100755
--- a/htdocs/dev/tests/index.html
+++ b/htdocs/dev/tests/index.html
@@ -5,7 +5,7 @@
<title>W3C HTML Validation Service: Tests</title>
<link rev="made" href="mailto:gerald@w3.org">
<meta name="revision"
- content="$Id: index.html,v 1.35 2001-07-29 08:00:50 link Exp $">
+ content="$Id: index.html,v 1.36 2001-07-29 09:25:27 link Exp $">
</head>
<body bgcolor="#FFFFFF" text="#000000" link="#0000ee" vlink="#551a8b">
@@ -50,6 +50,7 @@
<li><a href="/check?uri=http://www.w3.org/TR/2001/PR-SVG-20010719/images/struct/StandAlone01.svg">SVG 1.0 from 20010719 PR</a>
<li>@@ application/smil
<li>SMIL 1.0 <a href="/check?uri=http://localhost/dev/tests/smil10-minimal.smi">Minimal Document</a> w/DOCTYPE.
+<li>SMIL 2.0 <a href="/check?uri=http://localhost/dev/tests/smil20-profile-doctype.smi">Testcase (wrong Namespace?)</a> w/DOCTYPE.
<li><a name="xml">more XML test cases</a>:
<ul>
<li><a href="/check?uri=http://impressive.net/people/gerald/2000/10/18/test-staroffice-doc.xml;ss">XML output from OpenOffice 5.2</a> ("Build/Tag number OpenOffice605"), many namespaces
@@ -119,7 +120,7 @@ stress test (wrong cases)</a>, <a href='http://www.w3.org/2001/06/utf-8-wrong/'>
src="http://validator.w3.org/images/vh40.gif" height=31 width=88
align=right border=0 alt="Valid W3C HTML 4.0!"></a>
<a href="/feedback.html">Gerald Oskoboiny</A><br>
- $Date: 2001-07-29 08:00:50 $
+ $Date: 2001-07-29 09:25:27 $
</address>
</body>
diff --git a/htdocs/dev/tests/smil20-profile-doctype.smi b/htdocs/dev/tests/smil20-profile-doctype.smi
new file mode 100644
index 0000000..f3a7ee0
--- /dev/null
+++ b/htdocs/dev/tests/smil20-profile-doctype.smi
@@ -0,0 +1,24 @@
+<!DOCTYPE smil PUBLIC "-//W3C//DTD SMIL 2.0//EN"
+ "http://www.w3.org/2001/SMIL20/WD/SMIL20.dtd">
+
+<!--
+ Copyright: Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
+ See http://www.w3.org/Consortium/Legal/.
+ Author: Aaron Cohen (Intel)
+ Version: April 24, 2001
+ Module: SMIL 2.0 Language Profile
+ Feature: DOCTYPE and SMIL 2.0 namespace validation
+ File Name: smil20-profile-doctype.smil
+ Media Components: 1 image
+ Expected Behavior: The file has the SMIL 2.0 DOCTYPE declaration,
+ and an unrecognized default namespace attribute on the
+ smil element. This should result in the user agent issuing
+ an error.
+-->
+
+<smil xmlns="http://www.example.org/smil/foo">
+ <body>
+ <img id="smile" end="activateEvent"src="../images/smile.jpg"/>
+ </body>
+</smil>
+
diff --git a/htdocs/sgml-lib/smil.soc b/htdocs/sgml-lib/smil.soc
index 840f7aa..15588a3 100644
--- a/htdocs/sgml-lib/smil.soc
+++ b/htdocs/sgml-lib/smil.soc
@@ -1,5 +1,33 @@
-SGMLDECL "smil.dcl"
+-- SGML Open Catalog file for SMIL 1.0/2.0
+
+ This is SMIL 1.0/2.0.
+ Copyright 2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
+--
+
OVERRIDE YES
+SGMLDECL "smil.dcl"
+-- DTD drivers --
PUBLIC "-//W3C//DTD SMIL 1.0//EN" REC-smil-19980615/smil10.dtd
+PUBLIC "-//W3C//DTD SMIL 2.0//EN" PR-smil20-20010605/SMIL20.dtd
+PUBLIC "-//W3C//DTD SMIL 2.0 Basic//EN" PR-smil20-20010605/SMIL20Basic.dtd
+
+-- Framework utilities ---
+PUBLIC "-//W3C//ENTITIES SMIL 2.0 Modular Framework 1.0//EN" PR-smil20-20010605/smil-framework-1.mod
+PUBLIC "-//W3C//ENTITIES SMIL 2.0 Datatypes 1.0//EN" PR-smil20-20010605/smil-datatypes-1.mod
+PUBLIC "-//W3C//ENTITIES SMIL 2.0 Qualified Names 1.0//EN" PR-smil20-20010605/smil-qname-1.mod
+PUBLIC "-//W3C//ENTITIES SMIL 2.0 Common Attributes 1.0//EN" PR-smil20-20010605/smil-attribs-1.mod
+PUBLIC "-//W3C//ENTITIES SMIL 2.0 Document Model 1.0//EN" PR-smil20-20010605/smil-model-1.mod
+
+-- SMIL 2.0 elements from section modules ---
+PUBLIC "-//W3C//ELEMENTS SMIL 2.0 Document Structure//EN" PR-smil20-20010605/SMIL-struct.mod
+PUBLIC "-//W3C//ELEMENTS SMIL 2.0 Animation//EN" PR-smil20-20010605/SMIL-anim.mod
+PUBLIC "-//W3C//ELEMENTS SMIL 2.0 Content Control//EN" PR-smil20-20010605/SMIL-control.mod
+PUBLIC "-//W3C//ELEMENTS SMIL 2.0 Document Metainformation//EN" PR-smil20-20010605/SMIL-metainformation.mod
+PUBLIC "-//W3C//ELEMENTS SMIL 2.0 Layout//EN" PR-smil20-20010605/SMIL-layout.mod
+PUBLIC "-//W3C//ELEMENTS SMIL 2.0 Linking//EN" PR-smil20-20010605/SMIL-link.mod
+PUBLIC "-//W3C//ELEMENTS SMIL 2.0 Media Objects//EN" PR-smil20-20010605/SMIL-media.mod
+PUBLIC "-//W3C//ELEMENTS SMIL 2.0 Timing//EN" PR-smil20-20010605/SMIL-timing.mod
+PUBLIC "-//W3C//ELEMENTS SMIL 2.0 Transition//EN" PR-smil20-20010605/SMIL-transition.mod
+PUBLIC "-//W3C//ELEMENTS SMIL 2.0 Integration//EN" PR-smil20-20010605/SMIL-integrate.mod