Ticket #4945: 4945_2.patch

_source/plugins/pastefromword/filter/default.js

@@ -226 +226 @@
                                                                                 if ( !listBaseIndent && previousListItemMargin && margin > previousListItemMargin )
                                                                                         listBaseIndent = margin - previousListItemMargin;
 
-                                                                                attrs[ 'cke:margin' ] = previousListItemMargin = margin;
+                                                                                previousListItemMargin = margin;
+                                                                                attrs[ 'cke:indent' ] = listBaseIndent && Math.ceil( margin / listBaseIndent ) || 1;
                                                                         } ]
                                                         ] )( attrs.style, element ) || '' ;
                                         }
@@ -323 +324 @@
                                         for ( var i = 0; i < children.length; i++ )
                                         {
                                                 child = children[ i ];
-                                                var attributes = child.attributes;
 
                                                 if ( child.name in CKEDITOR.dtd.$listItem )
                                                 {
                                                         var listItemChildren = child.children,
+                                                                attributes = child.attributes,
                                                                 count = listItemChildren.length,
                                                                 last = listItemChildren[ count - 1 ];
 
@@ -342 +343 @@
                                                                         children.splice( i, 1 );
                                                         }
 
+                                                        // #4945: list presentation might be mixed with <li> and <p>, also analysis the
+                                                        // the 'tab-stops' to figure out base indent unit.
+                                                        attributes.style = CKEDITOR.plugins.pastefromword.filters.stylesFilter(
+                                                                [
+                                                                        // Resolve indent level from 'tab-stops' value.
+                                                                        [ ( /^tab-stops$/ ), null, function( margin )
+                                                                        {
+                                                                                // Be able to deal with component/short-hand form style.
+                                                                                var values = margin.split( ' ' );
+                                                                                margin = values[ 3 ] || values[ 1 ] || values [ 0 ];
+                                                                                margin = parseInt( margin, 10 );
+
+                                                                                // Figure out the 
+                                                                                if ( !listBaseIndent && previousListItemMargin && margin > previousListItemMargin )
+                                                                                        listBaseIndent = margin - previousListItemMargin;
+
+                                                                                previousListItemMargin = margin;
+                                                                        } ]
+                                                        ] )( attributes.style, element ) || '' ;
+
                                                         child.name = 'cke:li';
                                                         attributes[ 'cke:indent' ] = indentLevel;
-                                                        previousListItemMargin = 0;
                                                         attributes[ 'cke:listtype' ] = element.name;
                                                         listStyleType && child.addStyle( 'list-style-type', listStyleType, true );
                                                 }
@@ -386 +406 @@
                                                         // List item indent level might come from a real list indentation or
                                                         // been resolved from a pseudo list item's margin value, even get
                                                         // no indentation at all.
-                                                        listItemIndent = parseInt( listItemAttrs[ 'cke:indent' ], 10 )
-                                                                                                        || listBaseIndent && ( Math.ceil( listItemAttrs[ 'cke:margin' ] / listBaseIndent ) )
-                                                                                                        || 1;
+                                                        listItemIndent = parseInt( listItemAttrs[ 'cke:indent' ], 10 );
 
                                                         // Ignore the 'list-style-type' attribute if it's matched with
                                                         // the list root element's default style type.