vanilla ckeditor-3.1

[ckeditor.git] / _source / core / dtd.js

diff --git a/_source/core/dtd.js b/_source/core/dtd.js
index 45e801c..f569ed0 100644 (file)
--- a/_source/core/dtd.js
+++ b/_source/core/dtd.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -32,7 +32,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
  */\r
 CKEDITOR.dtd = (function()\r
 {\r
-    var X = CKEDITOR.tools.extend,\r
+       var X = CKEDITOR.tools.extend,\r
 \r
                A = {isindex:1,fieldset:1},\r
                B = {input:1,button:1,select:1,textarea:1,label:1},\r
@@ -51,14 +51,22 @@ CKEDITOR.dtd = (function()
                N = {'#':1},\r
                O = X({param:1},K),\r
                P = X({form:1},A,D,E,I),\r
-               Q = {li:1};\r
+               Q = {li:1},\r
+               R = {style:1,script:1},\r
+               S = {base:1,link:1,meta:1,title:1},\r
+               T = X(S,R),\r
+               U = {head:1,body:1},\r
+               V = {html:1};\r
 \r
        var block = {address:1,blockquote:1,center:1,dir:1,div:1,dl:1,fieldset:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,isindex:1,menu:1,noframes:1,ol:1,p:1,pre:1,table:1,ul:1};\r
 \r
-    return /** @lends CKEDITOR.dtd */ {\r
+       return /** @lends CKEDITOR.dtd */ {\r
 \r
                // The "$" items have been added manually.\r
 \r
+               // List of elements living outside body.\r
+               $nonBodyContent: X(V,U,S),\r
+\r
                /**\r
                 * List of block elements, like "p" or "div".\r
                 * @type Object\r
@@ -66,9 +74,16 @@ CKEDITOR.dtd = (function()
                 */\r
                $block : block,\r
 \r
+               /**\r
+                * List of block limit elements.\r
+                * @type Object\r
+                * @example\r
+                */\r
+               $blockLimit : { body:1,div:1,td:1,th:1,caption:1,form:1 },\r
+\r
                $inline : L,    // Just like span.\r
 \r
-               $body : X({script:1}, block),\r
+               $body : X({script:1,style:1}, block),\r
 \r
                $cdata : {script:1,style:1},\r
 \r
@@ -122,6 +137,15 @@ CKEDITOR.dtd = (function()
                 */\r
                $tableContent : {caption:1,col:1,colgroup:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1},\r
 \r
+        html: U,\r
+        head: T,\r
+        style: N,\r
+        script: N,\r
+        body: P,\r
+        base: {},\r
+        link: {},\r
+        meta: {},\r
+        title: N,\r
         col : {},\r
         tr : {td:1,th:1},\r
         img : {},\r