", $pee); // no pee inside object/embed
- $pee = preg_replace('|\s*\s*|', '', $pee);
+ $content = preg_replace('|
\s*
|', "\n\n", $content);
+
+ // skip formatting of predefined tags
+ $content = preg_replace_callback('/<(script|style|math|select|svg).*?<\/\\1>/si', '_autop_newline_preservation_helper', $content);
+
+ // skip new lines of comments
+ $content = preg_replace_callback('/\s*/', '_autop_newline_preservation_helper', $content);
+
+ // List of Blocking elements (minus p)
+ $blocklist = "table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary";
+
+ $allblocks = '(?:' . $blocklist . '|p)';
+ $allblocks_p = '(?:' . $blocklist . ')';
+
+ $content = preg_replace('!(<' . $allblocks . '[^>]*>)!i', "\n\n$1", $content);
+ $content = preg_replace('!(<' . $allblocks . '[^>]*\/>)!i', "$1\n\n", $content);
+ $content = preg_replace('!()!i', "$1\n\n", $content);
+ $content = str_replace(array("\r\n", "\r"), "\n", $content); // cross-platform newlines
+
+ while ( preg_match("/(<[^>\n]*)\n+/", $content) ) {
+ $content = preg_replace("/(<[^>\n]*)\n+/", "$1 ", $content); // eliminate carriage returns in tags
}
- $pee = preg_replace("/\n\n+/", "\n\n", $pee); // take care of duplicates
+
+ $content = preg_replace("/\n\n+/", "\n\n", $content); // take care of duplicates
+
// make paragraphs, including one at the end
- $pees = preg_split('/\n\s*\n/', $pee, -1, PREG_SPLIT_NO_EMPTY);
- $pee = '';
- foreach ( $pees as $tinkle )
- $pee .= '' . trim($tinkle, "\n") . "
\n";
- $pee = preg_replace('|\s*
|', '', $pee); // under certain strange conditions it could create a P of entirely whitespace
- $pee = preg_replace('!([^<]+)!', "
$1
", $pee);
- $pee = preg_replace('!\s*(]*>)\s*
!', "$1", $pee); // don't pee all over a tag
- $pee = preg_replace("|(|", "$1", $pee); // problem with nested lists
- $pee = preg_replace('|]*)>|i', "", $pee);
- $pee = str_replace('
', '
', $pee);
- $pee = preg_replace('!\s*(]*>)!', "$1", $pee);
- $pee = preg_replace('!(]*>)\s*
!', "$1", $pee);
+ $paragraphs = preg_split('/\n\s*\n/', $content, -1, PREG_SPLIT_NO_EMPTY);
+ $content = '';
+ foreach ( $paragraphs as $paragraph ) {
+ // test if block contains open or closing blocking elements if so add necessary closures
+
+ // current content segment does not contain an open and closing blocking element
+ if( 0 == preg_match('/<' . $allblocks_p . '[^>]*>.*?<\/' . $allblocks_p . '[^>]*>/si', $paragraph) ) {
+
+ // current content contains an open blocking element
+ if( 1 == preg_match('/<' . $allblocks_p .'[^>]*>/si', $paragraph) && 0 == preg_match('/<' . $allblocks_p .'[^>]*\/>/si', $paragraph) ) {
+ $content .= preg_replace('/(<' . $allblocks_p . '[^>]*>)/si', "$1\n", trim($paragraph, "\n") );
+ $content .= "
\n";
+
+ // current content contains a closing blocking element
+ } else if ( 1 == preg_match('/(<\/' . $allblocks_p .'[^>]*>)/si', $paragraph) ) {
+ $content .= '' . preg_replace('/(<\/' . $allblocks_p . '[^>]*>)/si', "
\n$1\n", trim($paragraph, "\n") );
+
+ } else {
+
+ // current content is not wrapped in tag and is not self closing tag
+ if( 0 == preg_match( '/]*>.*?<\/p[^>]*>/si', $paragraph ) && 0 == preg_match('/<' . $allblocks .'[^>]*\/>/si', $paragraph ) ) {
+ $content .= '' . trim($paragraph, "\n") . "
\n";
+
+ } else {
+ $content .= trim($paragraph, "\n") . "\n";
+ }
+ }
+
+ // current content contains an open and closing blocking element
+ } else {
+ $content .= trim($paragraph, "\n") . "\n";
+ }
+ }
+ $content = preg_replace('|\s*
|', '', $content); // under certain strange conditions it could create a P of entirely whitespace
if ( $br ) {
- $pee = preg_replace_callback('/<(script|style).*?<\/\\1>/s', '_autop_newline_preservation_helper', $pee);
- $pee = preg_replace('|(?)\s*\n|', "
\n", $pee); // optionally make line breaks
- $pee = str_replace('', "\n", $pee);
+ $content = preg_replace('|(?)\s*\n|', "
\n", $content); // optionally make line breaks
}
- $pee = preg_replace('!(]*>)\s*
!', "$1", $pee);
- $pee = preg_replace('!
(\s*]*>)!', '$1', $pee);
- $pee = preg_replace( "|\n
$|", '
', $pee );
+ $content = str_replace('', "\n", $content);
+ $content = preg_replace('!(]*>)\s*
!', "$1", $content);
+ $content = preg_replace('!
(\s*]*>)!', '$1', $content);
+ $content = preg_replace( "|\n$|", '', $content );
- if ( !empty($pre_tags) )
- $pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
+ if ( !empty($save_tags) )
+ $content = str_replace(array_keys($save_tags), array_values($save_tags), $content);
- return $pee;
+ return trim($content);
}
/**
@@ -277,14 +321,14 @@
*
* @since 2.9.0
*
- * @param string $pee The content.
+ * @param string $content The content.
* @return string The filtered content.
*/
-function shortcode_unautop( $pee ) {
+function shortcode_unautop( $content ) {
global $shortcode_tags;
if ( empty( $shortcode_tags ) || !is_array( $shortcode_tags ) ) {
- return $pee;
+ return $content;
}
$tagregexp = join( '|', array_map( 'preg_quote', array_keys( $shortcode_tags ) ) );
@@ -321,7 +365,7 @@
. '<\\/p>' // closing paragraph
. '/s';
- return preg_replace( $pattern, '$1', $pee );
+ return preg_replace( $pattern, '$1', $content );
}
/**