Ticket #7065: 7065.patch

_source/plugins/styles/plugin.js

@@ -965 +965 @@
          */
         function splitIntoPres( preBlock )
         {
-                // Exclude the ones at header OR at tail,
-                // and ignore bookmark content between them.
-                var duoBrRegex = /(\S\s*)\n(?:\s|(<span[^>]+data-cke-bookmark.*?\/span>))*\n(?!$)/gi,
+                // Two consequent line-breaks make a split, be ware of bookmarks.
+                var duoBrRegex = /(?:(\n|<br[^>]*?>)((:?<span[^>]+data-cke-bookmark.*?\/span>)*))\1/gi,
                         blockName = preBlock.getName(),
                         splitedHtml = replace( preBlock.getOuterHtml(),
                                 duoBrRegex,
-                                function( match, charBefore, bookmark )
+                                function( match, linebreak, bookmark )
                                 {
-                                  return charBefore + '</pre>' + bookmark + '<pre>';
+                                  return bookmark + '</pre><pre>';
                                 } );
 
                 var pres = [];