- From: Manu Sporny via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 04 Dec 2010 20:19:44 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/rdfa/DTD
In directory hutz:/tmp/cvs-serv858/DTD
Modified Files:
html401-rdfa11-1.dtd
Log Message:
Fixing HTML4.01+RDFa 1.1 DTD. Ensuring that RDFa attributes are everywhere.
Added %metainformation; statements to BDO, BASEFONT, FONT, BR, FRAMESET,
FRAME, IFRAME, ISINDEX, BASE, STYLE, and SCRIPT.
Index: html401-rdfa11-1.dtd
===================================================================
RCS file: /sources/public/html5/rdfa/DTD/html401-rdfa11-1.dtd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- html401-rdfa11-1.dtd 16 Oct 2010 19:19:24 -0000 1.4
+++ html401-rdfa11-1.dtd 4 Dec 2010 20:19:41 -0000 1.5
@@ -266,12 +266,14 @@
<!ELEMENT BDO - - (%inline;)* -- I18N BiDi over-ride -->
<!ATTLIST BDO
%coreattrs; -- id, class, style, title --
+ %metainformation; -- metadata attributes --
lang %LanguageCode; #IMPLIED -- language code --
dir (ltr|rtl) #REQUIRED -- directionality --
>
<!ELEMENT BASEFONT - O EMPTY -- base font size -->
<!ATTLIST BASEFONT
+ %metainformation; -- metadata attributes --
id ID #IMPLIED -- document-wide unique id --
size CDATA #REQUIRED -- base font size for FONT elements --
color %Color; #IMPLIED -- text color --
@@ -281,6 +283,7 @@
<!ELEMENT FONT - - (%inline;)* -- local change to font -->
<!ATTLIST FONT
%coreattrs; -- id, class, style, title --
+ %metainformation; -- metadata attributes --
%i18n; -- lang, dir --
size CDATA #IMPLIED -- [+|-]nn e.g. size="+1", size="4" --
color %Color; #IMPLIED -- text color --
@@ -290,6 +293,7 @@
<!ELEMENT BR - O EMPTY -- forced line break -->
<!ATTLIST BR
%coreattrs; -- id, class, style, title --
+ %metainformation; -- metadata attributes --
clear (left|all|right|none) none -- control of text flow --
>
@@ -959,6 +963,7 @@
<!ELEMENT FRAMESET - - ((FRAMESET|FRAME)+ & NOFRAMES?) -- window subdivision-->
<!ATTLIST FRAMESET
%coreattrs; -- id, class, style, title --
+ %metainformation; -- metadata attributes --
rows %MultiLengths; #IMPLIED -- list of lengths,
default: 100% (1 row) --
cols %MultiLengths; #IMPLIED -- list of lengths,
@@ -973,6 +978,7 @@
<!ELEMENT FRAME - O EMPTY -- subwindow -->
<!ATTLIST FRAME
%coreattrs; -- id, class, style, title --
+ %metainformation; -- metadata attributes --
longdesc %URI; #IMPLIED -- link to long description
(complements title) --
name CDATA #IMPLIED -- name of frame for targetting --
@@ -988,6 +994,7 @@
<!ELEMENT IFRAME - - (%flow;)* -- inline subwindow -->
<!ATTLIST IFRAME
%coreattrs; -- id, class, style, title --
+ %metainformation; -- metadata attributes --
longdesc %URI; #IMPLIED -- link to long description
(complements title) --
name CDATA #IMPLIED -- name of frame for targetting --
@@ -1033,10 +1040,12 @@
<!ATTLIST ISINDEX
%coreattrs; -- id, class, style, title --
%i18n; -- lang, dir --
+ %metainformation; -- metadata attributes --
prompt %Text; #IMPLIED -- prompt message -->
<!ELEMENT BASE - O EMPTY -- document base URI -->
<!ATTLIST BASE
+ %metainformation; -- metadata attributes --
href %URI; #IMPLIED -- URI that acts as base URI --
target %FrameTarget; #IMPLIED -- render in this frame --
>
@@ -1053,6 +1062,7 @@
<!ELEMENT STYLE - - %StyleSheet -- style info -->
<!ATTLIST STYLE
%i18n; -- lang, dir, for use with title --
+ %metainformation; -- metadata attributes --
type %ContentType; #REQUIRED -- content type of style language --
media %MediaDesc; #IMPLIED -- designed for use with these media --
title %Text; #IMPLIED -- advisory title --
@@ -1060,6 +1070,7 @@
<!ELEMENT SCRIPT - - %Script; -- script statements -->
<!ATTLIST SCRIPT
+ %metainformation; -- metadata attributes --
charset %Charset; #IMPLIED -- char encoding of linked resource --
type %ContentType; #REQUIRED -- content type of script language --
language CDATA #IMPLIED -- predefined script language name --
Received on Saturday, 4 December 2010 20:19:45 UTC