- From: Ville Skytta via cvs-syncmail <cvsmail@w3.org>
- Date: Sun, 13 Sep 2009 20:03:08 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/validator/htdocs/sgml-lib
In directory hutz:/tmp/cvs-serv7499
Modified Files:
sgml.soc xml.soc
Log Message:
Reformatting, whitespace, NFC.
Index: sgml.soc
===================================================================
RCS file: /sources/public/validator/htdocs/sgml-lib/sgml.soc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- sgml.soc 6 Dec 2007 02:44:45 -0000 1.19
+++ sgml.soc 13 Sep 2009 20:03:05 -0000 1.20
@@ -1,65 +1,126 @@
- -- SGML catalog for the W3C Markup Validation Service --
- -- $Id$ --
+-- SGML catalog for the W3C Markup Validation Service --
+-- $Id$ --
+
+-- prefer public identifiers to system identifiers --
+
+OVERRIDE YES
-OVERRIDE YES -- prefer public identifiers to system identifiers --
SGMLDECL sgml.dcl
- -- ISO latin 1 entity set for HTML --
-PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN//HTML" IETF/ISOlat1.ent
-PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN" IETF/ISOlat1.ent
- -- HTML 2 --
- -- Ways to refer to Level 2: most general to most specific --
-PUBLIC "HTML" IETF/HTML-2_0.dtd
-PUBLIC "-//IETF//DTD HTML//EN" IETF/HTML-2_0.dtd
-PUBLIC "-//IETF//DTD HTML//EN//2.0" IETF/HTML-2_0.dtd
-PUBLIC "-//IETF//DTD HTML 2.0//EN" IETF/HTML-2_0.dtd
-PUBLIC "-//IETF//DTD HTML Level 2//EN" IETF/HTML-2_0.dtd
-PUBLIC "-//IETF//DTD HTML Level 2//EN//2.0" IETF/HTML-2_0.dtd
-PUBLIC "-//IETF//DTD HTML 2.0 Level 2//EN" IETF/HTML-2_0.dtd
- -- Ways to refer to Level 1: most general to most specific --
-PUBLIC "-//IETF//DTD HTML Level 1//EN" IETF/HTML-2_0-Level_1.dtd
-PUBLIC "-//IETF//DTD HTML 2.0 Level 1//EN" IETF/HTML-2_0-Level_1.dtd
- -- Ways to refer to Strict Level 2: most general to most specific --
-PUBLIC "-//IETF//DTD HTML Strict//EN" IETF/HTML-2_0-Strict.dtd
-PUBLIC "-//IETF//DTD HTML 2.0 Strict//EN" IETF/HTML-2_0-Strict.dtd
-PUBLIC "-//IETF//DTD HTML Strict Level 2//EN" IETF/HTML-2_0-Strict.dtd
-PUBLIC "-//IETF//DTD HTML 2.0 Strict Level 2//EN" IETF/HTML-2_0-Strict.dtd
- -- Ways to refer to Strict Level 1: most general to most specific --
-PUBLIC "-//IETF//DTD HTML Strict Level 1//EN" IETF/HTML-2_0-Strict-Level_1.dtd
-PUBLIC "-//IETF//DTD HTML 2.0 Strict Level 1//EN" IETF/HTML-2_0-Strict-Level_1.dtd
+-- ISO latin 1 entity set for HTML --
- -- HTML i18n --
-PUBLIC "-//IETF//DTD HTML i18n//EN" IETF/HTML-i18n.dtd
+PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN//HTML"
+ "IETF/ISOlat1.ent"
+PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN"
+ "IETF/ISOlat1.ent"
- -- HTML 3.2 --
-PUBLIC "-//W3C//DTD HTML 3.2//EN" REC-html32-19970114/HTML32.dtd
-PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" REC-html32-19970114/HTML32.dtd
-PUBLIC "-//W3C//DTD HTML 3.2 Draft//EN" REC-html32-19970114/HTML32.dtd
- -- HTML 4.0 --
-PUBLIC "-//W3C//DTD HTML 4.0//EN" REC-html40-19980424/strict.dtd
-PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" REC-html40-19980424/loose.dtd
-PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN" REC-html40-19980424/frameset.dtd
+-- HTML 2 --
- -- HTML 4.01 --
-PUBLIC "-//W3C//DTD HTML 4.01//EN" REC-html401-19991224/strict.dtd
-PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" REC-html401-19991224/loose.dtd
-PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" REC-html401-19991224/frameset.dtd
-PUBLIC "-//W3C//ENTITIES Latin 1//EN//HTML" REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Latin1//EN//HTML" REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Special//EN//HTML" REC-html401-19991224/HTMLspecial.ent
-PUBLIC "-//W3C//ENTITIES Symbols//EN//HTML" REC-html401-19991224/HTMLsymbol.ent
+-- Ways to refer to Level 2: most general to most specific --
- -- ISO-HTML --
-PUBLIC "ISO/IEC 15445:2000//DTD HyperText Markup Language//EN" ISO-HTML/15445.dtd
-PUBLIC "ISO/IEC 15445:2000//DTD HTML//EN" ISO-HTML/15445.dtd
-PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML" REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML" REC-html401-19991224/HTMLsymbol.ent
+PUBLIC "HTML"
+ "IETF/HTML-2_0.dtd"
+PUBLIC "-//IETF//DTD HTML//EN"
+ "IETF/HTML-2_0.dtd"
+PUBLIC "-//IETF//DTD HTML//EN//2.0"
+ "IETF/HTML-2_0.dtd"
+PUBLIC "-//IETF//DTD HTML 2.0//EN"
+ "IETF/HTML-2_0.dtd"
+PUBLIC "-//IETF//DTD HTML Level 2//EN"
+ "IETF/HTML-2_0.dtd"
+PUBLIC "-//IETF//DTD HTML Level 2//EN//2.0"
+ "IETF/HTML-2_0.dtd"
+PUBLIC "-//IETF//DTD HTML 2.0 Level 2//EN"
+ "IETF/HTML-2_0.dtd"
+-- Ways to refer to Level 1: most general to most specific --
+
+PUBLIC "-//IETF//DTD HTML Level 1//EN"
+ "IETF/HTML-2_0-Level_1.dtd"
+PUBLIC "-//IETF//DTD HTML 2.0 Level 1//EN"
+ "IETF/HTML-2_0-Level_1.dtd"
+
+-- Ways to refer to Strict Level 2: most general to most specific --
+
+PUBLIC "-//IETF//DTD HTML Strict//EN"
+ "IETF/HTML-2_0-Strict.dtd"
+PUBLIC "-//IETF//DTD HTML 2.0 Strict//EN"
+ "IETF/HTML-2_0-Strict.dtd"
+PUBLIC "-//IETF//DTD HTML Strict Level 2//EN"
+ "IETF/HTML-2_0-Strict.dtd"
+PUBLIC "-//IETF//DTD HTML 2.0 Strict Level 2//EN"
+ "IETF/HTML-2_0-Strict.dtd"
+
+-- Ways to refer to Strict Level 1: most general to most specific --
+
+PUBLIC "-//IETF//DTD HTML Strict Level 1//EN"
+ "IETF/HTML-2_0-Strict-Level_1.dtd"
+PUBLIC "-//IETF//DTD HTML 2.0 Strict Level 1//EN"
+ "IETF/HTML-2_0-Strict-Level_1.dtd"
+
+
+-- HTML i18n --
+
+PUBLIC "-//IETF//DTD HTML i18n//EN"
+ "IETF/HTML-i18n.dtd"
+
+
+-- HTML 3.2 --
+
+PUBLIC "-//W3C//DTD HTML 3.2//EN"
+ "REC-html32-19970114/HTML32.dtd"
+PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"
+ "REC-html32-19970114/HTML32.dtd"
+PUBLIC "-//W3C//DTD HTML 3.2 Draft//EN"
+ "REC-html32-19970114/HTML32.dtd"
+
+
+-- HTML 4.0 --
+
+PUBLIC "-//W3C//DTD HTML 4.0//EN"
+ "REC-html40-19980424/strict.dtd"
+PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
+ "REC-html40-19980424/loose.dtd"
+PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN"
+ "REC-html40-19980424/frameset.dtd"
+
+
+-- HTML 4.01 --
+
+PUBLIC "-//W3C//DTD HTML 4.01//EN"
+ "REC-html401-19991224/strict.dtd"
+PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "REC-html401-19991224/loose.dtd"
+PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
+ "REC-html401-19991224/frameset.dtd"
+PUBLIC "-//W3C//ENTITIES Latin 1//EN//HTML"
+ "REC-html401-19991224/HTMLlat1.ent"
+PUBLIC "-//W3C//ENTITIES Latin1//EN//HTML"
+ "REC-html401-19991224/HTMLlat1.ent"
+PUBLIC "-//W3C//ENTITIES Special//EN//HTML"
+ "REC-html401-19991224/HTMLspecial.ent"
+PUBLIC "-//W3C//ENTITIES Symbols//EN//HTML"
+ "REC-html401-19991224/HTMLsymbol.ent"
+
+
+-- ISO-HTML --
+
+PUBLIC "ISO/IEC 15445:2000//DTD HyperText Markup Language//EN"
+ "ISO-HTML/15445.dtd"
+PUBLIC "ISO/IEC 15445:2000//DTD HTML//EN"
+ "ISO-HTML/15445.dtd"
+PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML"
+ "REC-html401-19991224/HTMLlat1.ent"
+PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML"
+ "REC-html401-19991224/HTMLsymbol.ent"
+
+
+-- Do not prefer document type name over a SYSTEM Identifier. --
- -- Do not prefer document type name over a SYSTEM Identifier. --
OVERRIDE NO
- -- Fallback for HTML documents if no FPI is given. --
+-- Fallback for HTML documents if no FPI is given. --
+
DOCTYPE html sgml.dtd
Index: xml.soc
===================================================================
RCS file: /sources/public/validator/htdocs/sgml-lib/xml.soc,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- xml.soc 13 Sep 2009 19:35:37 -0000 1.31
+++ xml.soc 13 Sep 2009 20:03:06 -0000 1.32
@@ -7,23 +7,26 @@
"http://www.w3.org/XML/1998/06/xmlspec-v20.dtd"
--- MathML --
+-- MathML 2.0 --
PUBLIC "-//W3C//DTD MathML 2.0//EN"
"REC-MathML2-20031021/mathml2.dtd"
SYSTEM "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd"
"REC-MathML2-20031021/mathml2.dtd"
-
PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN"
"REC-MathML2-20031021/xhtml-math11-f.dtd"
SYSTEM "http://www.w3.org/Math/DTD/mathml2/xhtml-math11-f.dtd"
"REC-MathML2-20031021/xhtml-math11-f.dtd"
--- SVG --
+-- SVG 1.0 --
PUBLIC "-//W3C//DTD SVG 1.0//EN"
"REC-SVG-20010904/svg10.dtd"
+
+
+-- SVG 1.1 --
+
PUBLIC "-//W3C//DTD SVG 1.1//EN"
"REC-SVG11-20030114/svg11-flat.dtd"
PUBLIC "-//W3C//DTD SVG Basic 1.1//EN"
@@ -36,12 +39,8 @@
"REC-SVG11-20030114/svg11-tiny-flat.dtd"
--- XHTML --
-PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "WD-xhtml11-20070216/xhtml11-flat.dtd"
-PUBLIC "-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN"
- "WD-xhtml11-20070216/xhtml11-model-1.mod"
+-- XHTML 1.0 --
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"REC-xhtml1-20020801/xhtml1-strict.dtd"
@@ -56,15 +55,31 @@
PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
"REC-xhtml1-20020801/xhtml-special.ent"
+
+-- XHTML 1.1 --
+
+PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+ "WD-xhtml11-20070216/xhtml11-flat.dtd"
+PUBLIC "-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN"
+ "WD-xhtml11-20070216/xhtml11-model-1.mod"
+
+
+-- XHTML Basic 1.0 --
+
PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
"REC-xhtml-basic-20001219/xhtml-basic10.dtd"
PUBLIC "-//W3C//ENTITIES XHTML Basic 1.0 Document Model 1.0//EN"
"REC-xhtml-basic-20001219/xhtml-basic10-model-1.mod"
+
+-- XHTML Basic 1.1 --
+
PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN"
"REC-xhtml-basic-20080729/xhtml-basic11.dtd"
+-- XHTML Print 1.0 --
+
PUBLIC "-//W3C//DTD XHTML-Print 1.0//EN"
"REC-xhtml-print-20060920/xhtml-print10.dtd"
PUBLIC "-//W3C//ENTITIES XHTML-Print 1.0 Document Model 1.0//EN"
@@ -77,17 +92,19 @@
"WD-XHTMLplusMathMLplusSVG-20020809/xhtml-math-svg-flat.dtd"
--- SMIL --
+-- SMIL 1.0 --
--- DTD drivers --
-PUBLIC "-//W3C//DTD SMIL 1.0//EN" "REC-smil-19980615/smil10.dtd"
-PUBLIC "-//W3C//DTD SMIL 2.0//EN" "REC-smil20-20050107/SMIL20.dtd"
-PUBLIC "-//W3C//DTD SMIL 2.0 Basic//EN" "REC-smil20-20050107/SMIL20Basic.dtd"
-PUBLIC "-//W3C//DTD SMIL 2.1//EN" "REC-SMIL2-20051213/SMIL21.dtd"
-PUBLIC "-//W3C//DTD SMIL 2.1 Extended Mobile//EN" "REC-SMIL2-20051213/SMIL21ExtendedMobile.dtd"
-PUBLIC "-//W3C//DTD SMIL 2.1 Mobile//EN" "REC-SMIL2-20051213/SMIL21Mobile.dtd"
+PUBLIC "-//W3C//DTD SMIL 1.0//EN"
+ "REC-smil-19980615/smil10.dtd"
+
+
+-- SMIL 2.0 --
+
+PUBLIC "-//W3C//DTD SMIL 2.0//EN"
+ "REC-smil20-20050107/SMIL20.dtd"
+PUBLIC "-//W3C//DTD SMIL 2.0 Basic//EN"
+ "REC-smil20-20050107/SMIL20Basic.dtd"
--- SMIL 2.0 Framework utilities --
PUBLIC "-//W3C//ENTITIES SMIL 2.0 Modular Framework 1.0//EN"
"REC-smil20-20050107/smil-framework-1.mod"
PUBLIC "-//W3C//ENTITIES SMIL 2.0 Datatypes 1.0//EN"
@@ -99,7 +116,6 @@
PUBLIC "-//W3C//ENTITIES SMIL 2.0 Document Model 1.0//EN"
"REC-smil20-20050107/smil-model-1.mod"
--- SMIL 2.0 elements from section modules --
PUBLIC "-//W3C//ELEMENTS SMIL 2.0 Document Structure//EN"
"REC-smil20-20050107/SMIL-struct.mod"
PUBLIC "-//W3C//ELEMENTS SMIL 2.0 Animation//EN"
@@ -122,15 +138,30 @@
"REC-smil20-20050107/SMIL-integrate.mod"
--- SMIL 2.1 Document model files for the predefined profiles --
+-- SMIL 2.1 --
+
+PUBLIC "-//W3C//DTD SMIL 2.1//EN"
+ "REC-SMIL2-20051213/SMIL21.dtd"
+PUBLIC "-//W3C//DTD SMIL 2.1 Extended Mobile//EN"
+ "REC-SMIL2-20051213/SMIL21ExtendedMobile.dtd"
+PUBLIC "-//W3C//DTD SMIL 2.1 Mobile//EN"
+ "REC-SMIL2-20051213/SMIL21Mobile.dtd"
+
PUBLIC "-//W3C//ENTITIES SMIL 2.1 Language Profile Document Model 1.0//EN"
"REC-SMIL2-20051213/smil-language-profile-model-1.mod"
PUBLIC "-//W3C//ENTITIES SMIL 2.1 Extended Mobile Profile Document Model 1.0//EN"
"REC-SMIL2-20051213/smil-extended-mobile-profile-model-1.mod"
PUBLIC "-//W3C//ENTITIES SMIL 2.1 Mobile Profile Document Model 1.0//EN"
"REC-SMIL2-20051213/smil-mobile-profile-model-1.mod"
+PUBLIC "-//W3C//ENTITIES SMIL 2.1 Datatypes 1.0//EN"
+ "REC-SMIL2-20051213/smil-datatypes-1.mod"
+PUBLIC "-//W3C//ENTITIES SMIL 2.1 Common Attributes 1.0//EN"
+ "REC-SMIL2-20051213/smil-attribs-1.mod"
+PUBLIC "-//W3C//ENTITIES SMIL 2.1 Qualified Names 1.0//EN"
+ "REC-SMIL2-20051213/smil-qname-1.mod"
+PUBLIC "-//W3C//ENTITIES SMIL 2.1 Modular Framework 1.0//EN"
+ "REC-SMIL2-20051213/smil-framework-1.mod"
--- SMIL 2.1 module files --
PUBLIC "-//W3C//ELEMENTS SMIL 2.1 Animation//EN"
"REC-SMIL2-20051213/SMIL-anim.mod"
PUBLIC "-//W3C//ELEMENTS SMIL 2.1 Content Control//EN"
@@ -150,16 +181,6 @@
PUBLIC "-//W3C//ELEMENTS SMIL 2.1 Transition//EN"
"REC-SMIL2-20051213/SMIL-transition.mod"
--- SMIL 2.1 Other utilities: data types, common attributes, qname and frame work files --
-PUBLIC "-//W3C//ENTITIES SMIL 2.1 Datatypes 1.0//EN"
- "REC-SMIL2-20051213/smil-datatypes-1.mod"
-PUBLIC "-//W3C//ENTITIES SMIL 2.1 Common Attributes 1.0//EN"
- "REC-SMIL2-20051213/smil-attribs-1.mod"
-PUBLIC "-//W3C//ENTITIES SMIL 2.1 Qualified Names 1.0//EN"
- "REC-SMIL2-20051213/smil-qname-1.mod"
-PUBLIC "-//W3C//ENTITIES SMIL 2.1 Modular Framework 1.0//EN"
- "REC-SMIL2-20051213/smil-framework-1.mod"
-
-- SMIL 3.0 --
@@ -174,16 +195,21 @@
PUBLIC "-//W3C//DTD SMIL 3.0 smilText//EN"
"REC-SMIL3-20081201/SMIL30smilText.dtd
-PUBLIC "-//W3C//ELEMENTS SMIL 3.0 Animation//EN"
- "REC-SMIL3-20081201/SMIL-anim.mod"
-PUBLIC "-//W3C//ENTITIES SMIL 3.0 Common Attributes 1.0//EN"
- "REC-SMIL3-20081201/smil-attribs-1.mod"
-PUBLIC "-//W3C//ELEMENTS SMIL 3.0 Content Control//EN"
- "REC-SMIL3-20081201/SMIL-control.mod"
PUBLIC "-//W3C//ENTITIES SMIL 3.0 Datatypes 1.0//EN"
"REC-SMIL3-20081201/smil-datatypes-1.mod"
PUBLIC "-//W3C//ENTITIES SMIL 3.0 Modular Framework 1.0//EN"
"REC-SMIL3-20081201/smil-framework-1.mod"
+PUBLIC "-//W3C//ENTITIES SMIL 3.0 Document Model 1.0//EN"
+ "REC-SMIL3-20081201/smil-profile-model-1.mod"
+PUBLIC "-//W3C//ENTITIES SMIL 3.0 Qualified Names 1.0//EN"
+ "REC-SMIL3-20081201/smil-qname-1.mod"
+PUBLIC "-//W3C//ENTITIES SMIL 3.0 Common Attributes 1.0//EN"
+ "REC-SMIL3-20081201/smil-attribs-1.mod"
+
+PUBLIC "-//W3C//ELEMENTS SMIL 3.0 Animation//EN"
+ "REC-SMIL3-20081201/SMIL-anim.mod"
+PUBLIC "-//W3C//ELEMENTS SMIL 3.0 Content Control//EN"
+ "REC-SMIL3-20081201/SMIL-control.mod"
PUBLIC "-//W3C//ELEMENTS SMIL 3.0 Layout//EN"
"REC-SMIL3-20081201/SMIL-layout.mod"
PUBLIC "-//W3C//ELEMENTS SMIL 3.0 Linking//EN"
@@ -192,10 +218,6 @@
"REC-SMIL3-20081201/SMIL-media.mod"
PUBLIC "-//W3C//ELEMENTS SMIL 3.0 Document Metainformation//EN"
"REC-SMIL3-20081201/SMIL-metainformation.mod"
-PUBLIC "-//W3C//ENTITIES SMIL 3.0 Document Model 1.0//EN"
- "REC-SMIL3-20081201/smil-profile-model-1.mod"
-PUBLIC "-//W3C//ENTITIES SMIL 3.0 Qualified Names 1.0//EN"
- "REC-SMIL3-20081201/smil-qname-1.mod"
PUBLIC "-//W3C//ELEMENTS SMIL 3.0 SMILtext//EN"
"REC-SMIL3-20081201/SMIL-smiltext.mod"
PUBLIC "-//W3C//ELEMENTS SMIL 3.0 State//EN"
@@ -211,12 +233,15 @@
-- XHTML + RDFa --
+
PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN"
"http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd"
-- Do not prefer document type name over a SYSTEM Identifier. --
+
OVERRIDE NO
-- Fallback if no FPI is given. --
+
DOCTYPE html xml.dtd
Received on Sunday, 13 September 2009 20:03:18 UTC