summaryrefslogtreecommitdiffstats
path: root/htdocs/sgml-lib
diff options
context:
space:
mode:
Diffstat (limited to 'htdocs/sgml-lib')
-rw-r--r--htdocs/sgml-lib/WD-xhtml-rdfa-20111215/xhtml-metaAttributes-2.mod (renamed from htdocs/sgml-lib/WD-xhtml-rdfa-20110331/xhtml-metaAttributes-2.mod)48
-rw-r--r--htdocs/sgml-lib/WD-xhtml-rdfa-20111215/xhtml-rdfa-2.dtd (renamed from htdocs/sgml-lib/WD-xhtml-rdfa-20110331/xhtml-rdfa-2.dtd)4
-rw-r--r--htdocs/sgml-lib/WD-xhtml-rdfa-20111215/xhtml-rdfa-model-2.mod (renamed from htdocs/sgml-lib/WD-xhtml-rdfa-20110331/xhtml-rdfa-model-2.mod)2
-rw-r--r--htdocs/sgml-lib/catalog.xml18
-rw-r--r--htdocs/sgml-lib/xml.soc18
5 files changed, 44 insertions, 46 deletions
diff --git a/htdocs/sgml-lib/WD-xhtml-rdfa-20110331/xhtml-metaAttributes-2.mod b/htdocs/sgml-lib/WD-xhtml-rdfa-20111215/xhtml-metaAttributes-2.mod
index 66137d4..28271ab 100644
--- a/htdocs/sgml-lib/WD-xhtml-rdfa-20110331/xhtml-metaAttributes-2.mod
+++ b/htdocs/sgml-lib/WD-xhtml-rdfa-20111215/xhtml-metaAttributes-2.mod
@@ -4,7 +4,7 @@
This is XHTML-RDFa, modules to annotate XHTML family documents.
Copyright 2007-2008 W3C (MIT, ERCIM, Keio), All Rights Reserved.
- Revision: $Id: xhtml-metaAttributes-2.mod,v 1.1 2011/03/31 13:40:05 bertails Exp $
+ Revision: $Id: xhtml-metaAttributes-2.mod,v 1.1 2011/12/15 18:37:49 denis Exp $
This DTD module is identified by the PUBLIC and SYSTEM identifiers:
@@ -20,13 +20,15 @@
<!-- Placeholder Compact URI-related types -->
<!ENTITY % CURIE.datatype "CDATA" >
<!ENTITY % CURIEs.datatype "CDATA" >
-<!ENTITY % CURIEorURI.datatype "CDATA" >
-<!ENTITY % CURIEorURIs.datatype "CDATA" >
+<!ENTITY % CURIEorIRI.datatype "CDATA" >
+<!ENTITY % CURIEorIRIs.datatype "CDATA" >
+<!ENTITY % IRI.datatype "CDATA" >
+<!ENTITY % IRIs.datatype "CDATA" >
<!ENTITY % PREFIX.datatype "CDATA" >
-<!ENTITY % SafeCURIEorCURIEorURI.datatype "CDATA" >
-<!ENTITY % SafeCURIEorCURIEorURIs.datatype "CDATA" >
-<!ENTITY % TERMorCURIEorAbsURI.datatype "CDATA" >
-<!ENTITY % TERMorCURIEorAbsURIs.datatype "CDATA" >
+<!ENTITY % SafeCURIEorCURIEorIRI.datatype "CDATA" >
+<!ENTITY % SafeCURIEorCURIEorIRIs.datatype "CDATA" >
+<!ENTITY % TERMorCURIEorAbsIRI.datatype "CDATA" >
+<!ENTITY % TERMorCURIEorAbsIRIs.datatype "CDATA" >
<!-- Common Attributes
@@ -42,42 +44,42 @@
-->
<!ENTITY % about.attrib
- "about %SafeCURIEorCURIEorURI.datatype; #IMPLIED"
+ "about %SafeCURIEorCURIEorIRI.datatype; #IMPLIED"
>
<![%XHTML.global.attrs.prefixed;[
<!ENTITY % XHTML.global.about.attrib
- "%XHTML.prefix;:about %SafeCURIEorCURIEorURI.datatype; #IMPLIED"
+ "%XHTML.prefix;:about %SafeCURIEorCURIEorIRI.datatype; #IMPLIED"
>
]]>
<!ENTITY % typeof.attrib
- "typeof %TERMorCURIEorAbsURIs.datatype; #IMPLIED"
+ "typeof %TERMorCURIEorAbsIRIs.datatype; #IMPLIED"
>
<![%XHTML.global.attrs.prefixed;[
<!ENTITY % XHTML.global.typeof.attrib
- "%XHTML.prefix;:typeof %TERMorCURIEorAbsURIs.datatype; #IMPLIED"
+ "%XHTML.prefix;:typeof %TERMorCURIEorAbsIRIs.datatype; #IMPLIED"
>
]]>
<!ENTITY % property.attrib
- "property %TERMorCURIEorAbsURIs.datatype; #IMPLIED"
+ "property %TERMorCURIEorAbsIRIs.datatype; #IMPLIED"
>
<![%XHTML.global.attrs.prefixed;[
<!ENTITY % XHTML.global.property.attrib
- "%XHTML.prefix;:property %TERMorCURIEorAbsURIs.datatype; #IMPLIED"
+ "%XHTML.prefix;:property %TERMorCURIEorAbsIRIs.datatype; #IMPLIED"
>
]]>
<!ENTITY % resource.attrib
- "resource %SafeCURIEorCURIEorURI.datatype; #IMPLIED"
+ "resource %SafeCURIEorCURIEorIRI.datatype; #IMPLIED"
>
<![%XHTML.global.attrs.prefixed;[
<!ENTITY % XHTML.global.resource.attrib
- "%XHTML.prefix;:resource %SafeCURIEorCURIEorURI.datatype; #IMPLIED"
+ "%XHTML.prefix;:resource %SafeCURIEorCURIEorIRI.datatype; #IMPLIED"
>
]]>
@@ -92,32 +94,32 @@
]]>
<!ENTITY % datatype.attrib
- "datatype %TERMorCURIEorAbsURI.datatype; #IMPLIED"
+ "datatype %TERMorCURIEorAbsIRI.datatype; #IMPLIED"
>
<![%XHTML.global.attrs.prefixed;[
<!ENTITY % XHTML.global.datatype.attrib
- "%XHTML.prefix;:datatype %TERMorCURIEorAbsURI.datatype; #IMPLIED"
+ "%XHTML.prefix;:datatype %TERMorCURIEorAbsIRI.datatype; #IMPLIED"
>
]]>
<!ENTITY % rel.attrib
- "rel %TERMorCURIEorAbsURIs.datatype; #IMPLIED"
+ "rel %TERMorCURIEorAbsIRIs.datatype; #IMPLIED"
>
<![%XHTML.global.attrs.prefixed;[
<!ENTITY % XHTML.global.rel.attrib
- "%XHTML.prefix;:rel %TERMorCURIEorAbsURIs.datatype; #IMPLIED"
+ "%XHTML.prefix;:rel %TERMorCURIEorAbsIRIs.datatype; #IMPLIED"
>
]]>
<!ENTITY % rev.attrib
- "rev %TERMorCURIEorAbsURIs.datatype; #IMPLIED"
+ "rev %TERMorCURIEorAbsIRIs.datatype; #IMPLIED"
>
<![%XHTML.global.attrs.prefixed;[
<!ENTITY % XHTML.global.rev.attrib
- "%XHTML.prefix;:rev %TERMorCURIEorAbsURIs.datatype; #IMPLIED"
+ "%XHTML.prefix;:rev %TERMorCURIEorAbsIRIs.datatype; #IMPLIED"
>
]]>
@@ -132,12 +134,12 @@
]]>
<!ENTITY % vocab.attrib
- "vocab %URI.datatype; #IMPLIED"
+ "vocab %IRI.datatype; #IMPLIED"
>
<![%XHTML.global.attrs.prefixed;[
<!ENTITY % XHTML.global.vocab.attrib
- "%XHTML.prefix;:vocab %URI.datatype; #IMPLIED"
+ "%XHTML.prefix;:vocab %IRI.datatype; #IMPLIED"
>
]]>
diff --git a/htdocs/sgml-lib/WD-xhtml-rdfa-20110331/xhtml-rdfa-2.dtd b/htdocs/sgml-lib/WD-xhtml-rdfa-20111215/xhtml-rdfa-2.dtd
index 022c717..9a2d71c 100644
--- a/htdocs/sgml-lib/WD-xhtml-rdfa-20110331/xhtml-rdfa-2.dtd
+++ b/htdocs/sgml-lib/WD-xhtml-rdfa-20111215/xhtml-rdfa-2.dtd
@@ -117,7 +117,6 @@
<!ENTITY % Common.extra.attrib
"href %URI.datatype; #IMPLIED
- profile %URIs.datatype; #IMPLIED
%Metainformation.attrib;"
>
<!-- adding the lang attribute into the I18N collection -->
@@ -283,7 +282,6 @@
%XHTML.xmlns.attrib;
%id.attrib;
%Metainformation.attrib;
- profile %URIs.datatype; #IMPLIED
href %URI.datatype; #IMPLIED
xml:space ( preserve ) #FIXED 'preserve'
charset %Charset.datatype; #IMPLIED
@@ -306,7 +304,6 @@
%title.attrib;
%I18n.attrib;
%Metainformation.attrib;
- profile %URIs.datatype; #IMPLIED
href %URI.datatype; #IMPLIED
xml:space ( preserve ) #FIXED 'preserve'
type %ContentType.datatype; #REQUIRED
@@ -362,7 +359,6 @@
%XHTML.xmlns.attrib;
%id.attrib;
%Metainformation.attrib;
- profile %URIs.datatype; #IMPLIED
href %URI.datatype; #IMPLIED
name CDATA #REQUIRED
value CDATA #IMPLIED
diff --git a/htdocs/sgml-lib/WD-xhtml-rdfa-20110331/xhtml-rdfa-model-2.mod b/htdocs/sgml-lib/WD-xhtml-rdfa-20111215/xhtml-rdfa-model-2.mod
index 8c834ec..3efb63e 100644
--- a/htdocs/sgml-lib/WD-xhtml-rdfa-20110331/xhtml-rdfa-model-2.mod
+++ b/htdocs/sgml-lib/WD-xhtml-rdfa-20111215/xhtml-rdfa-model-2.mod
@@ -4,7 +4,7 @@
This is XHTML+RDFa.
Copyright 1998-2010 W3C (MIT, ERCIM, Keio), All Rights Reserved.
- Revision: $Id: xhtml-rdfa-model-2.mod,v 1.1 2011/03/31 13:40:05 bertails Exp $ SMI
+ Revision: $Id: xhtml-rdfa-model-2.mod,v 1.1 2011/12/15 18:37:50 denis Exp $ SMI
This DTD module is identified by the PUBLIC and SYSTEM identifiers:
diff --git a/htdocs/sgml-lib/catalog.xml b/htdocs/sgml-lib/catalog.xml
index cf089b1..d510f68 100644
--- a/htdocs/sgml-lib/catalog.xml
+++ b/htdocs/sgml-lib/catalog.xml
@@ -214,15 +214,15 @@
<public publicId="-//W3C//ENTITIES XHTML MetaAttributes 1.0//EN" uri="REC-rdfa-syntax-20081014/xhtml-metaAttributes-1.mod" />
<system systemId="http://www.w3.org/MarkUp/DTD/xhtml-metaAttributes-1.mod" uri="REC-rdfa-syntax-20081014/xhtml-metaAttributes-1.mod" />
<system systemId="http://www.w3.org/TR/rdfa-syntax/DTD/xhtml-metaAttributes-1.mod" uri="REC-rdfa-syntax-20081014/xhtml-metaAttributes-1.mod" />
- <public publicId="-//W3C//DTD XHTML+RDFa 1.1//EN" uri="WD-xhtml-rdfa-20110331/xhtml-rdfa-2.dtd" />
- <system systemId="http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd" uri="WD-xhtml-rdfa-20110331/xhtml-rdfa-2.dtd" />
- <system systemId="http://www.w3.org/TR/xhtml-rdfa/DTD/xhtml-rdfa-2.dtd" uri="WD-xhtml-rdfa-20110331/xhtml-rdfa-2.dtd" />
- <public publicId="-//W3C//ENTITIES XHTML+RDFa Document Model 1.1//EN" uri="WD-xhtml-rdfa-20110331/xhtml-rdfa-model-2.mod" />
- <system systemId="http://www.w3.org/MarkUp/DTD/xhtml-rdfa-model-2.mod" uri="WD-xhtml-rdfa-20110331/xhtml-rdfa-model-2.mod" />
- <system systemId="http://www.w3.org/TR/xhtml-rdfa/DTD/xhtml-rdfa-model-2.mod" uri="WD-xhtml-rdfa-20110331/xhtml-rdfa-model-2.mod" />
- <public publicId="-//W3C//ENTITIES XHTML MetaAttributes 1.1//EN" uri="WD-xhtml-rdfa-20110331/xhtml-metaAttributes-2.mod" />
- <system systemId="http://www.w3.org/MarkUp/DTD/xhtml-metaAttributes-2.mod" uri="WD-xhtml-rdfa-20110331/xhtml-metaAttributes-2.mod" />
- <system systemId="http://www.w3.org/TR/xhtml-rdfa/DTD/xhtml-metaAttributes-2.mod" uri="WD-xhtml-rdfa-20110331/xhtml-metaAttributes-2.mod" />
+ <public publicId="-//W3C//DTD XHTML+RDFa 1.1//EN" uri="WD-xhtml-rdfa-20111215/xhtml-rdfa-2.dtd" />
+ <system systemId="http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd" uri="WD-xhtml-rdfa-20111215/xhtml-rdfa-2.dtd" />
+ <system systemId="http://www.w3.org/TR/xhtml-rdfa/DTD/xhtml-rdfa-2.dtd" uri="WD-xhtml-rdfa-20111215/xhtml-rdfa-2.dtd" />
+ <public publicId="-//W3C//ENTITIES XHTML+RDFa Document Model 1.1//EN" uri="WD-xhtml-rdfa-20111215/xhtml-rdfa-model-2.mod" />
+ <system systemId="http://www.w3.org/MarkUp/DTD/xhtml-rdfa-model-2.mod" uri="WD-xhtml-rdfa-20111215/xhtml-rdfa-model-2.mod" />
+ <system systemId="http://www.w3.org/TR/xhtml-rdfa/DTD/xhtml-rdfa-model-2.mod" uri="WD-xhtml-rdfa-20111215/xhtml-rdfa-model-2.mod" />
+ <public publicId="-//W3C//ENTITIES XHTML MetaAttributes 1.1//EN" uri="WD-xhtml-rdfa-20111215/xhtml-metaAttributes-2.mod" />
+ <system systemId="http://www.w3.org/MarkUp/DTD/xhtml-metaAttributes-2.mod" uri="WD-xhtml-rdfa-20111215/xhtml-metaAttributes-2.mod" />
+ <system systemId="http://www.w3.org/TR/xhtml-rdfa/DTD/xhtml-metaAttributes-2.mod" uri="WD-xhtml-rdfa-20111215/xhtml-metaAttributes-2.mod" />
<public publicId="-//W3C//DTD XHTML+ARIA 1.0//EN" uri="CR-wai-aria-20110118/xhtml-aria-1.dtd" />
<system systemId="http://www.w3.org/MarkUp/DTD/xhtml-aria-1.dtd" uri="CR-wai-aria-20110118/xhtml-aria-1.dtd" />
<system systemId="http://www.w3.org/WAI/ARIA/schemata/xhtml-aria-1.dtd" uri="CR-wai-aria-20110118/xhtml-aria-1.dtd" />
diff --git a/htdocs/sgml-lib/xml.soc b/htdocs/sgml-lib/xml.soc
index 566a595..28a4336 100644
--- a/htdocs/sgml-lib/xml.soc
+++ b/htdocs/sgml-lib/xml.soc
@@ -568,25 +568,25 @@ SYSTEM "http://www.w3.org/TR/rdfa-syntax/DTD/xhtml-metaAttributes-1.mod"
-- XHTML + RDFa 1.1 --
PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN"
- "WD-xhtml-rdfa-20110331/xhtml-rdfa-2.dtd"
+ "WD-xhtml-rdfa-20111215/xhtml-rdfa-2.dtd"
SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd"
- "WD-xhtml-rdfa-20110331/xhtml-rdfa-2.dtd"
+ "WD-xhtml-rdfa-20111215/xhtml-rdfa-2.dtd"
SYSTEM "http://www.w3.org/TR/xhtml-rdfa/DTD/xhtml-rdfa-2.dtd"
- "WD-xhtml-rdfa-20110331/xhtml-rdfa-2.dtd"
+ "WD-xhtml-rdfa-20111215/xhtml-rdfa-2.dtd"
PUBLIC "-//W3C//ENTITIES XHTML+RDFa Document Model 1.1//EN"
- "WD-xhtml-rdfa-20110331/xhtml-rdfa-model-2.mod"
+ "WD-xhtml-rdfa-20111215/xhtml-rdfa-model-2.mod"
SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-model-2.mod"
- "WD-xhtml-rdfa-20110331/xhtml-rdfa-model-2.mod"
+ "WD-xhtml-rdfa-20111215/xhtml-rdfa-model-2.mod"
SYSTEM "http://www.w3.org/TR/xhtml-rdfa/DTD/xhtml-rdfa-model-2.mod"
- "WD-xhtml-rdfa-20110331/xhtml-rdfa-model-2.mod"
+ "WD-xhtml-rdfa-20111215/xhtml-rdfa-model-2.mod"
PUBLIC "-//W3C//ENTITIES XHTML MetaAttributes 1.1//EN"
- "WD-xhtml-rdfa-20110331/xhtml-metaAttributes-2.mod"
+ "WD-xhtml-rdfa-20111215/xhtml-metaAttributes-2.mod"
SYSTEM "http://www.w3.org/MarkUp/DTD/xhtml-metaAttributes-2.mod"
- "WD-xhtml-rdfa-20110331/xhtml-metaAttributes-2.mod"
+ "WD-xhtml-rdfa-20111215/xhtml-metaAttributes-2.mod"
SYSTEM "http://www.w3.org/TR/xhtml-rdfa/DTD/xhtml-metaAttributes-2.mod"
- "WD-xhtml-rdfa-20110331/xhtml-metaAttributes-2.mod"
+ "WD-xhtml-rdfa-20111215/xhtml-metaAttributes-2.mod"
-- XHTML + ARIA 1.0 --