Ticket #9094: 9094.patch

_source/core/dtd.js

@@ -48 +48 @@
                 L = X({a:1},J),
                 M = {tr:1},
                 N = {'#':1},
-                O = X({param:1},K),
+                O = X({param:1,embed:1},K),
                 P = X({form:1},A,D,E,I),
                 Q = {li:1},
                 R = {style:1,script:1},

_source/core/htmlparser/fragment.js

@@ -212 +212 @@
 
                 parser.onTagOpen = function( tagName, attributes, selfClosing, optionalClose )
                 {
-                        var element = new CKEDITOR.htmlParser.element( tagName, attributes );
+                        var element = new CKEDITOR.htmlParser.element( tagName, attributes ),
+                                dtdName = tagName;
 
+                        // Reveal the real semantic of our internal custom tag name (#).
+                        var internalTag = tagName.match( /^cke:(.*)/ );
+                        internalTag && ( dtdName = internalTag[ 1 ] );
+
                         // "isEmpty" will be always "false" for unknown elements, so we
                         // must force it if the parser has identified it as a selfClosing tag.
                         if ( element.isUnknown && selfClosing )
@@ -246 +251 @@
 
                         while( 1 )
                         {
-                                var currentName = currentNode.name;
+                                var currentName = currentNode.name,
+                                        currentDtdName = currentName;
 
-                                var currentDtd = currentName ? ( CKEDITOR.dtd[ currentName ]
+                                var internalTag = currentName && currentName.match( /^cke:(.*)/ );
+                                internalTag && ( currentDtdName = internalTag[ 1 ] );
+
+                                var currentDtd = currentName ? ( CKEDITOR.dtd[ currentDtdName ]
                                                 || ( currentNode._.isBlockLike ? CKEDITOR.dtd.div : CKEDITOR.dtd.span ) )
                                                 : rootDtd;
 
                                 // If the element cannot be child of the current element.
-                                if ( !element.isUnknown && !currentNode.isUnknown && !currentDtd[ tagName ] )
+                                if ( !element.isUnknown && !currentNode.isUnknown && !currentDtd[ dtdName ] )
                                 {
                                         // Current node doesn't have a close tag, time for a close
                                         // as this element isn't fit in. (#7497)