diff options
-rw-r--r-- | htdocs/config/doctypes.cfg | 3 | ||||
-rw-r--r-- | htdocs/config/fpis.cfg | 3 | ||||
-rw-r--r-- | htdocs/config/type.cfg | 4 | ||||
-rwxr-xr-x | htdocs/dev/tests/index.html | 5 | ||||
-rw-r--r-- | htdocs/sgml-lib/REC-smil-19980615/smil10.dtd | 245 | ||||
-rw-r--r-- | htdocs/sgml-lib/smil.dcl | 188 | ||||
-rw-r--r-- | htdocs/sgml-lib/smil.soc | 5 | ||||
-rwxr-xr-x | httpd/cgi-bin/check | 15 |
8 files changed, 457 insertions, 11 deletions
diff --git a/htdocs/config/doctypes.cfg b/htdocs/config/doctypes.cfg index b602384..eb4bd08 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.5 2001-07-29 07:05:05 link Exp $ +# $Id: doctypes.cfg,v 1.6 2001-07-29 08:00:50 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"> @@ -43,4 +43,5 @@ XHTML 1.0 Frameset <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" " XHTML Basic 1.0 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd"> 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"> diff --git a/htdocs/config/fpis.cfg b/htdocs/config/fpis.cfg index 242651f..9c3c9be 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.13 2001-07-29 07:05:06 link Exp $ +# $Id: fpis.cfg,v 1.14 2001-07-29 08:00:50 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 @@ -61,4 +61,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> diff --git a/htdocs/config/type.cfg b/htdocs/config/type.cfg index aa113f6..2a5aaac 100644 --- a/htdocs/config/type.cfg +++ b/htdocs/config/type.cfg @@ -1,12 +1,12 @@ # # Mapping of Content-Type to document type. # -# $Id: type.cfg,v 1.3 2001-07-29 07:05:06 link Exp $ +# $Id: type.cfg,v 1.4 2001-07-29 08:00:50 link Exp $ text/xml xml image/svg svg image/svg+xml svg -application/smil xml +application/smil smil application/xml xml text/html html text/vnd.wap.wml xml diff --git a/htdocs/dev/tests/index.html b/htdocs/dev/tests/index.html index f57e09e..caae2f5 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.34 2001-07-29 07:05:06 link Exp $"> + content="$Id: index.html,v 1.35 2001-07-29 08:00:50 link Exp $"> </head> <body bgcolor="#FFFFFF" text="#000000" link="#0000ee" vlink="#551a8b"> @@ -49,6 +49,7 @@ <li><a href="/check?uri=http://www.w3.org/1999/09/SVG-access/computer.svg">image/svg</a> <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><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 @@ -118,7 +119,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 07:05:06 $ + $Date: 2001-07-29 08:00:50 $ </address> </body> diff --git a/htdocs/sgml-lib/REC-smil-19980615/smil10.dtd b/htdocs/sgml-lib/REC-smil-19980615/smil10.dtd new file mode 100644 index 0000000..77b3ac5 --- /dev/null +++ b/htdocs/sgml-lib/REC-smil-19980615/smil10.dtd @@ -0,0 +1,245 @@ +<!-- + + This is the XML document type definition (DTD) for SMIL 1.0. + + Date: 1998/06/15 08:56:30 + + Authors: + Jacco van Ossenbruggen <jrvosse@cwi.nl> + Sjoerd Mullender <sjoerd@cwi.nl> + +Further information about SMIL is available at: + + http://www.w3.org/AudioVideo/ + +--> + +<!-- Generally useful entities --> +<!ENTITY % id-attr "id ID #IMPLIED"> +<!ENTITY % title-attr "title CDATA #IMPLIED"> +<!ENTITY % skip-attr "skip-content (true|false) 'true'"> +<!ENTITY % desc-attr " + %title-attr; + abstract CDATA #IMPLIED + author CDATA #IMPLIED + copyright CDATA #IMPLIED +"> + +<!--=================== SMIL Document =====================================--> +<!-- + The root element SMIL contains all other elements. +--> +<!ELEMENT smil (head?,body?)> +<!ATTLIST smil + %id-attr; +> + +<!--=================== The Document Head =================================--> +<!ENTITY % layout-section "layout|switch"> + +<!ENTITY % head-element "(meta*,((%layout-section;), meta*))?"> + +<!ELEMENT head %head-element;> +<!ATTLIST head %id-attr;> + + +<!--=================== Layout Element ====================================--> +<!-- + Layout contains the region and root-layout elements defined by + smil-basic-layout or other elements defined an external layout + mechanism. +--> +<!ELEMENT layout ANY> +<!ATTLIST layout + %id-attr; + type CDATA "text/smil-basic-layout" +> + + +<!--=================== Region Element ===================================--> +<!ENTITY % viewport-attrs " + height CDATA #IMPLIED + width CDATA #IMPLIED + background-color CDATA #IMPLIED +"> + +<!ELEMENT region EMPTY> +<!ATTLIST region + %id-attr; + %title-attr; + %viewport-attrs; + left CDATA "0" + top CDATA "0" + z-index CDATA "0" + fit (hidden|fill|meet|scroll|slice) "hidden" + %skip-attr; +> + +<!--=================== Root-layout Element ================================--> +<!ELEMENT root-layout EMPTY> +<!ATTLIST root-layout + %id-attr; + %title-attr; + %viewport-attrs; + %skip-attr; +> + + +<!--=================== Meta Element=======================================--> +<!ELEMENT meta EMPTY> +<!ATTLIST meta + name NMTOKEN #REQUIRED + content CDATA #REQUIRED + %skip-attr; +> + +<!--=================== The Document Body =================================--> +<!ENTITY % media-object "audio|video|text|img|animation|textstream|ref"> +<!ENTITY % schedule "par|seq|(%media-object;)"> +<!ENTITY % inline-link "a"> +<!ENTITY % assoc-link "anchor"> +<!ENTITY % link "%inline-link;"> +<!ENTITY % container-content "(%schedule;)|switch|(%link;)"> +<!ENTITY % body-content "(%container-content;)"> + +<!ELEMENT body (%body-content;)*> +<!ATTLIST body %id-attr;> + +<!--=================== Synchronization Attributes ========================--> +<!ENTITY % sync-attributes " + begin CDATA #IMPLIED + end CDATA #IMPLIED +"> + +<!--=================== Switch Parameter Attributes =======================--> +<!ENTITY % system-attribute " + system-bitrate CDATA #IMPLIED + system-language CDATA #IMPLIED + system-required NMTOKEN #IMPLIED + system-screen-size CDATA #IMPLIED + system-screen-depth CDATA #IMPLIED + system-captions (on|off) #IMPLIED + system-overdub-or-caption (caption|overdub) #IMPLIED +"> + +<!--=================== Fill Attribute ====================================--> +<!ENTITY % fill-attribute " + fill (remove|freeze) 'remove' +"> + + +<!--=================== The Parallel Element ==============================--> +<!ENTITY % par-content "%container-content;"> +<!ELEMENT par (%par-content;)*> +<!ATTLIST par + %id-attr; + %desc-attr; + endsync CDATA "last" + dur CDATA #IMPLIED + repeat CDATA "1" + region IDREF #IMPLIED + %sync-attributes; + %system-attribute; +> + +<!--=================== The Sequential Element ============================--> +<!ENTITY % seq-content "%container-content;"> +<!ELEMENT seq (%seq-content;)*> +<!ATTLIST seq + %id-attr; + %desc-attr; + dur CDATA #IMPLIED + repeat CDATA "1" + region IDREF #IMPLIED + %sync-attributes; + %system-attribute; +> + +<!--=================== The Switch Element ================================--> +<!-- In the head, a switch may contain only layout elements, + in the body, only container elements. However, this + constraint cannot be expressed in the DTD (?), so + we allow both: +--> +<!ENTITY % switch-content "layout|(%container-content;)"> +<!ELEMENT switch (%switch-content;)*> +<!ATTLIST switch + %id-attr; + %title-attr; +> + +<!--=================== Media Object Elements =============================--> +<!-- SMIL only defines the structure. The real media data is + referenced by the src attribute of the media objects. +--> + +<!-- Furthermore, they have the following attributes as defined + in the SMIL specification: +--> +<!ENTITY % mo-attributes " + %id-attr; + %desc-attr; + region IDREF #IMPLIED + alt CDATA #IMPLIED + longdesc CDATA #IMPLIED + src CDATA #IMPLIED + type CDATA #IMPLIED + dur CDATA #IMPLIED + repeat CDATA '1' + %fill-attribute; + %sync-attributes; + %system-attribute; +"> + +<!-- + Most info is in the attributes, media objects are empty or + contain associated link elements: +--> +<!ENTITY % mo-content "(%assoc-link;)*"> +<!ENTITY % clip-attrs " + clip-begin CDATA #IMPLIED + clip-end CDATA #IMPLIED +"> + +<!ELEMENT ref %mo-content;> +<!ELEMENT audio %mo-content;> +<!ELEMENT img %mo-content;> +<!ELEMENT video %mo-content;> +<!ELEMENT text %mo-content;> +<!ELEMENT textstream %mo-content;> +<!ELEMENT animation %mo-content;> + +<!ATTLIST ref %mo-attributes; %clip-attrs;> +<!ATTLIST audio %mo-attributes; %clip-attrs;> +<!ATTLIST video %mo-attributes; %clip-attrs;> +<!ATTLIST animation %mo-attributes; %clip-attrs;> +<!ATTLIST textstream %mo-attributes; %clip-attrs;> +<!ATTLIST text %mo-attributes;> +<!ATTLIST img %mo-attributes;> + +<!--=================== Link Elements =====================================--> + +<!ENTITY % smil-link-attributes " + %id-attr; + %title-attr; + href CDATA #REQUIRED + show (replace|new|pause) 'replace' +"> + + +<!--=================== Inline Link Element ===============================--> +<!ELEMENT a (%schedule;|switch)*> +<!ATTLIST a + %smil-link-attributes; +> + + +<!--=================== Associated Link Element ===========================--> +<!ELEMENT anchor EMPTY> +<!ATTLIST anchor + %skip-attr; + %smil-link-attributes; + %sync-attributes; + coords CDATA #IMPLIED +> + diff --git a/htdocs/sgml-lib/smil.dcl b/htdocs/sgml-lib/smil.dcl new file mode 100644 index 0000000..55438d7 --- /dev/null +++ b/htdocs/sgml-lib/smil.dcl @@ -0,0 +1,188 @@ +<!SGML "ISO 8879:1986 (WWW)" + + -- SGML Declaration for XML 1.0 -- + + -- from: + Final text of revised Web SGML Adaptations Annex (TC2) to ISO 8879:1986 + ISO/IEC JTC1/SC34 N0029: 1998-12-06 + Annex L.2 (informative): SGML Declaration for XML + + changes made to accommodate validation are noted with 'VALID:' + -- + + CHARSET + BASESET + "ISO Registration Number 177//CHARSET + ISO/IEC 10646-1:1993 UCS-4 with implementation + level 3//ESC 2/5 2/15 4/6" + DESCSET + 0 9 UNUSED + 9 2 9 + 11 2 UNUSED + 13 1 13 + 14 18 UNUSED + 32 95 32 + 127 1 UNUSED + 128 32 UNUSED + 160 55136 160 + 55296 2048 UNUSED -- surrogates -- + 57344 8190 57344 + 65534 2 UNUSED -- FFFE and FFFF -- + 65536 1048576 65536 + + CAPACITY NONE -- Capacities are not restricted in XML -- + + SCOPE DOCUMENT + + SYNTAX + SHUNCHAR NONE + BASESET "ISO Registration Number 177//CHARSET + ISO/IEC 10646-1:1993 UCS-4 with implementation + level 3//ESC 2/5 2/15 4/6" + DESCSET + 0 1114112 0 + FUNCTION + RE 13 + RS 10 + SPACE 32 + TAB SEPCHAR 9 + NAMING + LCNMSTRT "" + UCNMSTRT "" + NAMESTRT + 58 95 192-214 216-246 248-305 308-318 321-328 + 330-382 384-451 461-496 500-501 506-535 592-680 + 699-705 902 904-906 908 910-929 931-974 976-982 + 986 988 990 992 994-1011 1025-1036 1038-1103 + 1105-1116 1118-1153 1168-1220 1223-1224 + 1227-1228 1232-1259 1262-1269 1272-1273 + 1329-1366 1369 1377-1414 1488-1514 1520-1522 + 1569-1594 1601-1610 1649-1719 1722-1726 + 1728-1742 1744-1747 1749 1765-1766 2309-2361 + 2365 2392-2401 2437-2444 2447-2448 2451-2472 + 2474-2480 2482 2486-2489 2524-2525 2527-2529 + 2544-2545 2565-2570 2575-2576 2579-2600 + 2602-2608 2610-2611 2613-2614 2616-2617 + 2649-2652 2654 2674-2676 2693-2699 2701 + 2703-2705 2707-2728 2730-2736 2738-2739 + 2741-2745 2749 2784 2821-2828 2831-2832 + 2835-2856 2858-2864 2866-2867 2870-2873 2877 + 2908-2909 2911-2913 2949-2954 2958-2960 + 2962-2965 2969-2970 2972 2974-2975 2979-2980 + 2984-2986 2990-2997 2999-3001 3077-3084 + 3086-3088 3090-3112 3114-3123 3125-3129 + 3168-3169 3205-3212 3214-3216 3218-3240 + 3242-3251 3253-3257 3294 3296-3297 3333-3340 + 3342-3344 3346-3368 3370-3385 3424-3425 + 3585-3630 3632 3634-3635 3648-3653 3713-3714 + 3716 3719-3720 3722 3725 3732-3735 3737-3743 + 3745-3747 3749 3751 3754-3755 3757-3758 3760 + 3762-3763 3773 3776-3780 3904-3911 3913-3945 + 4256-4293 4304-4342 4352 4354-4355 4357-4359 + 4361 4363-4364 4366-4370 4412 4414 4416 4428 + 4430 4432 4436-4437 4441 4447-4449 4451 4453 + 4455 4457 4461-4462 4466-4467 4469 4510 4520 + 4523 4526-4527 4535-4536 4538 4540-4546 4587 + 4592 4601 7680-7835 7840-7929 7936-7957 + 7960-7965 7968-8005 8008-8013 8016-8023 8025 + 8027 8029 8031-8061 8064-8116 8118-8124 8126 + 8130-8132 8134-8140 8144-8147 8150-8155 + 8160-8172 8178-8180 8182-8188 8486 8490-8491 + 8494 8576-8578 12295 12321-12329 12353-12436 + 12449-12538 12549-12588 19968-40869 44032-55203 + + LCNMCHAR "" + UCNMCHAR "" + NAMECHAR + 45-46 183 720-721 768-837 864-865 903 1155-1158 + 1425-1441 1443-1465 1467-1469 1471 1473-1474 + 1476 1600 1611-1618 1632-1641 1648 1750-1764 + 1767-1768 1770-1773 1776-1785 2305-2307 2364 + 2366-2381 2385-2388 2402-2403 2406-2415 + 2433-2435 2492 2494-2500 2503-2504 2507-2509 + 2519 2530-2531 2534-2543 2562 2620 2622-2626 + 2631-2632 2635-2637 2662-2673 2689-2691 2748 + 2750-2757 2759-2761 2763-2765 2790-2799 + 2817-2819 2876 2878-2883 2887-2888 2891-2893 + 2902-2903 2918-2927 2946-2947 3006-3010 + 3014-3016 3018-3021 3031 3047-3055 3073-3075 + 3134-3140 3142-3144 3146-3149 3157-3158 + 3174-3183 3202-3203 3262-3268 3270-3272 + 3274-3277 3285-3286 3302-3311 3330-3331 + 3390-3395 3398-3400 3402-3405 3415 3430-3439 + 3633 3636-3642 3654-3662 3664-3673 3761 + 3764-3769 3771-3772 3782 3784-3789 3792-3801 + 3864-3865 3872-3881 3893 3895 3897 3902-3903 + 3953-3972 3974-3979 3984-3989 3991 3993-4013 + 4017-4023 4025 8400-8412 8417 12293 12330-12335 + 12337-12341 12441-12442 12445-12446 12540-12542 + + NAMECASE + GENERAL NO + ENTITY NO + DELIM + GENERAL SGMLREF + HCRO "&#x" + -- Ampersand followed by "#x" (without quotes) -- + NESTC "/" + NET ">" + PIC "?>" + SHORTREF NONE + + NAMES + SGMLREF + + QUANTITY + NONE -- Quantities are not restricted in XML -- + + ENTITIES + "amp" 38 + "lt" 60 + "gt" 62 + "quot" 34 + "apos" 39 + + FEATURES + MINIMIZE + DATATAG NO + OMITTAG NO + RANK NO + SHORTTAG + STARTTAG + EMPTY NO + UNCLOSED NO + NETENABL IMMEDNET + ENDTAG + EMPTY NO + UNCLOSED NO + ATTRIB + DEFAULT YES + OMITNAME NO + VALUE NO + EMPTYNRM YES + IMPLYDEF + ATTLIST NO -- VALID: was YES -- + DOCTYPE NO + ELEMENT NO -- VALID: was YES -- + ENTITY NO + NOTATION NO -- VALID: was YES -- + LINK + SIMPLE NO + IMPLICIT NO + EXPLICIT NO + OTHER + CONCUR NO + SUBDOC NO + FORMAL NO + URN NO + KEEPRSRE YES + VALIDITY TYPE -- VALID: was NOASSERT -- + ENTITIES + REF ANY + INTEGRAL YES + + APPINFO NONE + + SEEALSO "ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN" +> + diff --git a/htdocs/sgml-lib/smil.soc b/htdocs/sgml-lib/smil.soc new file mode 100644 index 0000000..840f7aa --- /dev/null +++ b/htdocs/sgml-lib/smil.soc @@ -0,0 +1,5 @@ +SGMLDECL "smil.dcl" +OVERRIDE YES + +PUBLIC "-//W3C//DTD SMIL 1.0//EN" REC-smil-19980615/smil10.dtd + diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index 5aef3a2..eb6e740 100755 --- a/httpd/cgi-bin/check +++ b/httpd/cgi-bin/check @@ -9,7 +9,7 @@ # This source code is available under the license at: # http://www.w3.org/Consortium/Legal/copyright-software # -# $Id: check,v 1.167 2001-07-29 07:15:08 link Exp $ +# $Id: check,v 1.168 2001-07-29 08:00:51 link Exp $ # # We need Perl 5.004. @@ -80,9 +80,9 @@ my $element_ref = 'http://www.htmlhelp.com/reference/html40/'; # # Strings -$VERSION = q$Revision: 1.167 $; +$VERSION = q$Revision: 1.168 $; $VERSION =~ s/Revision: ([\d\.]+) /$1/; -$DATE = q$Date: 2001-07-29 07:15:08 $; +$DATE = q$Date: 2001-07-29 08:00:51 $; $MAINTAINER = 'gerald@w3.org'; $NOTICE = ''; # "<p><strong>Note: This service will be ...</strong>"; @@ -496,6 +496,11 @@ if ($File->{Type} eq 'xhtml') { $ENV{SP_CHARSET_FIXED} = 'YES'; $ENV{SP_ENCODING} = 'UTF-8'; $xmlflags = '-wxml'; +} elsif ($File->{Type} eq 'smil') { + $catalog = $sgmlstuff . '/smil.soc'; + $ENV{SP_CHARSET_FIXED} = 'YES'; + $ENV{SP_ENCODING} = 'UTF-8'; + $xmlflags = '-wxml'; } elsif ($File->{Type} eq 'mathml') { $catalog = $sgmlstuff . '/mathml.soc'; $ENV{SP_CHARSET_FIXED} = 'NO'; @@ -549,7 +554,7 @@ close ESIS or warn "close($temp.esis) returned: $!"; my $fpi; my $version = 'unknown'; -if ($File->{Type} eq 'xhtml' or $File->{Type} eq 'mathml' or $File->{Type} eq 'svg') { +if ($File->{Type} eq 'xhtml' or $File->{Type} eq 'mathml' or $File->{Type} eq 'svg' or $File->{Type} eq 'smil') { $fpi = $File->{DOCTYPE}; } elsif ($File->{Type} eq 'xml') { $fpi = 'XML'; @@ -614,7 +619,7 @@ if ($File->{Type} eq 'xml' or $File->{Type} eq 'xhtml') { &print_table; &print_warnings; -if ($File->{Type} eq 'xml' or $File->{Type} eq 'xhtml' or $File->{Type} eq 'mathml') { +if ($File->{Type} eq 'xml' or $File->{Type} eq 'xhtml' or $File->{Type} eq 'mathml' or $File->{Type} eq 'svg' or $File->{Type} eq 'smil') { my $xmlvalid = ($File->{DOCTYPE} ? ' and validity' : ''); print <<"EOHD"; <p> |