Changeset 2501

Timestamp:

02/15/2016 06:28:02 AM (10 years ago)

Author:

obenland

Message:

W.org Plugins: Code reformatting.

• Splitting out classes in their own files.
• Let the automated code formatter run over the plugin.

It should break too many things.

See #1584.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• class-wporg-plugin-directory-template.php (added)
• class-wporg-plugin-directory-tools.php (added)
• class-wporg-plugin-directory.php (added)
• plugin-directory.php (modified) (1 diff)
• readme-parser/ReadmeParser.php (modified) (10 diffs)
• readme-parser/compat.php (modified) (1 diff)
• readme-parser/markdown.php (modified) (84 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/plugin-directory.php

@@ -1 +1 @@
 <?php
-/*
- * Plugin Name: Plugin Repository
+/**
+ * Plugin Name: Plugin Directory
  * Plugin URI: http://wordpress.org/plugins/
  * Description: Transforms a WordPress site in The Official Plugin Directory.
  * Version: 0.1
- * Author: wordpressdotorg
- * Author URI: http://wordpress.org/
+ * Author: the WordPress team
+ * Author URI: https://wordpress.org/
  * Text Domain: wporg-plugins
  * License: GPLv2
  * License URI: http://opensource.org/licenses/gpl-2.0.php
+ *
+ * @package WPorg_Plugin_Directory
  */
 
-class Plugin_Directory {
+include_once( 'class-wporg-plugin-directory.php' );
+include_once( 'class-wporg-plugin-directory-template.php' );
+include_once( 'class-wporg-plugin-directory-tools.php' );
 
-    function __construct() {
-        register_activation_hook( __FILE__, array( $this, 'activate' ) );
-        register_deactivation_hook( __FILE__, array( $this, 'deactivate' ) );
-
-        add_action( 'init', array( $this, 'init' ) );
-        add_filter( 'post_type_link', array( $this, 'package_link' ), 10, 2 );
-        add_filter( 'pre_insert_term', array( $this, 'pre_insert_term_prevent' ) );
-        add_action( 'pre_get_posts', array( $this, 'use_plugins_in_query' ) );
-        add_filter( 'the_content', array( $this, 'filter_post_content_to_correct_page' ), 1 );
-    }
-
-    function activate() {
-        global $wp_rewrite;
-
-        // Setup the environment
-        $this->init();
-
-        // %postname% is required
-        $wp_rewrite->set_permalink_structure( '/%postname%/' );
-
-        // /tags/%slug% is required for tags
-        $wp_rewrite->set_tag_base( '/tags' );
-
-        // We require the WordPress.org Ratings plugin also be active
-        if ( ! is_plugin_active( 'wporg-ratings/wporg-ratings.php' ) ) {
-            activate_plugin( 'wporg-ratings/wporg-ratings.php' );
-        }
-    
-        // Enable the WordPress.org Theme Repo Theme
-        foreach ( wp_get_themes() as $theme ) {
-            if ( $theme->get( 'Name' ) === 'WordPress.org Plugins' ) {
-                switch_theme( $theme->get_stylesheet() );
-                break;
-            }
-        }
-    
-        flush_rewrite_rules();
-    
-        do_action( 'wporg_plugins_activation' );
-    }
-
-    function deactivate() {
-        flush_rewrite_rules();
-    
-        do_action( 'wporg_plugins_deactivation' );
-    }
-
-
-    function init() {
-        load_plugin_textdomain( 'wporg-plugins' );
-
-        register_post_type( 'plugin', array(
-            'labels'      => array(
-                'name'               => __( 'Plugins', 'wporg-plugins' ),
-                'singular_name'      => __( 'Plugin', 'wporg-plugins' ),
-                'add_new'            => __( 'Add New', 'wporg-plugins' ),
-                'add_new_item'       => __( 'Add New Plugin', 'wporg-plugins' ),
-                'edit_item'          => __( 'Edit Plugin', 'wporg-plugins' ),
-                'new_item'           => __( 'New Plugin', 'wporg-plugins' ),
-                'view_item'          => __( 'View Plugin', 'wporg-plugins' ),
-                'search_items'       => __( 'Search Plugins', 'wporg-plugins' ),
-                'not_found'          => __( 'No plugins found', 'wporg-plugins' ),
-                'not_found_in_trash' => __( 'No plugins found in Trash', 'wporg-plugins' ),
-                'menu_name'          => __( 'My Plugins', 'wporg-plugins' ),
-            ),
-            'description' => __( 'A package', 'wporg-plugins' ),
-            'supports'    => array( 'title', 'editor', 'excerpt', 'custom-fields' ),
-            'taxonomies'  => array( 'post_tag', 'category' ),
-            'public'      => true,
-            'show_ui'     => true,
-            'has_archive' => true,
-            'rewrite'     => false,
-            'menu_icon'   => 'dashicons-admin-plugins',
-        ) );
-
-        register_post_status( 'pending', array(
-            'label' => _x( 'Pending', 'plugin status', 'wporg-plugins' ),
-            'public' => false,
-            'show_in_admin_status_list' => true,
-            'label_count' => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>', 'wporg-plugins' ),
-        ) );
-        register_post_status( 'disabled', array(
-            'label' => _x( 'Disabled', 'plugin status', 'wporg-plugins' ),
-            'public' => false,
-            'show_in_admin_status_list' => true,
-            'label_count' => _n_noop( 'Disabled <span class="count">(%s)</span>', 'Disabled <span class="count">(%s)</span>', 'wporg-plugins' ),
-        ) );
-        register_post_status( 'closed', array(
-            'label' => _x( 'Closed', 'plugin status', 'wporg-plugins' ),
-            'public' => false,
-            'show_in_admin_status_list' => true,
-            'label_count' => _n_noop( 'Closed <span class="count">(%s)</span>', 'Closed <span class="count">(%s)</span>', 'wporg-plugins' ),
-        ) );
-    
-        // Add the browse/* views
-        add_rewrite_tag( '%browse%', '(featured|popular|beta|new|favorites)' );
-        add_permastruct( 'browse', 'browse/%browse%' );
-
-        add_rewrite_endpoint( 'installation', EP_PERMALINK );
-        add_rewrite_endpoint( 'faq',          EP_PERMALINK );
-        add_rewrite_endpoint( 'screenshots',  EP_PERMALINK );
-        add_rewrite_endpoint( 'changelog',    EP_PERMALINK );
-        add_rewrite_endpoint( 'stats',        EP_PERMALINK );
-        add_rewrite_endpoint( 'developers',   EP_PERMALINK );
-        add_rewrite_endpoint( 'other_notes',  EP_PERMALINK );
-    }
-
-    /**
-     * Filter the permalink for the Packages to be /post_name/
-     *
-     * @param string $link The generated permalink
-     * @param string $post The package object
-     * @return string
-     */
-    function package_link( $link, $post ) {
-        if ( 'plugin' != $post->post_type ) {
-            return $link;
-        }
-    
-        return trailingslashit( home_url( $post->post_name ) );
-    }
-
-    /**
-     * Checks if ther current users is a super admin before allowing terms to be added.
-     *
-     * @param string           $term The term to add or update.
-     * @return string|WP_Error The term to add or update or WP_Error on failure.
-     */
-    function pre_insert_term_prevent( $term ) {
-        if ( ! is_super_admin() ) {
-            $term = new WP_Error( 'not-allowed', __( 'You are not allowed to add terms.', 'wporg-plugins' ) );
-        }
-    
-        return $term;
-    }
-
-    function use_plugins_in_query( $wp_query ) {
-        if ( ! $wp_query->is_main_query() ) {
-            return;
-        }
-
-        if ( empty( $wp_query->query_vars['pagename'] ) &&
-            ( empty( $wp_query->query_vars['post_type'] ) || 'posts' == $wp_query->query_vars['post_type'] ) ) {
-            $wp_query->query_vars['post_type'] = array( 'plugin' );
-        }
-
-        if ( empty( $wp_query->query ) ) {
-            $wp_query->query_vars['browse'] = 'featured';
-        }
-
-        switch ( get_query_var( 'browse' ) ) {
-            case 'beta':
-                $wp_query->query_vars['category_name'] = 'beta';
-                break;
-    
-            case 'featured':
-                $wp_query->query_vars['category_name'] = 'featured';
-                break;
-    
-            case 'favorites':
-                break;
-    
-            case 'popular':
-                break;
-        }
-
-        // Re-route the Endpoints to the `content_page` query var.
-        if ( !empty( $wp_query->query['name'] ) ) {
-            foreach ( array( 'installation', 'faq', 'screenshots', 'changelog', 'stats', 'developers', 'other_notes' ) as $plugin_field ) {
-                if ( isset( $wp_query->query[ $plugin_field ] ) ) {
-                    $wp_query->query['content_page'] = $wp_query->query_vars['content_page'] = $plugin_field;
-                    unset( $wp_query->query[ $plugin_field ], $wp_query->query_vars[ $plugin_field ] );
-                }
-            }
-        }
-    }
-
-    function filter_post_content_to_correct_page( $content ) {
-        global $content_pages;
-
-        $post = get_post();
-        if ( 'plugin' != $post->post_type ) {
-            return $content;
-        }
-
-        $page = get_query_var( 'content_page' );
-        $content_pages = $this->split_post_content_into_pages( $content );
-
-        if ( ! isset( $content_pages[ $page ] ) ) {
-            $page = 'description';
-        }
-
-        return $content_pages[ $page ];
-    }
-
-    function split_post_content_into_pages( $content ) {
-        $content_pages = array(
-            'stats' => '[wporg-plugins-stats]',
-            'developers' => '[wporg-plugins-developer]',
-        );
-        $_pages = preg_split( "#<!--section=(.+?)-->#", $content, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
-        for ( $i = 0; $i < count( $_pages ); $i += 2 ) {
-            // Don't overwrite existing tabs.
-            if ( ! isset( $content_pages[ $_pages[ $i ] ] ) ) {
-                $content_pages[ $_pages[ $i ] ] = $_pages[ $i + 1 ];
-            }
-        }
-
-        return $content_pages;
-    }
-
-}
-new Plugin_Directory();
-
-// Various functions used by other processes, will make sense to move to specific classses.
-class Plugin_Directory_Tools {
-    static function get_readme_data( $readme ) {
-        // Uses https://github.com/rmccue/WordPress-Readme-Parser (with modifications)
-        include_once __DIR__ . '/readme-parser/markdown.php';
-        include_once __DIR__ . '/readme-parser/compat.php';
-
-        $data = (object) _WordPress_org_Readme::parse_readme( $readme );
-
-        unset( $data->sections['screenshots'] ); // Useless
-
-        // sanitize contributors.
-        foreach ( $data->contributors as $i => $name ) {
-            if ( get_user_by( 'login', $name ) ) {
-                continue;
-            } elseif ( false !== ( $user = get_user_by( 'slug', $name ) ) ) {
-                $data->contributors[] = $user->user_login;
-                unset( $data->contributors[ $i ] );
-            } else {
-                unset( $data->contributors[ $i ] );
-            }
-        }
-
-        return $data;
-    }
-}
-
-// Various helpers to retrieve data not stored within WordPress
-class Plugin_Directory_Template_Helpers {
-    static function get_active_installs_count( $plugin_slug ) {
-        global $wpdb;
-    
-        $count = wp_cache_get( $plugin_slug, 'plugin_active_installs' );
-        if ( false === $count ) {
-            $count = (int) $wpdb->get_var( $wpdb->prepare(
-                "SELECT count FROM rev2_daily_stat_summary WHERE type = 'plugin' AND type_name = %s AND stat = 'active_installs' LIMIT 1",
-                $plugin_slug
-            ) );
-            wp_cache_add( $plugin_slug, $count, 'plugin_active_installs', 1200 );
-        }
-    
-        if ( $count < 10 ) {
-            return 0;
-        }
-    
-        if ( $count >= 1000000 ) {
-            return 1000000;
-        }
-    
-        return strval( $count )[0] * pow( 10, floor( log10( $count ) ) );
-    }
-
-    static function get_total_downloads() {
-        global $wpdb;
-
-        $count = wp_cache_get( 'plugin_download_count', 'plugin_download_count' );
-        if ( false === $count ) {
-            $count = (int) $wpdb->get_var( "SELECT SUM(downloads) FROM `plugin_2_stats`" );
-            wp_cache_add( 'plugin_download_count', $count, 'plugin_download_count', DAY_IN_SECONDS );
-        }
-
-        return $count;
-    }
-
-    static function get_plugin_sections() {
-        $plugin_slug  = get_post()->post_name;
-        $raw_sections = get_post_meta( get_the_ID(), 'sections', true );
-        $raw_sections = array_unique( array_merge( $raw_sections, array( 'description', 'stats', 'support', 'reviews', 'developers' ) ) );
-    
-        $sections = array();
-        foreach ( $raw_sections as $section_slug ) {
-            $url = get_permalink();
-            switch ( $section_slug ) {
-                case 'description':
-                    $title = _x( 'Description', 'plugin tab title', 'wporg-plugins' );
-                    break;
-                case 'installation':
-                    $title = _x( 'Installation', 'plugin tab title', 'wporg-plugins' );
-                    $url = trailingslashit( $url ) . '/' . $section_slug . '/';
-                    break;
-                case 'faq':
-                    $title = _x( 'FAQ', 'plugin tab title', 'wporg-plugins' );
-                    $url = trailingslashit( $url ) . '/' . $section_slug . '/';
-                    break;
-                case 'screenshots':
-                    $title = _x( 'Screenshots', 'plugin tab title', 'wporg-plugins' );
-                    $url = trailingslashit( $url ) . '/' . $section_slug . '/';
-                    break;
-                case 'changelog':
-                    $title = _x( 'Changelog', 'plugin tab title', 'wporg-plugins' );
-                    $url = trailingslashit( $url ) . '/' . $section_slug . '/';
-                    break;
-                case 'stats':
-                    $title = _x( 'Stats', 'plugin tab title', 'wporg-plugins' );
-                    $url = trailingslashit( $url ) . '/' . $section_slug . '/';
-                    break;
-                case 'support':
-                    $title = _x( 'Support', 'plugin tab title', 'wporg-plugins' );
-                    $url = 'https://wordpress.org/support/plugin/' . $plugin_slug;
-                    break;
-                case 'reviews':
-                    $title = _x( 'Reviews', 'plugin tab title', 'wporg-plugins' );
-                    $url = 'https://wordpress.org/support/view/plugin-reviews/' . $plugin_slug;
-                    break;
-                case 'developers':
-                    $title = _x( 'Developers', 'plugin tab title', 'wporg-plugins' );
-                    $url = trailingslashit( $url ) . '/' . $section_slug . '/';
-                    break;
-            }
-            $sections[] = array(
-                'slug'  => $section_slug,
-                'url'   => $url,
-                'title' => $title,
-            );
-        }
-        return $sections;
-    }
-}
-    
+$wporg_plugin_directory = new WPorg_Plugin_Directory();
+register_activation_hook( __FILE__, array( $wporg_plugin_directory, 'activate' ) );
+register_deactivation_hook( __FILE__, array( $wporg_plugin_directory, 'deactivate' ) );

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/readme-parser/ReadmeParser.php

@@ -1 +1 @@
 <?php
 /**
- * Custom readme parser
+ * Custom readme parser.
  *
  * Based on Automattic_Readme from http://code.google.com/p/wordpress-plugin-readme-parser/
@@ -10 +10 @@
  * @todo Create validator for this based on http://code.google.com/p/wordpress-plugin-readme-parser/source/browse/trunk/validator.php
  */
+
+/**
+ * Class Baikonur_ReadmeParser
+ */
 class Baikonur_ReadmeParser {
-
-    public static function parse_readme($file) {
-        $contents = file($file);
-        return self::parse_readme_contents($contents);
-    }
-
-    public static function parse_readme_contents($contents) {
-        if (is_string($contents)) {
-            $contents = explode("\n", $contents);
+    public static function parse_readme( $file ) {
+        $contents = file( $file );
+
+        return self::parse_readme_contents( $contents );
+    }
+
+    public static function parse_readme_contents( $contents ) {
+        if ( is_string( $contents ) ) {
+            $contents = explode( "\n", $contents );
         }
 
         $this_class = __CLASS__;
-        if (function_exists('get_called_class')) {
+        if ( function_exists( 'get_called_class' ) ) {
             $this_class = get_called_class();
         }
 
-        $contents = array_map(array($this_class, 'strip_newlines'), $contents);
+        $contents = array_map( array( $this_class, 'strip_newlines' ), $contents );
 
         // Strip BOM
-        if (strpos($contents[0], "\xEF\xBB\xBF") === 0) {
-            $contents[0] = substr($contents[0], 3);
+        if ( strpos( $contents[0], "\xEF\xBB\xBF" ) === 0 ) {
+            $contents[0] = substr( $contents[0], 3 );
         }
 
@@ -37 +41 @@
 
         // Defaults
-        $data->is_excerpt = false;
-        $data->is_truncated = false;
-        $data->tags = array();
-        $data->requires = '';
-        $data->tested = '';
-        $data->contributors = array();
-        $data->stable_tag = '';
-        $data->version = '';
-        $data->donate_link = '';
+        $data->is_excerpt        = false;
+        $data->is_truncated      = false;
+        $data->tags              = array();
+        $data->requires          = '';
+        $data->tested            = '';
+        $data->contributors      = array();
+        $data->stable_tag        = '';
+        $data->version           = '';
+        $data->donate_link       = '';
         $data->short_description = '';
-        $data->sections = array();
-        $data->changelog = array();
-        $data->upgrade_notice = array();
-        $data->screenshots = array();
+        $data->sections          = array();
+        $data->changelog         = array();
+        $data->upgrade_notice    = array();
+        $data->screenshots       = array();
         $data->remaining_content = array();
 
-        $line = call_user_func_array(array($this_class, 'get_first_nonwhitespace'), array(&$contents));
+        $line       = call_user_func_array( array( $this_class, 'get_first_nonwhitespace' ), array( &$contents ) );
         $data->name = $line;
-        $data->name = trim($data->name, "#= ");
+        $data->name = trim( $data->name, "#= " );
 
         // Parse headers
         $headers = array();
 
-        $line = call_user_func_array(array($this_class, 'get_first_nonwhitespace'), array(&$contents));
+        $line = call_user_func_array( array( $this_class, 'get_first_nonwhitespace' ), array( &$contents ) );
         do {
             $key = $value = null;
-            if (strpos($line, ':') === false) {
+            if ( strpos( $line, ':' ) === false ) {
                 break;
             }
-            $bits = explode(':', $line, 2);
-            list($key, $value) = $bits;
-            $key = strtolower(str_replace(array(' ', "\t"), '_', trim($key)));
-            if ($key === 'tags' && isset($headers['tags'])) {
-                $headers[$key] .= ',' . trim($value);
-            }
-            else {
-                $headers[$key] = trim($value);
-            }
-        }
-        while (($line = array_shift($contents)) !== null && ($line = trim($line)) && !empty($line));
-        array_unshift($contents, $line);
-
-        if (!empty($headers['tags'])) {
-            $data->tags = explode(',', $headers['tags']);
-            $data->tags = array_map('trim', $data->tags);
-        }
-        if (!empty($headers['requires'])) {
+            $bits = explode( ':', $line, 2 );
+            list( $key, $value ) = $bits;
+            $key = strtolower( str_replace( array( ' ', "\t" ), '_', trim( $key ) ) );
+            if ( $key === 'tags' && isset( $headers['tags'] ) ) {
+                $headers[ $key ] .= ',' . trim( $value );
+            } else {
+                $headers[ $key ] = trim( $value );
+            }
+        } while ( ( $line = array_shift( $contents ) ) !== null && ( $line = trim( $line ) ) && ! empty( $line ) );
+        array_unshift( $contents, $line );
+
+        if ( ! empty( $headers['tags'] ) ) {
+            $data->tags = explode( ',', $headers['tags'] );
+            $data->tags = array_map( 'trim', $data->tags );
+        }
+        if ( ! empty( $headers['requires'] ) ) {
             $data->requires = $headers['requires'];
         }
-        if (!empty($headers['requires_at_least'])) {
+        if ( ! empty( $headers['requires_at_least'] ) ) {
             $data->requires = $headers['requires_at_least'];
         }
-        if (!empty($headers['tested'])) {
+        if ( ! empty( $headers['tested'] ) ) {
             $data->tested = $headers['tested'];
         }
-        if (!empty($headers['tested_up_to'])) {
+        if ( ! empty( $headers['tested_up_to'] ) ) {
             $data->tested = $headers['tested_up_to'];
         }
-        if (!empty($headers['contributors'])) {
-            $data->contributors = explode(',', $headers['contributors']);
-            $data->contributors = array_map('trim', $data->contributors);
-        }
-        if (!empty($headers['stable_tag'])) {
+        if ( ! empty( $headers['contributors'] ) ) {
+            $data->contributors = explode( ',', $headers['contributors'] );
+            $data->contributors = array_map( 'trim', $data->contributors );
+        }
+        if ( ! empty( $headers['stable_tag'] ) ) {
             $data->stable_tag = $headers['stable_tag'];
         }
-        if (!empty($headers['donate_link'])) {
+        if ( ! empty( $headers['donate_link'] ) ) {
             $data->donate_link = $headers['donate_link'];
         }
-        if (!empty($headers['version'])) {
+        if ( ! empty( $headers['version'] ) ) {
             $data->version = $headers['version'];
-        }
-        else {
+        } else {
             $data->version = $data->stable_tag;
         }
 
         // Parse the short description
-        while (($line = array_shift($contents)) !== null) {
-            $trimmed = trim($line);
-            if (empty($trimmed)) {
+        while ( ( $line = array_shift( $contents ) ) !== null ) {
+            $trimmed = trim( $line );
+            if ( empty( $trimmed ) ) {
                 $data->short_description .= "\n";
                 continue;
             }
-            if ($trimmed[0] === '=' && isset($trimmed[1]) && $trimmed[1] === '=') {
-                array_unshift($contents, $line);
+            if ( $trimmed[0] === '=' && isset( $trimmed[1] ) && $trimmed[1] === '=' ) {
+                array_unshift( $contents, $line );
                 break;
             }
@@ -126 +127 @@
             $data->short_description .= $line . "\n";
         }
-        $data->short_description = trim($data->short_description);
-
-        $data->is_truncated = call_user_func_array(array($this_class, 'trim_short_desc'), array(&$data->short_description));
+        $data->short_description = trim( $data->short_description );
+
+        $data->is_truncated = call_user_func_array( array(
+            $this_class,
+            'trim_short_desc'
+        ), array( &$data->short_description ) );
 
         // Parse the rest of the body
         $current = '';
-        $special = array('description', 'installation', 'faq', 'frequently_asked_questions', 'screenshots', 'changelog', 'upgrade_notice');
-
-        while (($line = array_shift($contents)) !== null) {
-            $trimmed = trim($line);
-            if (empty($trimmed)) {
+        $special = array(
+            'description',
+            'installation',
+            'faq',
+            'frequently_asked_questions',
+            'screenshots',
+            'changelog',
+            'upgrade_notice'
+        );
+
+        while ( ( $line = array_shift( $contents ) ) !== null ) {
+            $trimmed = trim( $line );
+            if ( empty( $trimmed ) ) {
                 $current .= "\n";
                 continue;
             }
 
-            if ($trimmed[0] === '=' && isset($trimmed[1]) && $trimmed[1] === '=') {
-                if (!empty($title)) {
-                    $data->sections[$title] = trim($current);
-                }
-
-                $current = '';
-                $real_title = trim($line, "#= \t");
-                $title = strtolower(str_replace(' ', '_', $real_title));
-                if ($title === 'faq') {
+            if ( $trimmed[0] === '=' && isset( $trimmed[1] ) && $trimmed[1] === '=' ) {
+                if ( ! empty( $title ) ) {
+                    $data->sections[ $title ] = trim( $current );
+                }
+
+                $current    = '';
+                $real_title = trim( $line, "#= \t" );
+                $title      = strtolower( str_replace( ' ', '_', $real_title ) );
+                if ( $title === 'faq' ) {
                     $title = 'frequently_asked_questions';
-                }
-                elseif ($title === 'change_log') {
+                } elseif ( $title === 'change_log' ) {
                     $title = 'changelog';
                 }
-                if (!in_array($title, $special)) {
+                if ( ! in_array( $title, $special ) ) {
                     $current .= '<h3>' . $real_title . "</h3>";
                 }
@@ -164 +175 @@
         }
 
-        if (!empty($title)) {
-            $data->sections[$title] = trim($current);
-        }
-        $title = null;
+        if ( ! empty( $title ) ) {
+            $data->sections[ $title ] = trim( $current );
+        }
+        $title   = null;
         $current = null;
 
-        if (empty($data->sections['description'])) {
-            $data->sections['description'] = call_user_func(array($this_class, 'parse_markdown'), $data->short_description);
+        if ( empty( $data->sections['description'] ) ) {
+            $data->sections['description'] = call_user_func( array(
+                $this_class,
+                'parse_markdown'
+            ), $data->short_description );
         }
 
         // Parse changelog
-        if (!empty($data->sections['changelog'])) {
-            $lines = explode("\n", $data->sections['changelog']);
-            while (($line = array_shift($lines)) !== null) {
-                $trimmed = trim($line);
-                if (empty($trimmed)) {
+        if ( ! empty( $data->sections['changelog'] ) ) {
+            $lines = explode( "\n", $data->sections['changelog'] );
+            while ( ( $line = array_shift( $lines ) ) !== null ) {
+                $trimmed = trim( $line );
+                if ( empty( $trimmed ) ) {
                     continue;
                 }
 
-                if ($trimmed[0] === '=') {
-                    if (!empty($current)) {
-                        $data->changelog[$title] = trim($current);
+                if ( $trimmed[0] === '=' ) {
+                    if ( ! empty( $current ) ) {
+                        $data->changelog[ $title ] = trim( $current );
                     }
 
                     $current = '';
-                    $title = trim($line, "#= \t");
+                    $title   = trim( $line, "#= \t" );
                     continue;
                 }
@@ -196 +210 @@
             }
 
-            $data->changelog[$title] = trim($current);
-        }
-        $title = null;
+            $data->changelog[ $title ] = trim( $current );
+        }
+        $title   = null;
         $current = null;
 
-        if (isset($data->sections['upgrade_notice'])) {
-            $lines = explode("\n", $data->sections['upgrade_notice']);
-            while (($line = array_shift($lines)) !== null) {
-                $trimmed = trim($line);
-                if (empty($trimmed)) {
+        if ( isset( $data->sections['upgrade_notice'] ) ) {
+            $lines = explode( "\n", $data->sections['upgrade_notice'] );
+            while ( ( $line = array_shift( $lines ) ) !== null ) {
+                $trimmed = trim( $line );
+                if ( empty( $trimmed ) ) {
                     continue;
                 }
 
-                if ($trimmed[0] === '=') {
-                    if (!empty($current)) {
-                        $data->upgrade_notice[$title] = trim($current);
+                if ( $trimmed[0] === '=' ) {
+                    if ( ! empty( $current ) ) {
+                        $data->upgrade_notice[ $title ] = trim( $current );
                     }
 
                     $current = '';
-                    $title = trim($line, "#= \t");
+                    $title   = trim( $line, "#= \t" );
                     continue;
                 }
@@ -222 +236 @@
             }
 
-            if (!empty($title) && !empty($current)) {
-                $data->upgrade_notice[$title] = trim($current);
-            }
-            unset($data->sections['upgrade_notice']);
+            if ( ! empty( $title ) && ! empty( $current ) ) {
+                $data->upgrade_notice[ $title ] = trim( $current );
+            }
+            unset( $data->sections['upgrade_notice'] );
         }
 
         // Markdownify!
-
-        $data->sections = array_map(array($this_class, 'parse_markdown'), $data->sections);
-        $data->changelog = array_map(array($this_class, 'parse_markdown'), $data->changelog);
-        $data->upgrade_notice = array_map(array($this_class, 'parse_markdown'), $data->upgrade_notice);
-
-        if (isset($data->sections['screenshots'])) {
-            preg_match_all('#<li>(.*?)</li>#is', $data->sections['screenshots'], $screenshots, PREG_SET_ORDER);
-            if ($screenshots) {
-                foreach ((array) $screenshots as $ss) {
-                    $data->screenshots[] = trim($ss[1]);
-                }
-            }
-        }
-
-        // Rearrange stuff
-
+        $data->sections       = array_map( array( $this_class, 'parse_markdown' ), $data->sections );
+        $data->changelog      = array_map( array( $this_class, 'parse_markdown' ), $data->changelog );
+        $data->upgrade_notice = array_map( array( $this_class, 'parse_markdown' ), $data->upgrade_notice );
+
+        if ( isset( $data->sections['screenshots'] ) ) {
+            preg_match_all( '#<li>(.*?)</li>#is', $data->sections['screenshots'], $screenshots, PREG_SET_ORDER );
+            if ( $screenshots ) {
+                foreach ( (array) $screenshots as $ss ) {
+                    $data->screenshots[] = trim( $ss[1] );
+                }
+            }
+        }
+
+        // Rearrange stuff.
         $data->remaining_content = $data->sections;
-        $data->sections = array();
-
-        foreach ($special as $spec) {
-            if (isset($data->remaining_content[$spec])) {
-                $data->sections[$spec] = $data->remaining_content[$spec];
-                unset($data->remaining_content[$spec]);
+        $data->sections          = array();
+
+        foreach ( $special as $spec ) {
+            if ( isset( $data->remaining_content[ $spec ] ) ) {
+                $data->sections[ $spec ] = $data->remaining_content[ $spec ];
+                unset( $data->remaining_content[ $spec ] );
             }
         }
@@ -258 +270 @@
     }
 
-    protected static function get_first_nonwhitespace(&$contents) {
-        while (($line = array_shift($contents)) !== null) {
-            $trimmed = trim($line);
-            if (!empty($line)) {
+    protected static function get_first_nonwhitespace( &$contents ) {
+        while ( ( $line = array_shift( $contents ) ) !== null ) {
+            $trimmed = trim( $line );
+            if ( ! empty( $line ) ) {
                 break;
             }
@@ -269 +281 @@
     }
 
-    protected static function strip_newlines($line) {
-        return rtrim($line, "\r\n");
-    }
-
-    protected static function trim_short_desc(&$desc) {
-        if (function_exists('mb_strlen') && function_exists('mb_substr')) {
-            if (mb_strlen($desc) > 150) {
-                $desc = mb_substr($desc, 0, 150);
-                $desc = trim($desc);
+    protected static function strip_newlines( $line ) {
+        return rtrim( $line, "\r\n" );
+    }
+
+    protected static function trim_short_desc( &$desc ) {
+        if ( function_exists( 'mb_strlen' ) && function_exists( 'mb_substr' ) ) {
+            if ( mb_strlen( $desc ) > 150 ) {
+                $desc = mb_substr( $desc, 0, 150 );
+                $desc = trim( $desc );
+
                 return true;
             }
-        }
-        else {
-            if (strlen($desc) > 150) {
-                $desc = substr($desc, 0, 150);
-                $desc = trim($desc);
+        } else {
+            if ( strlen( $desc ) > 150 ) {
+                $desc = substr( $desc, 0, 150 );
+                $desc = trim( $desc );
+
                 return true;
             }
@@ -292 +305 @@
     }
 
-    protected static function parse_markdown($text) {
-        $text = self::code_trick($text);
-        $text = preg_replace('/^[\s]*=[\s]+(.+?)[\s]+=/m', "\n" . '<h4>$1</h4>' . "\n", $text);
-        $text = Markdown(trim($text));
-        return trim($text);
-    }
-
-    protected static function code_trick($text) {
+    protected static function parse_markdown( $text ) {
+        $text = self::code_trick( $text );
+        $text = preg_replace( '/^[\s]*=[\s]+(.+?)[\s]+=/m', "\n" . '<h4>$1</h4>' . "\n", $text );
+        $text = Markdown( trim( $text ) );
+
+        return trim( $text );
+    }
+
+    protected static function code_trick( $text ) {
         // If doing markdown, first take any user formatted code blocks and turn them into backticks so that
         // markdown will preserve things like underscores in code blocks
-        $text = preg_replace_callback("!(<pre><code>|<code>)(.*?)(</code></pre>|</code>)!s", array(__CLASS__, 'decodeit'), $text);
-
-        $text = str_replace(array("\r\n", "\r"), "\n", $text);
+        $text = preg_replace_callback( "!(<pre><code>|<code>)(.*?)(</code></pre>|</code>)!s", array( __CLASS__, 'decodeit' ), $text );
+        $text = str_replace( array( "\r\n", "\r" ), "\n", $text );
+
         // Markdown can do inline code, we convert bbPress style block level code to Markdown style
-        $text = preg_replace_callback("!(^|\n)([ \t]*?)`(.*?)`!s", array(__CLASS__, 'indent'), $text);
+        $text = preg_replace_callback( "!(^|\n)([ \t]*?)`(.*?)`!s", array( __CLASS__, 'indent' ), $text );
+
         return $text;
     }
 
-    protected static function indent($matches) {
+    protected static function indent( $matches ) {
         $text = $matches[3];
-        $text = preg_replace('|^|m', $matches[2] . '    ', $text);
+        $text = preg_replace( '|^|m', $matches[2] . '    ', $text );
+
         return $matches[1] . $text;
     }
 
-    protected static function decodeit($matches) {
-        $text = $matches[2];
-        $trans_table = array_flip(get_html_translation_table(HTML_ENTITIES));
-        $text = strtr($text, $trans_table);
-        $text = str_replace('<br />', '', $text);
-        $text = str_replace('&#38;', '&', $text);
-        $text = str_replace('&#39;', "'", $text);
-        if ( '<pre><code>' == $matches[1] )
+    protected static function decodeit( $matches ) {
+        $text        = $matches[2];
+        $trans_table = array_flip( get_html_translation_table( HTML_ENTITIES ) );
+        $text        = strtr( $text, $trans_table );
+        $text        = str_replace( '<br />', '', $text );
+        $text        = str_replace( '&#38;', '&', $text );
+        $text        = str_replace( '&#39;', "'", $text );
+
+            if ( '<pre><code>' == $matches[1] ) {
             $text = "\n$text\n";
+        }
+
         return "`$text`";
     }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/readme-parser/compat.php

@@ -1 +1 @@
 <?php
+/**
+ * WordPress.org Plugin Readme Parser.
+ *
+ * @package WPorg_Plugin_Directory
+ */
 
-if ( !defined('WORDPRESS_README_MARKDOWN') ) {
-    define('WORDPRESS_README_MARKDOWN', dirname(__FILE__) . '/markdown.php');
+if ( ! defined( 'WORDPRESS_README_MARKDOWN' ) ) {
+    define( 'WORDPRESS_README_MARKDOWN', dirname( __FILE__ ) . '/markdown.php' );
 }
 
-require_once(dirname(__FILE__) . '/ReadmeParser.php');
+require_once( dirname( __FILE__ ) . '/ReadmeParser.php' );
 
-class _WordPress_org_Readme extends Baikonur_ReadmeParser {
-    public static function parse_readme($file) {
-        $contents = file($file);
-        return self::parse_readme_contents($contents);
+/**
+ * Class WPorg_Readme
+ */
+class WPorg_Readme extends Baikonur_ReadmeParser {
+
+    /**
+     * @access public
+     *
+     * @param string $file File name.
+     * @return array
+     */
+    public static function parse_readme( $file ) {
+        $contents = file( $file );
+
+        return self::parse_readme_contents( $contents );
     }
 
-    public static function parse_readme_contents($contents) {
-        if (empty($contents)) {
+    /**
+     * @access public
+     *
+     * @param array $contents
+     * @return array
+     */
+    public static function parse_readme_contents( $contents ) {
+        if ( empty( $contents ) ) {
             return array();
         }
 
-        $result = parent::parse_readme_contents($contents);
-        foreach ($result->sections as &$section) {
-            $section = self::filter_text($section);
-        }
-        if (!empty($result->upgrade_notice)) {
-            foreach ($result->upgrade_notice as &$notice) {
-                $notice = self::sanitize_text($notice);
-            }
-        }
-        if (!empty($result->screenshots)) {
-            foreach ($result->screenshots as &$shot) {
-                $shot = self::filter_text($shot);
-            }
+        $result = parent::parse_readme_contents( $contents );
+        $result->sections = array_map( array( 'WPorg_Readme', 'filter_text' ), $result->sections );
+
+        if ( ! empty( $result->upgrade_notice ) ) {
+            $result->upgrade_notice = array_map( array( 'WPorg_Readme', 'sanitize_text' ), $result->upgrade_notice );
         }
 
-        if (!empty($result->remaining_content)) {
-            $result->remaining_content = implode("\n", $result->remaining_content);
-            $result->remaining_content = self::filter_text(str_replace("</h3>\n\n", "</h3>\n", $result->remaining_content));
+        if ( ! empty( $result->screenshots ) ) {
+            $result->screenshots = array_map( array( 'WPorg_Readme', 'filter_text' ), $result->screenshots );
         }
-        else {
+
+        if ( ! empty( $result->remaining_content ) ) {
+            $result->remaining_content = implode( "\n", $result->remaining_content );
+            $result->remaining_content = self::filter_text( str_replace( "</h3>\n\n", "</h3>\n", $result->remaining_content ) );
+        } else {
             $result->remaining_content = '';
         }
 
-        $result->name = self::sanitize_text($result->name);
+        $result->name = self::sanitize_text( $result->name );
         //$result->short_description = self::sanitize_text($result->short_description);
-        $result->donate_link = esc_url($result->donate_link);
+        $result->donate_link = esc_url( $result->donate_link );
 
         $result->requires_at_least = $result->requires;
-        $result->tested_up_to = $result->tested;
-        unset($result->requires, $result->tested);
-        $result = ((array) $result);
-        return $result;
+        $result->tested_up_to      = $result->tested;
+
+        unset( $result->requires, $result->tested );
+
+        return (array) $result;
     }
 
-    protected static function trim_short_desc(&$desc) {
-        $desc = self::sanitize_text($desc);
-        return parent::trim_short_desc($desc);
+    /**
+     * @access protected
+     *
+     * @param string $desc
+     * @return string
+     */
+    protected static function trim_short_desc( &$desc ) {
+        $desc = self::sanitize_text( $desc );
+        parent::trim_short_desc( $desc );
+
+        return $desc;
     }
 
+    /**
+     * @access protected
+     *
+     * @param string $text
+     * @return string
+     */
     protected static function sanitize_text( $text ) { // not fancy
-        $text = strip_tags($text);
-        $text = esc_html($text);
-        $text = trim($text);
+        $text = strip_tags( $text );
+        $text = esc_html( $text );
+        $text = trim( $text );
+
         return $text;
     }
 
+    /**
+     * @access protected
+     *
+     * @param string $text
+     * @return string
+     */
     protected static function filter_text( $text ) {
-        $text = trim($text);
+        $text = trim( $text );
         //$text = self::code_trick($text); // A better parser than Markdown's for: backticks -> CODE
 
         $allowed = array(
-            'a' => array(
-                'href' => array(),
+            'a'          => array(
+                'href'  => array(),
                 'title' => array(),
-                'rel' => array()),
-            'blockquote' => array('cite' => array()),
-            'br' => array(),
-            'p' => array(),
-            'code' => array(),
-            'pre' => array(),
-            'em' => array(),
-            'strong' => array(),
-            'ul' => array(),
-            'ol' => array(),
-            'li' => array(),
-            'h3' => array(),
-            'h4' => array()
+                'rel'   => array()
+            ),
+            'blockquote' => array( 'cite' => array() ),
+            'br'         => array(),
+            'p'          => array(),
+            'code'       => array(),
+            'pre'        => array(),
+            'em'         => array(),
+            'strong'     => array(),
+            'ul'         => array(),
+            'ol'         => array(),
+            'li'         => array(),
+            'h3'         => array(),
+            'h4'         => array(),
         );
 
-        $text = balanceTags($text);
+        $text = balanceTags( $text );
 
         $text = wp_kses( $text, $allowed );
-        $text = trim($text);
+        $text = trim( $text );
+
         return $text;
     }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/readme-parser/markdown.php

@@ -4 +4 @@
 #
 # PHP Markdown & Extra
-# Copyright (c) 2004-2009 Michel Fortin  
+# Copyright (c) 2004-2009 Michel Fortin
 # <http://michelf.com/projects/php-markdown/>
 #
 # Original Markdown
-# Copyright (c) 2004-2006 John Gruber  
+# Copyright (c) 2004-2006 John Gruber
 # <http://daringfireball.net/projects/markdown/>
 #
 
-
-define( 'MARKDOWN_VERSION',  "1.0.1n" ); # Sat 10 Oct 2009
-define( 'MARKDOWNEXTRA_VERSION',  "1.2.4" ); # Sat 10 Oct 2009
-
+define( 'MARKDOWN_VERSION', "1.0.1n" ); # Sat 10 Oct 2009
+define( 'MARKDOWNEXTRA_VERSION', "1.2.4" ); # Sat 10 Oct 2009
 
 #
@@ -22 +20 @@
 
 # Change to ">" for HTML output
-@define( 'MARKDOWN_EMPTY_ELEMENT_SUFFIX',  " />");
+@define( 'MARKDOWN_EMPTY_ELEMENT_SUFFIX', " />" );
 
 # Define the width of a tab for code blocks.
-@define( 'MARKDOWN_TAB_WIDTH',     4 );
+@define( 'MARKDOWN_TAB_WIDTH', 4 );
 
 # Optional title attribute for footnote links and backlinks.
-@define( 'MARKDOWN_FN_LINK_TITLE',         "" );
-@define( 'MARKDOWN_FN_BACKLINK_TITLE',     "" );
+@define( 'MARKDOWN_FN_LINK_TITLE', "" );
+@define( 'MARKDOWN_FN_BACKLINK_TITLE', "" );
 
 # Optional class attribute for footnote links and backlinks.
-@define( 'MARKDOWN_FN_LINK_CLASS',         "" );
-@define( 'MARKDOWN_FN_BACKLINK_CLASS',     "" );
-
+@define( 'MARKDOWN_FN_LINK_CLASS', "" );
+@define( 'MARKDOWN_FN_BACKLINK_CLASS', "" );
 
 #
@@ -41 +38 @@
 
 # Change to false to remove Markdown from posts and/or comments.
-@define( 'MARKDOWN_WP_POSTS',      true );
-@define( 'MARKDOWN_WP_COMMENTS',   true );
-
-
+@define( 'MARKDOWN_WP_POSTS', true );
+@define( 'MARKDOWN_WP_COMMENTS', true );
 
 ### Standard Function Interface ###
 
-@define( 'MARKDOWN_PARSER_CLASS',  'MarkdownExtra_Parser' );
-
-function Markdown($text) {
+@define( 'MARKDOWN_PARSER_CLASS', 'MarkdownExtra_Parser' );
+
+function Markdown( $text ) {
 #
 # Initialize the parser and return the result of its transform method.
@@ -56 +51 @@
     # Setup static parser variable.
     static $parser;
-    if (!isset($parser)) {
+    if ( ! isset( $parser ) ) {
         $parser_class = MARKDOWN_PARSER_CLASS;
-        $parser = new $parser_class;
+        $parser       = new $parser_class;
     }
 
     # Transform text using parser.
-    return $parser->transform($text);
+    return $parser->transform( $text );
 }
-
 
 ### WordPress Plugin Interface ###
@@ -77 +71 @@
 */
 
-if (isset($wp_version)) {
+if ( isset( $wp_version ) ) {
     # More details about how it works here:
     # <http://michelf.com/weblog/2005/wordpress-text-flow-vs-markdown/>
-    
+
     # Post content and excerpts
     # - Remove WordPress paragraph generator.
     # - Run Markdown on excerpt, then remove all tags.
     # - Add paragraph tag around the excerpt, but remove it for the excerpt rss.
-    if (MARKDOWN_WP_POSTS) {
-        remove_filter('the_content',     'wpautop');
-        remove_filter('the_content_rss', 'wpautop');
-        remove_filter('the_excerpt',     'wpautop');
-        add_filter('the_content',     'mdwp_MarkdownPost', 6);
-        add_filter('the_content_rss', 'mdwp_MarkdownPost', 6);
-        add_filter('get_the_excerpt', 'mdwp_MarkdownPost', 6);
-        add_filter('get_the_excerpt', 'trim', 7);
-        add_filter('the_excerpt',     'mdwp_add_p');
-        add_filter('the_excerpt_rss', 'mdwp_strip_p');
-        
-        remove_filter('content_save_pre',  'balanceTags', 50);
-        remove_filter('excerpt_save_pre',  'balanceTags', 50);
-        add_filter('the_content',     'balanceTags', 50);
-        add_filter('get_the_excerpt', 'balanceTags', 9);
-    }
-    
+    if ( MARKDOWN_WP_POSTS ) {
+        remove_filter( 'the_content', 'wpautop' );
+        remove_filter( 'the_content_rss', 'wpautop' );
+        remove_filter( 'the_excerpt', 'wpautop' );
+        add_filter( 'the_content', 'mdwp_MarkdownPost', 6 );
+        add_filter( 'the_content_rss', 'mdwp_MarkdownPost', 6 );
+        add_filter( 'get_the_excerpt', 'mdwp_MarkdownPost', 6 );
+        add_filter( 'get_the_excerpt', 'trim', 7 );
+        add_filter( 'the_excerpt', 'mdwp_add_p' );
+        add_filter( 'the_excerpt_rss', 'mdwp_strip_p' );
+
+        remove_filter( 'content_save_pre', 'balanceTags', 50 );
+        remove_filter( 'excerpt_save_pre', 'balanceTags', 50 );
+        add_filter( 'the_content', 'balanceTags', 50 );
+        add_filter( 'get_the_excerpt', 'balanceTags', 9 );
+    }
+
     # Add a footnote id prefix to posts when inside a loop.
-    function mdwp_MarkdownPost($text) {
+    function mdwp_MarkdownPost( $text ) {
         static $parser;
-        if (!$parser) {
+        if ( ! $parser ) {
             $parser_class = MARKDOWN_PARSER_CLASS;
-            $parser = new $parser_class;
-        }
-        if (is_single() || is_page() || is_feed()) {
+            $parser       = new $parser_class;
+        }
+        if ( is_single() || is_page() || is_feed() ) {
             $parser->fn_id_prefix = "";
         } else {
             $parser->fn_id_prefix = get_the_ID() . ".";
         }
-        return $parser->transform($text);
-    }
-    
+
+        return $parser->transform( $text );
+    }
+
     # Comments
     # - Remove WordPress paragraph generator.
@@ -122 +117 @@
     # - Scramble important tags before passing them to the kses filter.
     # - Run Markdown on excerpt then remove paragraph tags.
-    if (MARKDOWN_WP_COMMENTS) {
-        remove_filter('comment_text', 'wpautop', 30);
-        remove_filter('comment_text', 'make_clickable');
-        add_filter('pre_comment_content', 'Markdown', 6);
-        add_filter('pre_comment_content', 'mdwp_hide_tags', 8);
-        add_filter('pre_comment_content', 'mdwp_show_tags', 12);
-        add_filter('get_comment_text',    'Markdown', 6);
-        add_filter('get_comment_excerpt', 'Markdown', 6);
-        add_filter('get_comment_excerpt', 'mdwp_strip_p', 7);
-    
+    if ( MARKDOWN_WP_COMMENTS ) {
+        remove_filter( 'comment_text', 'wpautop', 30 );
+        remove_filter( 'comment_text', 'make_clickable' );
+        add_filter( 'pre_comment_content', 'Markdown', 6 );
+        add_filter( 'pre_comment_content', 'mdwp_hide_tags', 8 );
+        add_filter( 'pre_comment_content', 'mdwp_show_tags', 12 );
+        add_filter( 'get_comment_text', 'Markdown', 6 );
+        add_filter( 'get_comment_excerpt', 'Markdown', 6 );
+        add_filter( 'get_comment_excerpt', 'mdwp_strip_p', 7 );
+
         global $mdwp_hidden_tags, $mdwp_placeholders;
-        $mdwp_hidden_tags = explode(' ',
-            '<p> </p> <pre> </pre> <ol> </ol> <ul> </ul> <li> </li>');
-        $mdwp_placeholders = explode(' ', str_rot13(
-            'pEj07ZbbBZ U1kqgh4w4p pre2zmeN6K QTi31t9pre ol0MP1jzJR '.
-            'ML5IjmbRol ulANi1NsGY J7zRLJqPul liA8ctl16T K9nhooUHli'));
-    }
-    
-    function mdwp_add_p($text) {
-        if (!preg_match('{^$|^<(p|ul|ol|dl|pre|blockquote)>}i', $text)) {
-            $text = '<p>'.$text.'</p>';
-            $text = preg_replace('{\n{2,}}', "</p>\n\n<p>", $text);
-        }
+        $mdwp_hidden_tags  = explode( ' ',
+            '<p> </p> <pre> </pre> <ol> </ol> <ul> </ul> <li> </li>' );
+        $mdwp_placeholders = explode( ' ', str_rot13(
+            'pEj07ZbbBZ U1kqgh4w4p pre2zmeN6K QTi31t9pre ol0MP1jzJR ' .
+            'ML5IjmbRol ulANi1NsGY J7zRLJqPul liA8ctl16T K9nhooUHli' ) );
+    }
+
+    function mdwp_add_p( $text ) {
+        if ( ! preg_match( '{^$|^<(p|ul|ol|dl|pre|blockquote)>}i', $text ) ) {
+            $text = '<p>' . $text . '</p>';
+            $text = preg_replace( '{\n{2,}}', "</p>\n\n<p>", $text );
+        }
+
         return $text;
     }
-    
-    function mdwp_strip_p($t) { return preg_replace('{</?p>}i', '', $t); }
-
-    function mdwp_hide_tags($text) {
+
+    function mdwp_strip_p( $t ) {
+        return preg_replace( '{</?p>}i', '', $t );
+    }
+
+    function mdwp_hide_tags( $text ) {
         global $mdwp_hidden_tags, $mdwp_placeholders;
-        return str_replace($mdwp_hidden_tags, $mdwp_placeholders, $text);
-    }
-    function mdwp_show_tags($text) {
+
+        return str_replace( $mdwp_hidden_tags, $mdwp_placeholders, $text );
+    }
+
+    function mdwp_show_tags( $text ) {
         global $mdwp_hidden_tags, $mdwp_placeholders;
-        return str_replace($mdwp_placeholders, $mdwp_hidden_tags, $text);
+
+        return str_replace( $mdwp_placeholders, $mdwp_hidden_tags, $text );
     }
 }
-
 
 ### bBlog Plugin Info ###
@@ -165 +165 @@
 function identify_modifier_markdown() {
     return array(
-        'name' => 'markdown',
-        'type' => 'modifier',
-        'nicename' => 'PHP Markdown Extra',
+        'name'        => 'markdown',
+        'type'        => 'modifier',
+        'nicename'    => 'PHP Markdown Extra',
         'description' => 'A text-to-HTML conversion tool for web writers',
-        'authors' => 'Michel Fortin and John Gruber',
-        'licence' => 'GPL',
-        'version' => MARKDOWNEXTRA_VERSION,
-        'help' => '<a href="http://daringfireball.net/projects/markdown/syntax">Markdown syntax</a> allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by <a href="http://daringfireball.net/">John Gruber</a>. <a href="http://michelf.com/projects/php-markdown/">More...</a>',
-        );
+        'authors'     => 'Michel Fortin and John Gruber',
+        'licence'     => 'GPL',
+        'version'     => MARKDOWNEXTRA_VERSION,
+        'help'        => '<a href="http://daringfireball.net/projects/markdown/syntax">Markdown syntax</a> allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by <a href="http://daringfireball.net/">John Gruber</a>. <a href="http://michelf.com/projects/php-markdown/">More...</a>',
+    );
 }
 
-
 ### Smarty Modifier Interface ###
 
-function smarty_modifier_markdown($text) {
-    return Markdown($text);
+function smarty_modifier_markdown( $text ) {
+    return Markdown( $text );
 }
 
-
 ### Textile Compatibility Mode ###
 
 # Rename this file to "classTextile.php" and it can replace Textile everywhere.
 
-if (strcasecmp(substr(__FILE__, -16), "classTextile.php") == 0) {
+if ( strcasecmp( substr( __FILE__, - 16 ), "classTextile.php" ) == 0 ) {
     # Try to include PHP SmartyPants. Should be in the same directory.
     @include_once 'smartypants.php';
+
     # Fake Textile class. It calls Markdown instead.
     class Textile {
-        function TextileThis($text, $lite='', $encode='') {
-            if ($lite == '' && $encode == '')    $text = Markdown($text);
-            if (function_exists('SmartyPants'))  $text = SmartyPants($text);
+        function TextileThis( $text, $lite = '', $encode = '' ) {
+            if ( $lite == '' && $encode == '' ) {
+                $text = Markdown( $text );
+            }
+            if ( function_exists( 'SmartyPants' ) ) {
+                $text = SmartyPants( $text );
+            }
+
             return $text;
         }
+
         # Fake restricted version: restrictions are not supported for now.
-        function TextileRestricted($text, $lite='', $noimage='') {
-            return $this->TextileThis($text, $lite);
-        }
+        function TextileRestricted( $text, $lite = '', $noimage = '' ) {
+            return $this->TextileThis( $text, $lite );
+        }
+
         # Workaround to ensure compatibility with TextPattern 4.0.3.
-        function blockLite($text) { return $text; }
+        function blockLite( $text ) {
+            return $text;
+        }
     }
 }
-
-
 
 #
@@ -214 +220 @@
 
 class Markdown_Parser {
-
     # Regex to match balanced [brackets].
     # Needed to insert a maximum bracked depth while converting to PHP.
     var $nested_brackets_depth = 6;
     var $nested_brackets_re;
-    
     var $nested_url_parenthesis_depth = 4;
     var $nested_url_parenthesis_re;
-
     # Table of hash values for escaped characters:
     var $escape_chars = '\`*_{}[]()>#+-.!';
     var $escape_chars_re;
-
     # Change to ">" for HTML output.
     var $empty_element_suffix = MARKDOWN_EMPTY_ELEMENT_SUFFIX;
     var $tab_width = MARKDOWN_TAB_WIDTH;
-    
     # Change to `true` to disallow markup or entities.
     var $no_markup = false;
     var $no_entities = false;
-    
     # Predefined urls and titles for reference links and images.
     var $predef_urls = array();
     var $predef_titles = array();
 
-
     function Markdown_Parser() {
-    #
-    # Constructor function. Initialize appropriate member variables.
-    #
+        #
+        # Constructor function. Initialize appropriate member variables.
+        #
         $this->_initDetab();
         $this->prepareItalicsAndBold();
-    
-        $this->nested_brackets_re = 
-            str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth).
-            str_repeat('\])*', $this->nested_brackets_depth);
-    
-        $this->nested_url_parenthesis_re = 
-            str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth).
-            str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth);
-        
-        $this->escape_chars_re = '['.preg_quote($this->escape_chars).']';
-        
+
+        $this->nested_brackets_re =
+            str_repeat( '(?>[^\[\]]+|\[', $this->nested_brackets_depth ) .
+            str_repeat( '\])*', $this->nested_brackets_depth );
+
+        $this->nested_url_parenthesis_re =
+            str_repeat( '(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth ) .
+            str_repeat( '(?>\)))*', $this->nested_url_parenthesis_depth );
+
+        $this->escape_chars_re = '[' . preg_quote( $this->escape_chars ) . ']';
+
         # Sort document, block, and span gamut in ascendent priority order.
-        asort($this->document_gamut);
-        asort($this->block_gamut);
-        asort($this->span_gamut);
-    }
-
+        asort( $this->document_gamut );
+        asort( $this->block_gamut );
+        asort( $this->span_gamut );
+    }
 
     # Internal hashes used during transformation.
@@ -268 +266 @@
     var $titles = array();
     var $html_hashes = array();
-    
     # Status flag to avoid invalid nesting.
     var $in_anchor = false;
-    
-    
+
     function setup() {
-    #
-    # Called before the transformation process starts to setup parser 
-    # states.
-    #
+        #
+        # Called before the transformation process starts to setup parser
+        # states.
+        #
         # Clear global hashes.
-        $this->urls = $this->predef_urls;
-        $this->titles = $this->predef_titles;
+        $this->urls        = $this->predef_urls;
+        $this->titles      = $this->predef_titles;
         $this->html_hashes = array();
-        
+
         $in_anchor = false;
     }
-    
+
     function teardown() {
-    #
-    # Called after the transformation process to clear any variable 
-    # which may be taking up memory unnecessarly.
-    #
-        $this->urls = array();
-        $this->titles = array();
+        #
+        # Called after the transformation process to clear any variable
+        # which may be taking up memory unnecessarly.
+        #
+        $this->urls        = array();
+        $this->titles      = array();
         $this->html_hashes = array();
     }
 
-
-    function transform($text) {
-    #
-    # Main function. Performs some preprocessing on the input text
-    # and pass it through the document gamut.
-    #
+    function transform( $text ) {
+        #
+        # Main function. Performs some preprocessing on the input text
+        # and pass it through the document gamut.
+        #
         $this->setup();
-    
+
         # Remove UTF-8 BOM and marker character in input, if present.
-        $text = preg_replace('{^\xEF\xBB\xBF|\x1A}', '', $text);
+        $text = preg_replace( '{^\xEF\xBB\xBF|\x1A}', '', $text );
 
         # Standardize line endings:
         #   DOS to Unix and Mac to Unix
-        $text = preg_replace('{\r\n?}', "\n", $text);
+        $text = preg_replace( '{\r\n?}', "\n", $text );
 
         # Make sure $text ends with a couple of newlines:
@@ -315 +310 @@
 
         # Convert all tabs to spaces.
-        $text = $this->detab($text);
+        $text = $this->detab( $text );
 
         # Turn block-level HTML blocks into hash entries
-        $text = $this->hashHTMLBlocks($text);
+        $text = $this->hashHTMLBlocks( $text );
 
         # Strip any lines consisting only of spaces and tabs.
@@ -324 +319 @@
         # match consecutive blank lines with /\n+/ instead of something
         # contorted like /[ ]*\n+/ .
-        $text = preg_replace('/^[ ]+$/m', '', $text);
+        $text = preg_replace( '/^[ ]+$/m', '', $text );
 
         # Run document gamut methods.
-        foreach ($this->document_gamut as $method => $priority) {
-            $text = $this->$method($text);
-        }
-        
+        foreach ( $this->document_gamut as $method => $priority ) {
+            $text = $this->$method( $text );
+        }
+
         $this->teardown();
 
         return $text . "\n";
     }
-    
+
     var $document_gamut = array(
         # Strip link definitions, store in hashes.
         "stripLinkDefinitions" => 20,
-        
         "runBasicBlockGamut"   => 30,
-        );
-
-
-    function stripLinkDefinitions($text) {
-    #
-    # Strips link definitions from text, stores the URLs and titles in
-    # hash references.
-    #
+    );
+
+    function stripLinkDefinitions( $text ) {
+        #
+        # Strips link definitions from text, stores the URLs and titles in
+        # hash references.
+        #
         $less_than_tab = $this->tab_width - 1;
 
         # Link defs are in the form: ^[id]: url "optional title"
-        $text = preg_replace_callback('{
-                            ^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?: # id = $1
+        $text = preg_replace_callback( '{
+                            ^[ ]{0,' . $less_than_tab . '}\[(.+)\][ ]?: # id = $1
                               [ ]*
                               \n?               # maybe *one* newline
@@ -374 +367 @@
                             (?:\n+|\Z)
             }xm',
-            array(&$this, '_stripLinkDefinitions_callback'),
-            $text);
+            array( &$this, '_stripLinkDefinitions_callback' ),
+            $text );
+
         return $text;
     }
-    function _stripLinkDefinitions_callback($matches) {
-        $link_id = strtolower($matches[1]);
-        $url = $matches[2] == '' ? $matches[3] : $matches[2];
-        $this->urls[$link_id] = $url;
-        $this->titles[$link_id] =& $matches[4];
+
+    function _stripLinkDefinitions_callback( $matches ) {
+        $link_id                  = strtolower( $matches[1] );
+        $url                      = $matches[2] == '' ? $matches[3] : $matches[2];
+        $this->urls[ $link_id ]   = $url;
+        $this->titles[ $link_id ] =& $matches[4];
+
         return ''; # String that will replace the block
     }
 
-
-    function hashHTMLBlocks($text) {
-        if ($this->no_markup)  return $text;
+    function hashHTMLBlocks( $text ) {
+        if ( $this->no_markup ) {
+            return $text;
+        }
 
         $less_than_tab = $this->tab_width - 1;
@@ -400 +397 @@
         #
         # *  List "a" is made of tags which can be both inline or block-level.
-        #    These will be treated block-level when the start tag is alone on 
-        #    its line, otherwise they're not matched here and will be taken as 
+        #    These will be treated block-level when the start tag is alone on
+        #    its line, otherwise they're not matched here and will be taken as
         #    inline later.
         # *  List "b" is made of tags which are always block-level;
         #
         $block_tags_a_re = 'ins|del';
-        $block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'.
-                           'script|noscript|form|fieldset|iframe|math';
+        $block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|' .
+                           'script|noscript|form|fieldset|iframe|math';
 
         # Regular expression for the content of a block tag.
         $nested_tags_level = 4;
-        $attr = '
+        $attr              = '
             (?>             # optional tag attributes
               \s            # starts with whitespace
@@ -423 +420 @@
                 \'[^\']*\'  # text inside single quotes (tolerate ">")
               )*
-            )?  
+            )?
             ';
-        $content =
-            str_repeat('
+        $content           =
+            str_repeat( '
                 (?>
                   [^<]+         # content without tag
                 |
                   <\2           # nested opening tag
-                    '.$attr.'   # attributes
+                    ' . $attr . '   # attributes
                     (?>
                       />
                     |
-                      >', $nested_tags_level).  # end of opening tag
-                      '.*?'.                    # last level nested tag content
-            str_repeat('
+                      >', $nested_tags_level ) .    # end of opening tag
+            '.*?' .                    # last level nested tag content
+            str_repeat( '
                       </\2\s*>  # closing nested tag
                     )
-                  |             
+                  |
                     <(?!/\2\s*> # other tags with a different name
                   )
                 )*',
-                $nested_tags_level);
-        $content2 = str_replace('\2', '\3', $content);
+                $nested_tags_level );
+        $content2          = str_replace( '\2', '\3', $content );
 
         # First, look for nested blocks, e.g.:
@@ -458 +455 @@
         # We need to do this before the next, more liberal match, because the next
         # match will start at the first `<div>` and stop at the first `</div>`.
-        $text = preg_replace_callback('{(?>
+        $text = preg_replace_callback( '{(?>
             (?>
                 (?<=\n\n)       # Starting after a blank line
@@ -466 +463 @@
             (                       # save in $1
 
-              # Match from `\n<tag>` to `</tag>\n`, handling nested tags 
+              # Match from `\n<tag>` to `</tag>\n`, handling nested tags
               # in between.
-                    
-                        [ ]{0,'.$less_than_tab.'}
-                        <('.$block_tags_b_re.')# start tag = $2
-                        '.$attr.'>          # attributes followed by > and \n
-                        '.$content.'        # content, support nesting
+
+                        [ ]{0,' . $less_than_tab . '}
+                        <(' . $block_tags_b_re . ')# start tag = $2
+                        ' . $attr . '>          # attributes followed by > and \n
+                        ' . $content . '        # content, support nesting
                         </\2>               # the matching end tag
                         [ ]*                # trailing spaces/tabs
@@ -479 +476 @@
             | # Special version for tags of group a.
 
-                        [ ]{0,'.$less_than_tab.'}
-                        <('.$block_tags_a_re.')# start tag = $3
-                        '.$attr.'>[ ]*\n    # attributes followed by >
-                        '.$content2.'       # content, support nesting
+                        [ ]{0,' . $less_than_tab . '}
+                        <(' . $block_tags_a_re . ')# start tag = $3
+                        ' . $attr . '>[ ]*\n    # attributes followed by >
+                        ' . $content2 . '       # content, support nesting
                         </\3>               # the matching end tag
                         [ ]*                # trailing spaces/tabs
                         (?=\n+|\Z)  # followed by a newline or end of document
-                    
-            | # Special case just for <hr />. It was easier to make a special 
+
+            | # Special case just for <hr />. It was easier to make a special
               # case than to make the other regex more complicated.
-            
-                        [ ]{0,'.$less_than_tab.'}
+
+                        [ ]{0,' . $less_than_tab . '}
                         <(hr)               # start tag = $2
-                        '.$attr.'           # attributes
+                        ' . $attr . '           # attributes
                         /?>                 # the matching end tag
                         [ ]*
                         (?=\n{2,}|\Z)       # followed by a blank line or end of document
-            
+
             | # Special case for standalone HTML comments:
-            
-                    [ ]{0,'.$less_than_tab.'}
+
+                    [ ]{0,' . $less_than_tab . '}
                     (?s:
                         <!-- .*? -->
@@ -505 +502 @@
                     [ ]*
                     (?=\n{2,}|\Z)       # followed by a blank line or end of document
-            
+
             | # PHP and ASP-style processor instructions (<? and <%)
-            
-                    [ ]{0,'.$less_than_tab.'}
+
+                    [ ]{0,' . $less_than_tab . '}
                     (?s:
                         <([?%])         # $2
@@ -516 +513 @@
                     [ ]*
                     (?=\n{2,}|\Z)       # followed by a blank line or end of document
-                    
+
             )
             )}Sxmi',
-            array(&$this, '_hashHTMLBlocks_callback'),
-            $text);
+            array( &$this, '_hashHTMLBlocks_callback' ),
+            $text );
 
         return $text;
     }
-    function _hashHTMLBlocks_callback($matches) {
+
+    function _hashHTMLBlocks_callback( $matches ) {
         $text = $matches[1];
-        $key  = $this->hashBlock($text);
+        $key  = $this->hashBlock( $text );
+
         return "\n\n$key\n\n";
     }
-    
-    
-    function hashPart($text, $boundary = 'X') {
-    #
-    # Called whenever a tag must be hashed when a function insert an atomic 
-    # element in the text stream. Passing $text to through this function gives
-    # a unique text-token which will be reverted back when calling unhash.
-    #
-    # The $boundary argument specify what character should be used to surround
-    # the token. By convension, "B" is used for block elements that needs not
-    # to be wrapped into paragraph tags at the end, ":" is used for elements
-    # that are word separators and "X" is used in the general case.
-    #
+
+    function hashPart( $text, $boundary = 'X' ) {
+        #
+        # Called whenever a tag must be hashed when a function insert an atomic
+        # element in the text stream. Passing $text to through this function gives
+        # a unique text-token which will be reverted back when calling unhash.
+        #
+        # The $boundary argument specify what character should be used to surround
+        # the token. By convension, "B" is used for block elements that needs not
+        # to be wrapped into paragraph tags at the end, ":" is used for elements
+        # that are word separators and "X" is used in the general case.
+        #
         # Swap back any tag hash found in $text so we do not have to `unhash`
         # multiple times at the end.
-        $text = $this->unhash($text);
-        
+        $text = $this->unhash( $text );
+
         # Then hash the block.
         static $i = 0;
-        $key = "$boundary\x1A" . ++$i . $boundary;
-        $this->html_hashes[$key] = $text;
+        $key                       = "$boundary\x1A" . ++ $i . $boundary;
+        $this->html_hashes[ $key ] = $text;
+
         return $key; # String that will replace the tag.
     }
 
-
-    function hashBlock($text) {
-    #
-    # Shortcut function for hashPart with block-level boundaries.
-    #
-        return $this->hashPart($text, 'B');
-    }
-
+    function hashBlock( $text ) {
+        #
+        # Shortcut function for hashPart with block-level boundaries.
+        #
+        return $this->hashPart( $text, 'B' );
+    }
 
     var $block_gamut = array(
-    #
-    # These are all the transformations that form block-level
-    # tags like paragraphs, headers, and list items.
-    #
+        #
+        # These are all the transformations that form block-level
+        # tags like paragraphs, headers, and list items.
+        #
         "doHeaders"         => 10,
         "doHorizontalRules" => 20,
-        
         "doLists"           => 40,
         "doCodeBlocks"      => 50,
         "doBlockQuotes"     => 60,
-        );
-
-    function runBlockGamut($text) {
-    #
-    # Run block gamut tranformations.
-    #
-        # We need to escape raw HTML in Markdown source before doing anything 
-        # else. This need to be done for each block, and not only at the 
+    );
+
+    function runBlockGamut( $text ) {
+        #
+        # Run block gamut tranformations.
+        #
+        # We need to escape raw HTML in Markdown source before doing anything
+        # else. This need to be done for each block, and not only at the
         # begining in the Markdown function since hashed blocks can be part of
-        # list items and could have been indented. Indented blocks would have 
+        # list items and could have been indented. Indented blocks would have
         # been seen as a code block in a previous pass of hashHTMLBlocks.
-        $text = $this->hashHTMLBlocks($text);
-        
-        return $this->runBasicBlockGamut($text);
-    }
-    
-    function runBasicBlockGamut($text) {
-    #
-    # Run block gamut tranformations, without hashing HTML blocks. This is 
-    # useful when HTML blocks are known to be already hashed, like in the first
-    # whole-document pass.
-    #
-        foreach ($this->block_gamut as $method => $priority) {
-            $text = $this->$method($text);
-        }
-        
+        $text = $this->hashHTMLBlocks( $text );
+
+        return $this->runBasicBlockGamut( $text );
+    }
+
+    function runBasicBlockGamut( $text ) {
+        #
+        # Run block gamut tranformations, without hashing HTML blocks. This is
+        # useful when HTML blocks are known to be already hashed, like in the first
+        # whole-document pass.
+        #
+        foreach ( $this->block_gamut as $method => $priority ) {
+            $text = $this->$method( $text );
+        }
+
         # Finally form paragraph and restore hashed blocks.
-        $text = $this->formParagraphs($text);
+        $text = $this->formParagraphs( $text );
 
         return $text;
     }
-    
-    
-    function doHorizontalRules($text) {
+
+    function doHorizontalRules( $text ) {
         # Do Horizontal Rules:
         return preg_replace(
@@ -619 +614 @@
                 $           # End of line.
             }mx',
-            "\n".$this->hashBlock("<hr$this->empty_element_suffix")."\n", 
-            $text);
-    }
-
+            "\n" . $this->hashBlock( "<hr$this->empty_element_suffix" ) . "\n",
+            $text );
+    }
 
     var $span_gamut = array(
-    #
-    # These are all the transformations that occur *within* block-level
-    # tags like paragraphs, headers, and list items.
-    #
+        #
+        # These are all the transformations that occur *within* block-level
+        # tags like paragraphs, headers, and list items.
+        #
         # Process character escapes, code spans, and inline HTML
         # in one shot.
-        "parseSpan"           => -30,
-
+        "parseSpan"           => - 30,
         # Process anchor and image tags. Images must come first,
         # because ![foo][f] looks like an anchor.
-        "doImages"            =>  10,
-        "doAnchors"           =>  20,
-        
+        "doImages"            => 10,
+        "doAnchors"           => 20,
         # Make links out of things like `<http://example.com/>`
         # Must come after doAnchors, because you can use < and >
         # delimiters in inline links like [this](<url>).
-        "doAutoLinks"         =>  30,
-        "encodeAmpsAndAngles" =>  40,
-
-        "doItalicsAndBold"    =>  50,
-        "doHardBreaks"        =>  60,
-        );
-
-    function runSpanGamut($text) {
-    #
-    # Run span gamut tranformations.
-    #
-        foreach ($this->span_gamut as $method => $priority) {
-            $text = $this->$method($text);
+        "doAutoLinks"         => 30,
+        "encodeAmpsAndAngles" => 40,
+        "doItalicsAndBold"    => 50,
+        "doHardBreaks"        => 60,
+    );
+
+    function runSpanGamut( $text ) {
+        #
+        # Run span gamut tranformations.
+        #
+        foreach ( $this->span_gamut as $method => $priority ) {
+            $text = $this->$method( $text );
         }
 
         return $text;
     }
-    
-    
-    function doHardBreaks($text) {
+
+    function doHardBreaks( $text ) {
         # Do hard breaks:
-        return preg_replace_callback('/ {2,}\n/', 
-            array(&$this, '_doHardBreaks_callback'), $text);
-    }
-    function _doHardBreaks_callback($matches) {
-        return $this->hashPart("<br$this->empty_element_suffix\n");
-    }
-
-
-    function doAnchors($text) {
-    #
-    # Turn Markdown link shortcuts into XHTML <a> tags.
-    #
-        if ($this->in_anchor) return $text;
+        return preg_replace_callback( '/ {2,}\n/',
+            array( &$this, '_doHardBreaks_callback' ), $text );
+    }
+
+    function _doHardBreaks_callback( $matches ) {
+        return $this->hashPart( "<br$this->empty_element_suffix\n" );
+    }
+
+    function doAnchors( $text ) {
+        #
+        # Turn Markdown link shortcuts into XHTML <a> tags.
+        #
+        if ( $this->in_anchor ) {
+            return $text;
+        }
         $this->in_anchor = true;
-        
+
         #
         # First, handle reference-style links: [link text] [id]
         #
-        $text = preg_replace_callback('{
+        $text = preg_replace_callback( '{
             (                   # wrap whole match in $1
               \[
-                ('.$this->nested_brackets_re.') # link text = $2
+                (' . $this->nested_brackets_re . ') # link text = $2
               \]
 
@@ -694 +686 @@
             )
             }xs',
-            array(&$this, '_doAnchors_reference_callback'), $text);
+            array( &$this, '_doAnchors_reference_callback' ), $text );
 
         #
         # Next, inline-style links: [link text](url "optional title")
         #
-        $text = preg_replace_callback('{
+        $text = preg_replace_callback( '{
             (               # wrap whole match in $1
               \[
-                ('.$this->nested_brackets_re.') # link text = $2
+                (' . $this->nested_brackets_re . ') # link text = $2
               \]
               \(            # literal paren
@@ -709 +701 @@
                     <(.+?)> # href = $3
                 |
-                    ('.$this->nested_url_parenthesis_re.')  # href = $4
+                    (' . $this->nested_url_parenthesis_re . ')  # href = $4
                 )
                 [ \n]*
@@ -721 +713 @@
             )
             }xs',
-            array(&$this, '_doAnchors_inline_callback'), $text);
+            array( &$this, '_doAnchors_inline_callback' ), $text );
 
         #
@@ -728 +720 @@
         # or [link text](/foo)
         #
-        $text = preg_replace_callback('{
+        $text = preg_replace_callback( '{
             (                   # wrap whole match in $1
               \[
@@ -735 +727 @@
             )
             }xs',
-            array(&$this, '_doAnchors_reference_callback'), $text);
+            array( &$this, '_doAnchors_reference_callback' ), $text );
 
         $this->in_anchor = false;
+
         return $text;
     }
-    function _doAnchors_reference_callback($matches) {
-        $whole_match =  $matches[1];
-        $link_text   =  $matches[2];
+
+    function _doAnchors_reference_callback( $matches ) {
+        $whole_match = $matches[1];
+        $link_text   = $matches[2];
         $link_id     =& $matches[3];
 
-        if ($link_id == "") {
+        if ( $link_id == "" ) {
             # for shortcut links like [this][] or [this].
             $link_id = $link_text;
         }
-        
+
         # lower-case and turn embedded newlines into spaces
-        $link_id = strtolower($link_id);
-        $link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
-
-        if (isset($this->urls[$link_id])) {
-            $url = $this->urls[$link_id];
-            $url = $this->encodeAttribute($url);
-            
+        $link_id = strtolower( $link_id );
+        $link_id = preg_replace( '{[ ]?\n}', ' ', $link_id );
+
+        if ( isset( $this->urls[ $link_id ] ) ) {
+            $url = $this->urls[ $link_id ];
+            $url = $this->encodeAttribute( $url );
+
             $result = "<a href=\"$url\"";
-            if ( isset( $this->titles[$link_id] ) ) {
-                $title = $this->titles[$link_id];
-                $title = $this->encodeAttribute($title);
-                $result .=  " title=\"$title\"";
-            }
-        
-            $link_text = $this->runSpanGamut($link_text);
+            if ( isset( $this->titles[ $link_id ] ) ) {
+                $title = $this->titles[ $link_id ];
+                $title = $this->encodeAttribute( $title );
+                $result .= " title=\"$title\"";
+            }
+
+            $link_text = $this->runSpanGamut( $link_text );
             $result .= ">$link_text</a>";
-            $result = $this->hashPart($result);
-        }
-        else {
+            $result = $this->hashPart( $result );
+        } else {
             $result = $whole_match;
         }
+
         return $result;
     }
-    function _doAnchors_inline_callback($matches) {
-        $whole_match    =  $matches[1];
-        $link_text      =  $this->runSpanGamut($matches[2]);
-        $url            =  $matches[3] == '' ? $matches[4] : $matches[3];
-        $title          =& $matches[7];
-
-        $url = $this->encodeAttribute($url);
+
+    function _doAnchors_inline_callback( $matches ) {
+        $whole_match = $matches[1];
+        $link_text   = $this->runSpanGamut( $matches[2] );
+        $url         = $matches[3] == '' ? $matches[4] : $matches[3];
+        $title       =& $matches[7];
+
+        $url = $this->encodeAttribute( $url );
 
         $result = "<a href=\"$url\"";
-        if (isset($title)) {
-            $title = $this->encodeAttribute($title);
-            $result .=  " title=\"$title\"";
-        }
-        
-        $link_text = $this->runSpanGamut($link_text);
+        if ( isset( $title ) ) {
+            $title = $this->encodeAttribute( $title );
+            $result .= " title=\"$title\"";
+        }
+
+        $link_text = $this->runSpanGamut( $link_text );
         $result .= ">$link_text</a>";
 
-        return $this->hashPart($result);
-    }
-
-
-    function doImages($text) {
-    #
-    # Turn Markdown image shortcuts into <img> tags.
-    #
+        return $this->hashPart( $result );
+    }
+
+    function doImages( $text ) {
+        #
+        # Turn Markdown image shortcuts into <img> tags.
+        #
         #
         # First, handle reference-style labeled images: ![alt text][id]
         #
-        $text = preg_replace_callback('{
+        $text = preg_replace_callback( '{
             (               # wrap whole match in $1
               !\[
-                ('.$this->nested_brackets_re.')     # alt text = $2
+                (' . $this->nested_brackets_re . ')     # alt text = $2
               \]
 
@@ -816 +810 @@
 
             )
-            }xs', 
-            array(&$this, '_doImages_reference_callback'), $text);
+            }xs',
+            array( &$this, '_doImages_reference_callback' ), $text );
 
         #
@@ -823 +817 @@
         # Don't forget: encode * and _
         #
-        $text = preg_replace_callback('{
+        $text = preg_replace_callback( '{
             (               # wrap whole match in $1
               !\[
-                ('.$this->nested_brackets_re.')     # alt text = $2
+                (' . $this->nested_brackets_re . ')     # alt text = $2
               \]
               \s?           # One optional whitespace character
@@ -834 +828 @@
                     <(\S*)> # src url = $3
                 |
-                    ('.$this->nested_url_parenthesis_re.')  # src url = $4
+                    (' . $this->nested_url_parenthesis_re . ')  # src url = $4
                 )
                 [ \n]*
@@ -846 +840 @@
             )
             }xs',
-            array(&$this, '_doImages_inline_callback'), $text);
+            array( &$this, '_doImages_inline_callback' ), $text );
 
         return $text;
     }
-    function _doImages_reference_callback($matches) {
+
+    function _doImages_reference_callback( $matches ) {
         $whole_match = $matches[1];
         $alt_text    = $matches[2];
-        $link_id     = strtolower($matches[3]);
-
-        if ($link_id == "") {
-            $link_id = strtolower($alt_text); # for shortcut links like ![this][].
-        }
-
-        $alt_text = $this->encodeAttribute($alt_text);
-        if (isset($this->urls[$link_id])) {
-            $url = $this->encodeAttribute($this->urls[$link_id]);
+        $link_id     = strtolower( $matches[3] );
+
+        if ( $link_id == "" ) {
+            $link_id = strtolower( $alt_text ); # for shortcut links like ![this][].
+        }
+
+        $alt_text = $this->encodeAttribute( $alt_text );
+        if ( isset( $this->urls[ $link_id ] ) ) {
+            $url    = $this->encodeAttribute( $this->urls[ $link_id ] );
             $result = "<img src=\"$url\" alt=\"$alt_text\"";
-            if (isset($this->titles[$link_id])) {
-                $title = $this->titles[$link_id];
-                $title = $this->encodeAttribute($title);
-                $result .=  " title=\"$title\"";
+            if ( isset( $this->titles[ $link_id ] ) ) {
+                $title = $this->titles[ $link_id ];
+                $title = $this->encodeAttribute( $title );
+                $result .= " title=\"$title\"";
             }
             $result .= $this->empty_element_suffix;
-            $result = $this->hashPart($result);
-        }
-        else {
+            $result = $this->hashPart( $result );
+        } else {
             # If there's no such link ID, leave intact:
             $result = $whole_match;
@@ -878 +872 @@
         return $result;
     }
-    function _doImages_inline_callback($matches) {
-        $whole_match    = $matches[1];
-        $alt_text       = $matches[2];
-        $url            = $matches[3] == '' ? $matches[4] : $matches[3];
-        $title          =& $matches[7];
-
-        $alt_text = $this->encodeAttribute($alt_text);
-        $url = $this->encodeAttribute($url);
-        $result = "<img src=\"$url\" alt=\"$alt_text\"";
-        if (isset($title)) {
-            $title = $this->encodeAttribute($title);
-            $result .=  " title=\"$title\""; # $title already quoted
+
+    function _doImages_inline_callback( $matches ) {
+        $whole_match = $matches[1];
+        $alt_text    = $matches[2];
+        $url         = $matches[3] == '' ? $matches[4] : $matches[3];
+        $title       =& $matches[7];
+
+        $alt_text = $this->encodeAttribute( $alt_text );
+        $url      = $this->encodeAttribute( $url );
+        $result   = "<img src=\"$url\" alt=\"$alt_text\"";
+        if ( isset( $title ) ) {
+            $title = $this->encodeAttribute( $title );
+            $result .= " title=\"$title\""; # $title already quoted
         }
         $result .= $this->empty_element_suffix;
 
-        return $this->hashPart($result);
-    }
-
-
-    function doHeaders($text) {
+        return $this->hashPart( $result );
+    }
+
+    function doHeaders( $text ) {
         # Setext-style headers:
         #     Header 1
         #     ========
-        #  
+        #
         #     Header 2
         #     --------
         #
-        $text = preg_replace_callback('{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx',
-            array(&$this, '_doHeaders_callback_setext'), $text);
+        $text = preg_replace_callback( '{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx',
+            array( &$this, '_doHeaders_callback_setext' ), $text );
 
         # atx-style headers:
@@ -915 +909 @@
         #   ###### Header 6
         #
-        $text = preg_replace_callback('{
+        $text = preg_replace_callback( '{
                 ^(\#{1,6})  # $1 = string of #\'s
                 [ ]*
@@ -923 +917 @@
                 \n+
             }xm',
-            array(&$this, '_doHeaders_callback_atx'), $text);
+            array( &$this, '_doHeaders_callback_atx' ), $text );
 
         return $text;
     }
-    function _doHeaders_callback_setext($matches) {
+
+    function _doHeaders_callback_setext( $matches ) {
         # Terrible hack to check we haven't found an empty list item.
-        if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
+        if ( $matches[2] == '-' && preg_match( '{^-(?: |$)}', $matches[1] ) ) {
             return $matches[0];
-        
+        }
+
         $level = $matches[2]{0} == '=' ? 1 : 2;
-        $block = "<h$level>".$this->runSpanGamut($matches[1])."</h$level>";
-        return "\n" . $this->hashBlock($block) . "\n\n";
-    }
-    function _doHeaders_callback_atx($matches) {
-        $level = strlen($matches[1]);
-        $block = "<h$level>".$this->runSpanGamut($matches[2])."</h$level>";
-        return "\n" . $this->hashBlock($block) . "\n\n";
-    }
-
-
-    function doLists($text) {
-    #
-    # Form HTML ordered (numbered) and unordered (bulleted) lists.
-    #
+        $block = "<h$level>" . $this->runSpanGamut( $matches[1] ) . "</h$level>";
+
+        return "\n" . $this->hashBlock( $block ) . "\n\n";
+    }
+
+    function _doHeaders_callback_atx( $matches ) {
+        $level = strlen( $matches[1] );
+        $block = "<h$level>" . $this->runSpanGamut( $matches[2] ) . "</h$level>";
+
+        return "\n" . $this->hashBlock( $block ) . "\n\n";
+    }
+
+    function doLists( $text ) {
+        #
+        # Form HTML ordered (numbered) and unordered (bulleted) lists.
+        #
         $less_than_tab = $this->tab_width - 1;
 
@@ -957 +955 @@
             $marker_ul_re => $marker_ol_re,
             $marker_ol_re => $marker_ul_re,
-            );
-
-        foreach ($markers_relist as $marker_re => $other_marker_re) {
+        );
+
+        foreach ( $markers_relist as $marker_re => $other_marker_re ) {
             # Re-usable pattern to match any entirel ul or ol list:
             $whole_list_re = '
                 (                               # $1 = whole list
                   (                             # $2
-                    ([ ]{0,'.$less_than_tab.'}) # $3 = number of spaces
-                    ('.$marker_re.')            # $4 = first list item marker
+                    ([ ]{0,' . $less_than_tab . '}) # $3 = number of spaces
+                    (' . $marker_re . ')            # $4 = first list item marker
                     [ ]+
                   )
@@ -976 +974 @@
                       (?!                       # Negative lookahead for another list item marker
                         [ ]*
-                        '.$marker_re.'[ ]+
+                        ' . $marker_re . '[ ]+
                       )
                     |
@@ -982 +980 @@
                         \n
                         \3                      # Must have the same indentation
-                        '.$other_marker_re.'[ ]+
+                        ' . $other_marker_re . '[ ]+
                       )
                   )
                 )
             '; // mx
-            
+
             # We use a different prefix before nested lists than top-level lists.
             # See extended comment in _ProcessListItems().
-        
-            if ($this->list_level) {
-                $text = preg_replace_callback('{
+
+            if ( $this->list_level ) {
+                $text = preg_replace_callback( '{
                         ^
-                        '.$whole_list_re.'
+                        ' . $whole_list_re . '
                     }mx',
-                    array(&$this, '_doLists_callback'), $text);
-            }
-            else {
-                $text = preg_replace_callback('{
+                    array( &$this, '_doLists_callback' ), $text );
+            } else {
+                $text = preg_replace_callback( '{
                         (?:(?<=\n)\n|\A\n?) # Must eat the newline
-                        '.$whole_list_re.'
+                        ' . $whole_list_re . '
                     }mx',
-                    array(&$this, '_doLists_callback'), $text);
+                    array( &$this, '_doLists_callback' ), $text );
             }
         }
@@ -1009 +1006 @@
         return $text;
     }
-    function _doLists_callback($matches) {
+
+    function _doLists_callback( $matches ) {
         # Re-usable patterns to match list item bullets and number markers:
         $marker_ul_re  = '[*+-]';
         $marker_ol_re  = '\d+[.]';
         $marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
-        
-        $list = $matches[1];
-        $list_type = preg_match("/$marker_ul_re/", $matches[4]) ? "ul" : "ol";
-        
+
+        $list      = $matches[1];
+        $list_type = preg_match( "/$marker_ul_re/", $matches[4] ) ? "ul" : "ol";
+
         $marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re );
-        
+
         $list .= "\n";
-        $result = $this->processListItems($list, $marker_any_re);
-        
-        $result = $this->hashBlock("<$list_type>\n" . $result . "</$list_type>");
-        return "\n". $result ."\n\n";
+        $result = $this->processListItems( $list, $marker_any_re );
+
+        $result = $this->hashBlock( "<$list_type>\n" . $result . "</$list_type>" );
+
+        return "\n" . $result . "\n\n";
     }
 
     var $list_level = 0;
 
-    function processListItems($list_str, $marker_any_re) {
-    #
-    #   Process the contents of a single ordered or unordered list, splitting it
-    #   into individual list items.
-    #
+    function processListItems( $list_str, $marker_any_re ) {
+        #
+        #   Process the contents of a single ordered or unordered list, splitting it
+        #   into individual list items.
+        #
         # The $this->list_level global keeps track of when we're inside a list.
         # Each time we enter a list, we increment it; when we leave a list,
@@ -1054 +1053 @@
         # change the syntax rules such that sub-lists must start with a
         # starting cardinal number; e.g. "1." or "a.".
-        
-        $this->list_level++;
+
+        $this->list_level ++;
 
         # trim trailing blank lines:
-        $list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
-
-        $list_str = preg_replace_callback('{
+        $list_str = preg_replace( "/\n{2,}\\z/", "\n", $list_str );
+
+        $list_str = preg_replace_callback( '{
             (\n)?                           # leading line = $1
             (^[ ]*)                         # leading whitespace = $2
-            ('.$marker_any_re.'             # list marker and space = $3
+            (' . $marker_any_re . '             # list marker and space = $3
                 (?:[ ]+|(?=\n)) # space only required if item is not empty
             )
             ((?s:.*?))                      # list item text   = $4
             (?:(\n+(?=\n))|\n)              # tailing blank line = $5
-            (?= \n* (\z | \2 ('.$marker_any_re.') (?:[ ]+|(?=\n))))
+            (?= \n* (\z | \2 (' . $marker_any_re . ') (?:[ ]+|(?=\n))))
             }xm',
-            array(&$this, '_processListItems_callback'), $list_str);
-
-        $this->list_level--;
+            array( &$this, '_processListItems_callback' ), $list_str );
+
+        $this->list_level --;
+
         return $list_str;
     }
-    function _processListItems_callback($matches) {
-        $item = $matches[4];
-        $leading_line =& $matches[1];
-        $leading_space =& $matches[2];
-        $marker_space = $matches[3];
+
+    function _processListItems_callback( $matches ) {
+        $item               = $matches[4];
+        $leading_line       =& $matches[1];
+        $leading_space      =& $matches[2];
+        $marker_space       = $matches[3];
         $tailing_blank_line =& $matches[5];
 
-        if ($leading_line || $tailing_blank_line || 
-            preg_match('/\n{2,}/', $item))
-        {
+        if ( $leading_line || $tailing_blank_line ||
+             preg_match( '/\n{2,}/', $item )
+        ) {
             # Replace marker with the appropriate whitespace indentation
-            $item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
-            $item = $this->runBlockGamut($this->outdent($item)."\n");
-        }
-        else {
+            $item = $leading_space . str_repeat( ' ', strlen( $marker_space ) ) . $item;
+            $item = $this->runBlockGamut( $this->outdent( $item ) . "\n" );
+        } else {
             # Recursion for sub-lists:
-            $item = $this->doLists($this->outdent($item));
-            $item = preg_replace('/\n+$/', '', $item);
-            $item = $this->runSpanGamut($item);
+            $item = $this->doLists( $this->outdent( $item ) );
+            $item = preg_replace( '/\n+$/', '', $item );
+            $item = $this->runSpanGamut( $item );
         }
 
@@ -1099 +1099 @@
     }
 
-
-    function doCodeBlocks($text) {
-    #
-    #   Process Markdown `<pre><code>` blocks.
-    #
-        $text = preg_replace_callback('{
+    function doCodeBlocks( $text ) {
+        #
+        #   Process Markdown `<pre><code>` blocks.
+        #
+        $text = preg_replace_callback( '{
                 (?:\n\n|\A\n?)
                 (               # $1 = the code block -- one or more lines, starting with a space/tab
                   (?>
-                    [ ]{'.$this->tab_width.'}  # Lines must start with a tab or a tab-width of spaces
+                    [ ]{' . $this->tab_width . '}  # Lines must start with a tab or a tab-width of spaces
                     .*\n+
                   )+
                 )
-                ((?=^[ ]{0,'.$this->tab_width.'}\S)|\Z) # Lookahead for non-space at line-start, or end of doc
+                ((?=^[ ]{0,' . $this->tab_width . '}\S)|\Z) # Lookahead for non-space at line-start, or end of doc
             }xm',
-            array(&$this, '_doCodeBlocks_callback'), $text);
+            array( &$this, '_doCodeBlocks_callback' ), $text );
 
         return $text;
     }
-    function _doCodeBlocks_callback($matches) {
+
+    function _doCodeBlocks_callback( $matches ) {
         $codeblock = $matches[1];
 
-        $codeblock = $this->outdent($codeblock);
-        $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+        $codeblock = $this->outdent( $codeblock );
+        $codeblock = htmlspecialchars( $codeblock, ENT_NOQUOTES );
 
         # trim leading newlines and trailing newlines
-        $codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
+        $codeblock = preg_replace( '/\A\n+|\n+\z/', '', $codeblock );
 
         $codeblock = "<pre><code>$codeblock\n</code></pre>";
-        return "\n\n".$this->hashBlock($codeblock)."\n\n";
-    }
-
-
-    function makeCodeSpan($code) {
-    #
-    # Create a code span markup for $code. Called from handleSpanToken.
-    #
-        $code = htmlspecialchars(trim($code), ENT_NOQUOTES);
-        return $this->hashPart("<code>$code</code>");
-    }
-
+
+        return "\n\n" . $this->hashBlock( $codeblock ) . "\n\n";
+    }
+
+    function makeCodeSpan( $code ) {
+        #
+        # Create a code span markup for $code. Called from handleSpanToken.
+        #
+        $code = htmlspecialchars( trim( $code ), ENT_NOQUOTES );
+
+        return $this->hashPart( "<code>$code</code>" );
+    }
 
     var $em_relist = array(
@@ -1145 +1145 @@
         '*' => '(?<=\S|^)(?<!\*)\*(?!\*)',
         '_' => '(?<=\S|^)(?<!_)_(?!_)',
-        );
+    );
     var $strong_relist = array(
         ''   => '(?:(?<!\*)\*\*(?!\*)|(?<!_)__(?!_))(?=\S|$)(?![.,:;]\s)',
         '**' => '(?<=\S|^)(?<!\*)\*\*(?!\*)',
         '__' => '(?<=\S|^)(?<!_)__(?!_)',
-        );
+    );
     var $em_strong_relist = array(
         ''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<!_)___(?!_))(?=\S|$)(?![.,:;]\s)',
         '***' => '(?<=\S|^)(?<!\*)\*\*\*(?!\*)',
         '___' => '(?<=\S|^)(?<!_)___(?!_)',
-        );
+    );
     var $em_strong_prepared_relist;
-    
+
     function prepareItalicsAndBold() {
-    #
-    # Prepare regular expressions for searching emphasis tokens in any
-    # context.
-    #
-        foreach ($this->em_relist as $em => $em_re) {
-            foreach ($this->strong_relist as $strong => $strong_re) {
+        #
+        # Prepare regular expressions for searching emphasis tokens in any
+        # context.
+        #
+        foreach ( $this->em_relist as $em => $em_re ) {
+            foreach ( $this->strong_relist as $strong => $strong_re ) {
                 # Construct list of allowed token expressions.
                 $token_relist = array();
-                if (isset($this->em_strong_relist["$em$strong"])) {
+                if ( isset( $this->em_strong_relist["$em$strong"] ) ) {
                     $token_relist[] = $this->em_strong_relist["$em$strong"];
                 }
                 $token_relist[] = $em_re;
                 $token_relist[] = $strong_re;
-                
+
                 # Construct master expression from list.
-                $token_re = '{('. implode('|', $token_relist) .')}';
+                $token_re                                      = '{(' . implode( '|', $token_relist ) . ')}';
                 $this->em_strong_prepared_relist["$em$strong"] = $token_re;
             }
         }
     }
-    
-    function doItalicsAndBold($text) {
-        $token_stack = array('');
-        $text_stack = array('');
-        $em = '';
-        $strong = '';
+
+    function doItalicsAndBold( $text ) {
+        $token_stack  = array( '' );
+        $text_stack   = array( '' );
+        $em           = '';
+        $strong       = '';
         $tree_char_em = false;
-        
-        while (1) {
+
+        while ( 1 ) {
             #
             # Get prepared regular expression for seraching emphasis tokens
@@ -1193 +1193 @@
             #
             $token_re = $this->em_strong_prepared_relist["$em$strong"];
-            
+
             #
-            # Each loop iteration search for the next emphasis token. 
+            # Each loop iteration search for the next emphasis token.
             # Each token is then passed to handleSpanToken.
             #
-            $parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
+            $parts = preg_split( $token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE );
             $text_stack[0] .= $parts[0];
             $token =& $parts[1];
-            $text =& $parts[2];
-            
-            if (empty($token)) {
+            $text  =& $parts[2];
+
+            if ( empty( $token ) ) {
                 # Reached end of text span: empty stack without emitting.
                 # any more emphasis.
-                while ($token_stack[0]) {
-                    $text_stack[1] .= array_shift($token_stack);
-                    $text_stack[0] .= array_shift($text_stack);
+                while ( $token_stack[0] ) {
+                    $text_stack[1] .= array_shift( $token_stack );
+                    $text_stack[0] .= array_shift( $text_stack );
                 }
                 break;
             }
-            
-            $token_len = strlen($token);
-            if ($tree_char_em) {
+
+            $token_len = strlen( $token );
+            if ( $tree_char_em ) {
                 # Reached closing marker while inside a three-char emphasis.
-                if ($token_len == 3) {
+                if ( $token_len == 3 ) {
                     # Three-char closing marker, close em and strong.
-                    array_shift($token_stack);
-                    $span = array_shift($text_stack);
-                    $span = $this->runSpanGamut($span);
+                    array_shift( $token_stack );
+                    $span = array_shift( $text_stack );
+                    $span = $this->runSpanGamut( $span );
                     $span = "<strong><em>$span</em></strong>";
-                    $text_stack[0] .= $this->hashPart($span);
-                    $em = '';
+                    $text_stack[0] .= $this->hashPart( $span );
+                    $em     = '';
                     $strong = '';
                 } else {
                     # Other closing marker: close one em or strong and
                     # change current token state to match the other
-                    $token_stack[0] = str_repeat($token{0}, 3-$token_len);
-                    $tag = $token_len == 2 ? "strong" : "em";
-                    $span = $text_stack[0];
-                    $span = $this->runSpanGamut($span);
-                    $span = "<$tag>$span</$tag>";
-                    $text_stack[0] = $this->hashPart($span);
-                    $$tag = ''; # $$tag stands for $em or $strong
+                    $token_stack[0] = str_repeat( $token{0}, 3 - $token_len );
+                    $tag            = $token_len == 2 ? "strong" : "em";
+                    $span           = $text_stack[0];
+                    $span           = $this->runSpanGamut( $span );
+                    $span           = "<$tag>$span</$tag>";
+                    $text_stack[0]  = $this->hashPart( $span );
+                    $$tag           = ''; # $$tag stands for $em or $strong
                 }
                 $tree_char_em = false;
-            } else if ($token_len == 3) {
-                if ($em) {
+            } else if ( $token_len == 3 ) {
+                if ( $em ) {
                     # Reached closing marker for both em and strong.
                     # Closing strong marker:
-                    for ($i = 0; $i < 2; ++$i) {
-                        $shifted_token = array_shift($token_stack);
-                        $tag = strlen($shifted_token) == 2 ? "strong" : "em";
-                        $span = array_shift($text_stack);
-                        $span = $this->runSpanGamut($span);
-                        $span = "<$tag>$span</$tag>";
-                        $text_stack[0] .= $this->hashPart($span);
+                    for ( $i = 0; $i < 2; ++ $i ) {
+                        $shifted_token = array_shift( $token_stack );
+                        $tag           = strlen( $shifted_token ) == 2 ? "strong" : "em";
+                        $span          = array_shift( $text_stack );
+                        $span          = $this->runSpanGamut( $span );
+                        $span          = "<$tag>$span</$tag>";
+                        $text_stack[0] .= $this->hashPart( $span );
                         $$tag = ''; # $$tag stands for $em or $strong
                     }
                 } else {
-                    # Reached opening three-char emphasis marker. Push on token 
+                    # Reached opening three-char emphasis marker. Push on token
                     # stack; will be handled by the special condition above.
-                    $em = $token{0};
+                    $em     = $token{0};
                     $strong = "$em$em";
-                    array_unshift($token_stack, $token);
-                    array_unshift($text_stack, '');
+                    array_unshift( $token_stack, $token );
+                    array_unshift( $text_stack, '' );
                     $tree_char_em = true;
                 }
-            } else if ($token_len == 2) {
-                if ($strong) {
+            } else if ( $token_len == 2 ) {
+                if ( $strong ) {
                     # Unwind any dangling emphasis marker:
-                    if (strlen($token_stack[0]) == 1) {
-                        $text_stack[1] .= array_shift($token_stack);
-                        $text_stack[0] .= array_shift($text_stack);
+                    if ( strlen( $token_stack[0] ) == 1 ) {
+                        $text_stack[1] .= array_shift( $token_stack );
+                        $text_stack[0] .= array_shift( $text_stack );
                     }
                     # Closing strong marker:
-                    array_shift($token_stack);
-                    $span = array_shift($text_stack);
-                    $span = $this->runSpanGamut($span);
+                    array_shift( $token_stack );
+                    $span = array_shift( $text_stack );
+                    $span = $this->runSpanGamut( $span );
                     $span = "<strong>$span</strong>";
-                    $text_stack[0] .= $this->hashPart($span);
+                    $text_stack[0] .= $this->hashPart( $span );
                     $strong = '';
                 } else {
-                    array_unshift($token_stack, $token);
-                    array_unshift($text_stack, '');
+                    array_unshift( $token_stack, $token );
+                    array_unshift( $text_stack, '' );
                     $strong = $token;
                 }
             } else {
                 # Here $token_len == 1
-                if ($em) {
-                    if (strlen($token_stack[0]) == 1) {
+                if ( $em ) {
+                    if ( strlen( $token_stack[0] ) == 1 ) {
                         # Closing emphasis marker:
-                        array_shift($token_stack);
-                        $span = array_shift($text_stack);
-                        $span = $this->runSpanGamut($span);
+                        array_shift( $token_stack );
+                        $span = array_shift( $text_stack );
+                        $span = $this->runSpanGamut( $span );
                         $span = "<em>$span</em>";
-                        $text_stack[0] .= $this->hashPart($span);
+                        $text_stack[0] .= $this->hashPart( $span );
                         $em = '';
                     } else {
@@ -1293 +1293 @@
                     }
                 } else {
-                    array_unshift($token_stack, $token);
-                    array_unshift($text_stack, '');
+                    array_unshift( $token_stack, $token );
+                    array_unshift( $text_stack, '' );
                     $em = $token;
                 }
             }
         }
+
         return $text_stack[0];
     }
 
-
-    function doBlockQuotes($text) {
-        $text = preg_replace_callback('/
+    function doBlockQuotes( $text ) {
+        $text = preg_replace_callback( '/
               (                             # Wrap whole match in $1
                 (?>
@@ -1314 +1314 @@
               )
             /xm',
-            array(&$this, '_doBlockQuotes_callback'), $text);
+            array( &$this, '_doBlockQuotes_callback' ), $text );
 
         return $text;
     }
-    function _doBlockQuotes_callback($matches) {
+
+    function _doBlockQuotes_callback( $matches ) {
         $bq = $matches[1];
         # trim one level of quoting - trim whitespace-only lines
-        $bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
-        $bq = $this->runBlockGamut($bq);        # recurse
-
-        $bq = preg_replace('/^/m', "  ", $bq);
-        # These leading spaces cause problem with <pre> content, 
+        $bq = preg_replace( '/^[ ]*>[ ]?|^[ ]+$/m', '', $bq );
+        $bq = $this->runBlockGamut( $bq );        # recurse
+
+        $bq = preg_replace( '/^/m', "  ", $bq );
+        # These leading spaces cause problem with <pre> content,
         # so we need to fix that:
-        $bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx', 
-            array(&$this, '_doBlockQuotes_callback2'), $bq);
-
-        return "\n". $this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
-    }
-    function _doBlockQuotes_callback2($matches) {
+        $bq = preg_replace_callback( '{(\s*<pre>.+?</pre>)}sx',
+            array( &$this, '_doBlockQuotes_callback2' ), $bq );
+
+        return "\n" . $this->hashBlock( "<blockquote>\n$bq\n</blockquote>" ) . "\n\n";
+    }
+
+    function _doBlockQuotes_callback2( $matches ) {
         $pre = $matches[1];
-        $pre = preg_replace('/^  /m', '', $pre);
+        $pre = preg_replace( '/^  /m', '', $pre );
+
         return $pre;
     }
 
-
-    function formParagraphs($text) {
-    #
-    #   Params:
-    #       $text - string to process with html <p> tags
-    #
+    function formParagraphs( $text ) {
+        #
+        #   Params:
+        #       $text - string to process with html <p> tags
+        #
         # Strip leading and trailing lines:
-        $text = preg_replace('/\A\n+|\n+\z/', '', $text);
-
-        $grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+        $text = preg_replace( '/\A\n+|\n+\z/', '', $text );
+
+        $grafs = preg_split( '/\n{2,}/', $text, - 1, PREG_SPLIT_NO_EMPTY );
 
         #
         # Wrap <p> tags and unhashify HTML blocks
         #
-        foreach ($grafs as $key => $value) {
-            if (!preg_match('/^B\x1A[0-9]+B$/', $value)) {
+        foreach ( $grafs as $key => $value ) {
+            if ( ! preg_match( '/^B\x1A[0-9]+B$/', $value ) ) {
                 # Is a paragraph.
-                $value = $this->runSpanGamut($value);
-                $value = preg_replace('/^([ ]*)/', "<p>", $value);
+                $value = $this->runSpanGamut( $value );
+                $value = preg_replace( '/^([ ]*)/', "<p>", $value );
                 $value .= "</p>";
-                $grafs[$key] = $this->unhash($value);
-            }
-            else {
+                $grafs[ $key ] = $this->unhash( $value );
+            } else {
                 # Is a block.
                 # Modify elements of @grafs in-place...
-                $graf = $value;
-                $block = $this->html_hashes[$graf];
-                $graf = $block;
+                $graf  = $value;
+                $block = $this->html_hashes[ $graf ];
+                $graf  = $block;
 //              if (preg_match('{
 //                  \A
@@ -1390 +1391 @@
 //                  # that initialization code should be pulled into its own sub, though.
 //                  $div_content = $this->hashHTMLBlocks($div_content);
-//                  
+//
 //                  # Run document gamut methods on the content.
 //                  foreach ($this->document_gamut as $method => $priority) {
@@ -1401 +1402 @@
 //                  $graf = $div_open . "\n" . $div_content . "\n" . $div_close;
 //              }
-                $grafs[$key] = $graf;
-            }
-        }
-
-        return implode("\n\n", $grafs);
-    }
-
-
-    function encodeAttribute($text) {
-    #
-    # Encode text for a double-quoted HTML attribute. This function
-    # is *not* suitable for attributes enclosed in single quotes.
-    #
-        $text = $this->encodeAmpsAndAngles($text);
-        $text = str_replace('"', '&quot;', $text);
+                $grafs[ $key ] = $graf;
+            }
+        }
+
+        return implode( "\n\n", $grafs );
+    }
+
+    function encodeAttribute( $text ) {
+        #
+        # Encode text for a double-quoted HTML attribute. This function
+        # is *not* suitable for attributes enclosed in single quotes.
+        #
+        $text = $this->encodeAmpsAndAngles( $text );
+        $text = str_replace( '"', '&quot;', $text );
+
         return $text;
     }
-    
-    
-    function encodeAmpsAndAngles($text) {
-    #
-    # Smart processing for ampersands and angle brackets that need to 
-    # be encoded. Valid character entities are left alone unless the
-    # no-entities mode is set.
-    #
-        if ($this->no_entities) {
-            $text = str_replace('&', '&amp;', $text);
+
+    function encodeAmpsAndAngles( $text ) {
+        #
+        # Smart processing for ampersands and angle brackets that need to
+        # be encoded. Valid character entities are left alone unless the
+        # no-entities mode is set.
+        #
+        if ( $this->no_entities ) {
+            $text = str_replace( '&', '&amp;', $text );
         } else {
             # Ampersand-encoding based entirely on Nat Irons's Amputator
             # MT plugin: <http://bumppo.net/projects/amputator/>
-            $text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/', 
-                                '&amp;', $text);;
+            $text = preg_replace( '/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/',
+                '&amp;', $text );;
         }
         # Encode remaining <'s
-        $text = str_replace('<', '&lt;', $text);
+        $text = str_replace( '<', '&lt;', $text );
 
         return $text;
     }
 
-
-    function doAutoLinks($text) {
-        $text = preg_replace_callback('{<((https?|ftp|dict):[^\'">\s]+)>}i', 
-            array(&$this, '_doAutoLinks_url_callback'), $text);
+    function doAutoLinks( $text ) {
+        $text = preg_replace_callback( '{<((https?|ftp|dict):[^\'">\s]+)>}i',
+            array( &$this, '_doAutoLinks_url_callback' ), $text );
 
         # Email addresses: <address@domain.foo>
-        $text = preg_replace_callback('{
+        $text = preg_replace_callback( '{
             <
             (?:mailto:)?
@@ -1464 +1463 @@
             >
             }xi',
-            array(&$this, '_doAutoLinks_email_callback'), $text);
+            array( &$this, '_doAutoLinks_email_callback' ), $text );
 
         return $text;
     }
-    function _doAutoLinks_url_callback($matches) {
-        $url = $this->encodeAttribute($matches[1]);
+
+    function _doAutoLinks_url_callback( $matches ) {
+        $url  = $this->encodeAttribute( $matches[1] );
         $link = "<a href=\"$url\">$url</a>";
-        return $this->hashPart($link);
-    }
-    function _doAutoLinks_email_callback($matches) {
+
+        return $this->hashPart( $link );
+    }
+
+    function _doAutoLinks_email_callback( $matches ) {
         $address = $matches[1];
-        $link = $this->encodeEmailAddress($address);
-        return $this->hashPart($link);
-    }
-
-
-    function encodeEmailAddress($addr) {
-    #
-    #   Input: an email address, e.g. "foo@example.com"
-    #
-    #   Output: the email address as a mailto link, with each character
-    #       of the address encoded as either a decimal or hex entity, in
-    #       the hopes of foiling most address harvesting spam bots. E.g.:
-    #
-    #     <p><a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#x66;o&#111;
-    #        &#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;&#101;&#46;&#x63;&#111;
-    #        &#x6d;">&#x66;o&#111;&#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;
-    #        &#101;&#46;&#x63;&#111;&#x6d;</a></p>
-    #
-    #   Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
-    #   With some optimizations by Milian Wolff.
-    #
-        $addr = "mailto:" . $addr;
-        $chars = preg_split('/(?<!^)(?!$)/', $addr);
-        $seed = (int)abs(crc32($addr) / strlen($addr)); # Deterministic seed.
-        
-        foreach ($chars as $key => $char) {
-            $ord = ord($char);
+        $link    = $this->encodeEmailAddress( $address );
+
+        return $this->hashPart( $link );
+    }
+
+    function encodeEmailAddress( $addr ) {
+        #
+        #   Input: an email address, e.g. "foo@example.com"
+        #
+        #   Output: the email address as a mailto link, with each character
+        #       of the address encoded as either a decimal or hex entity, in
+        #       the hopes of foiling most address harvesting spam bots. E.g.:
+        #
+        #     <p><a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#x66;o&#111;
+        #        &#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;&#101;&#46;&#x63;&#111;
+        #        &#x6d;">&#x66;o&#111;&#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;
+        #        &#101;&#46;&#x63;&#111;&#x6d;</a></p>
+        #
+        #   Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
+        #   With some optimizations by Milian Wolff.
+        #
+        $addr  = "mailto:" . $addr;
+        $chars = preg_split( '/(?<!^)(?!$)/', $addr );
+        $seed  = (int) abs( crc32( $addr ) / strlen( $addr ) ); # Deterministic seed.
+
+        foreach ( $chars as $key => $char ) {
+            $ord = ord( $char );
             # Ignore non-ascii chars.
-            if ($ord < 128) {
-                $r = ($seed * (1 + $key)) % 100; # Pseudo-random function.
+            if ( $ord < 128 ) {
+                $r = ( $seed * ( 1 + $key ) ) % 100; # Pseudo-random function.
                 # roughly 10% raw, 45% hex, 45% dec
                 # '@' *must* be encoded. I insist.
-                if ($r > 90 && $char != '@') /* do nothing */;
-                else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
-                else              $chars[$key] = '&#'.$ord.';';
-            }
-        }
-        
-        $addr = implode('', $chars);
-        $text = implode('', array_slice($chars, 7)); # text without `mailto:`
+                if ( $r > 90 && $char != '@' ) /* do nothing */ {
+                    ;
+                } else if ( $r < 45 ) {
+                    $chars[ $key ] = '&#x' . dechex( $ord ) . ';';
+                } else {
+                    $chars[ $key ] = '&#' . $ord . ';';
+                }
+            }
+        }
+
+        $addr = implode( '', $chars );
+        $text = implode( '', array_slice( $chars, 7 ) ); # text without `mailto:`
         $addr = "<a href=\"$addr\">$text</a>";
 
@@ -1520 +1526 @@
     }
 
-
-    function parseSpan($str) {
-    #
-    # Take the string $str and parse it into tokens, hashing embeded HTML,
-    # escaped characters and handling code spans.
-    #
+    function parseSpan( $str ) {
+        #
+        # Take the string $str and parse it into tokens, hashing embeded HTML,
+        # escaped characters and handling code spans.
+        #
         $output = '';
-        
+
         $span_re = '{
                 (
-                    \\\\'.$this->escape_chars_re.'
+                    \\\\' . $this->escape_chars_re . '
                 |
                     (?<![`\\\\])
                     `+                      # code span marker
-            '.( $this->no_markup ? '' : '
+            ' . ( $this->no_markup ? '' : '
                 |
                     <!--    .*?     -->     # comment
@@ -1546 +1551 @@
                     )?
                     >
-            ').'
+            ' ) . '
                 )
                 }xs';
 
-        while (1) {
+        while ( 1 ) {
             #
-            # Each loop iteration seach for either the next tag, the next 
-            # openning code span marker, or the next escaped character. 
+            # Each loop iteration seach for either the next tag, the next
+            # openning code span marker, or the next escaped character.
             # Each token is then passed to handleSpanToken.
             #
-            $parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
-            
+            $parts = preg_split( $span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE );
+
             # Create token from text preceding tag.
-            if ($parts[0] != "") {
+            if ( $parts[0] != "" ) {
                 $output .= $parts[0];
             }
-            
+
             # Check if we reach the end.
-            if (isset($parts[1])) {
-                $output .= $this->handleSpanToken($parts[1], $parts[2]);
+            if ( isset( $parts[1] ) ) {
+                $output .= $this->handleSpanToken( $parts[1], $parts[2] );
                 $str = $parts[2];
-            }
-            else {
+            } else {
                 break;
             }
         }
-        
+
         return $output;
     }
-    
-    
-    function handleSpanToken($token, &$str) {
-    #
-    # Handle $token provided by parseSpan by determining its nature and 
-    # returning the corresponding value that should replace it.
-    #
-        switch ($token{0}) {
+
+    function handleSpanToken( $token, &$str ) {
+        #
+        # Handle $token provided by parseSpan by determining its nature and
+        # returning the corresponding value that should replace it.
+        #
+        switch ( $token{0} ) {
             case "\\":
-                return $this->hashPart("&#". ord($token{1}). ";");
+                return $this->hashPart( "&#" . ord( $token{1} ) . ";" );
             case "`":
                 # Search for end marker in remaining text.
-                if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm', 
-                    $str, $matches))
-                {
-                    $str = $matches[2];
-                    $codespan = $this->makeCodeSpan($matches[1]);
-                    return $this->hashPart($codespan);
+                if ( preg_match( '/^(.*?[^`])' . preg_quote( $token ) . '(?!`)(.*)$/sm',
+                    $str, $matches ) ) {
+                    $str      = $matches[2];
+                    $codespan = $this->makeCodeSpan( $matches[1] );
+
+                    return $this->hashPart( $codespan );
                 }
+
                 return $token; // return as text since no ending marker found.
             default:
-                return $this->hashPart($token);
-        }
-    }
-
-
-    function outdent($text) {
-    #
-    # Remove one level of line-leading tabs or spaces
-    #
-        return preg_replace('/^(\t|[ ]{1,'.$this->tab_width.'})/m', '', $text);
-    }
-
-
-    # String length function for detab. `_initDetab` will create a function to 
+                return $this->hashPart( $token );
+        }
+    }
+
+    function outdent( $text ) {
+        #
+        # Remove one level of line-leading tabs or spaces
+        #
+        return preg_replace( '/^(\t|[ ]{1,' . $this->tab_width . '})/m', '', $text );
+    }
+
+
+    # String length function for detab. `_initDetab` will create a function to
     # hanlde UTF-8 if the default function does not exist.
     var $utf8_strlen = 'mb_strlen';
-    
-    function detab($text) {
-    #
-    # Replace tabs with the appropriate amount of space.
-    #
+
+    function detab( $text ) {
+        #
+        # Replace tabs with the appropriate amount of space.
+        #
         # For each line we separate the line in blocks delemited by
-        # tab characters. Then we reconstruct every line by adding the 
+        # tab characters. Then we reconstruct every line by adding the
         # appropriate number of space between each blocks.
-        
-        $text = preg_replace_callback('/^.*\t.*$/m',
-            array(&$this, '_detab_callback'), $text);
+
+        $text = preg_replace_callback( '/^.*\t.*$/m',
+            array( &$this, '_detab_callback' ), $text );
 
         return $text;
     }
-    function _detab_callback($matches) {
-        $line = $matches[0];
+
+    function _detab_callback( $matches ) {
+        $line   = $matches[0];
         $strlen = $this->utf8_strlen; # strlen function for UTF-8.
-        
+
         # Split in blocks.
-        $blocks = explode("\t", $line);
+        $blocks = explode( "\t", $line );
         # Add each blocks to the line.
         $line = $blocks[0];
-        unset($blocks[0]); # Do not add first block twice.
-        foreach ($blocks as $block) {
+        unset( $blocks[0] ); # Do not add first block twice.
+        foreach ( $blocks as $block ) {
             # Calculate amount of space, insert spaces, insert block.
-            $amount = $this->tab_width - 
-                $strlen($line, 'UTF-8') % $this->tab_width;
-            $line .= str_repeat(" ", $amount) . $block;
-        }
+            $amount = $this->tab_width -
+                      $strlen( $line, 'UTF-8' ) % $this->tab_width;
+            $line .= str_repeat( " ", $amount ) . $block;
+        }
+
         return $line;
     }
+
     function _initDetab() {
-    #
-    # Check for the availability of the function in the `utf8_strlen` property
-    # (initially `mb_strlen`). If the function is not available, create a 
-    # function that will loosely count the number of UTF-8 characters with a
-    # regular expression.
-    #
-        if (function_exists($this->utf8_strlen)) return;
-        $this->utf8_strlen = create_function('$text', 'return preg_match_all(
-            "/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/", 
-            $text, $m);');
-    }
-
-
-    function unhash($text) {
-    #
-    # Swap back in all the tags hashed by _HashHTMLBlocks.
-    #
-        return preg_replace_callback('/(.)\x1A[0-9]+\1/', 
-            array(&$this, '_unhash_callback'), $text);
-    }
-    function _unhash_callback($matches) {
-        return $this->html_hashes[$matches[0]];
-    }
-
+        #
+        # Check for the availability of the function in the `utf8_strlen` property
+        # (initially `mb_strlen`). If the function is not available, create a
+        # function that will loosely count the number of UTF-8 characters with a
+        # regular expression.
+        #
+        if ( function_exists( $this->utf8_strlen ) ) {
+            return;
+        }
+        $this->utf8_strlen = create_function( '$text', 'return preg_match_all(
+            "/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/",
+            $text, $m);' );
+    }
+
+    function unhash( $text ) {
+        #
+        # Swap back in all the tags hashed by _HashHTMLBlocks.
+        #
+        return preg_replace_callback( '/(.)\x1A[0-9]+\1/',
+            array( &$this, '_unhash_callback' ), $text );
+    }
+
+    function _unhash_callback( $matches ) {
+        return $this->html_hashes[ $matches[0] ];
+    }
 }
-
 
 #
@@ -1676 +1682 @@
 
 class MarkdownExtra_Parser extends Markdown_Parser {
-
     # Prefix for footnote ids.
     var $fn_id_prefix = "";
-    
     # Optional title attribute for footnote links and backlinks.
     var $fn_link_title = MARKDOWN_FN_LINK_TITLE;
     var $fn_backlink_title = MARKDOWN_FN_BACKLINK_TITLE;
-    
     # Optional class attribute for footnote links and backlinks.
     var $fn_link_class = MARKDOWN_FN_LINK_CLASS;
     var $fn_backlink_class = MARKDOWN_FN_BACKLINK_CLASS;
-    
     # Predefined abbreviations.
     var $predef_abbr = array();
 
-
     function MarkdownExtra_Parser() {
-    #
-    # Constructor function. Initialize the parser object.
-    #
-        # Add extra escapable characters before parent constructor 
+        #
+        # Constructor function. Initialize the parser object.
+        #
+        # Add extra escapable characters before parent constructor
         # initialize the table.
         $this->escape_chars .= ':|';
-        
-        # Insert extra document, block, and span transformations. 
+
+        # Insert extra document, block, and span transformations.
         # Parent constructor will do the sorting.
         $this->document_gamut += array(
@@ -1707 +1708 @@
             "stripAbbreviations" => 25,
             "appendFootnotes"    => 50,
-            );
+        );
         $this->block_gamut += array(
             "doFencedCodeBlocks" => 5,
             "doTables"           => 15,
             "doDefLists"         => 45,
-            );
+        );
         $this->span_gamut += array(
-            "doFootnotes"        => 5,
-            "doAbbreviations"    => 70,
-            );
-        
+            "doFootnotes"     => 5,
+            "doAbbreviations" => 70,
+        );
+
         parent::Markdown_Parser();
     }
-    
-    
+
     # Extra variables used during extra transformations.
     var $footnotes = array();
@@ -1727 +1727 @@
     var $abbr_desciptions = array();
     var $abbr_word_re = '';
-    
     # Give the current footnote number.
     var $footnote_counter = 1;
-    
-    
+
     function setup() {
-    #
-    # Setting up Extra-specific variables.
-    #
+        #
+        # Setting up Extra-specific variables.
+        #
         parent::setup();
-        
-        $this->footnotes = array();
+
+        $this->footnotes         = array();
         $this->footnotes_ordered = array();
-        $this->abbr_desciptions = array();
-        $this->abbr_word_re = '';
-        $this->footnote_counter = 1;
-        
-        foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
-            if ($this->abbr_word_re)
+        $this->abbr_desciptions  = array();
+        $this->abbr_word_re      = '';
+        $this->footnote_counter  = 1;
+
+        foreach ( $this->predef_abbr as $abbr_word => $abbr_desc ) {
+            if ( $this->abbr_word_re ) {
                 $this->abbr_word_re .= '|';
-            $this->abbr_word_re .= preg_quote($abbr_word);
-            $this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
-        }
-    }
-    
+            }
+            $this->abbr_word_re .= preg_quote( $abbr_word );
+            $this->abbr_desciptions[ $abbr_word ] = trim( $abbr_desc );
+        }
+    }
+
     function teardown() {
-    #
-    # Clearing Extra-specific variables.
-    #
-        $this->footnotes = array();
+        #
+        # Clearing Extra-specific variables.
+        #
+        $this->footnotes         = array();
         $this->footnotes_ordered = array();
-        $this->abbr_desciptions = array();
-        $this->abbr_word_re = '';
-        
+        $this->abbr_desciptions  = array();
+        $this->abbr_word_re      = '';
+
         parent::teardown();
     }
-    
-    
+
+
     ### HTML Block Parser ###
-    
+
     # Tags that are always treated as block tags:
     var $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend';
-    
     # Tags treated as block tags only if the opening tag is alone on it's line:
     var $context_block_tags_re = 'script|noscript|math|ins|del';
-    
     # Tags where markdown="1" default to span mode:
     var $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address';
-    
-    # Tags which must not have their contents modified, no matter where 
+    # Tags which must not have their contents modified, no matter where
     # they appear:
     var $clean_tags_re = 'script|math';
-    
     # Tags that do not need to be closed.
     var $auto_close_tags_re = 'hr|img';
-    
-
-    function hashHTMLBlocks($text) {
-    #
-    # Hashify HTML Blocks and "clean tags".
-    #
-    # We only want to do this for block-level HTML tags, such as headers,
-    # lists, and tables. That's because we still want to wrap <p>s around
-    # "paragraphs" that are wrapped in non-block-level tags, such as anchors,
-    # phrase emphasis, and spans. The list of tags we're looking for is
-    # hard-coded.
-    #
-    # This works by calling _HashHTMLBlocks_InMarkdown, which then calls
-    # _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1" 
-    # attribute is found whitin a tag, _HashHTMLBlocks_InHTML calls back
-    #  _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag.
-    # These two functions are calling each other. It's recursive!
-    #
+
+    function hashHTMLBlocks( $text ) {
+        #
+        # Hashify HTML Blocks and "clean tags".
+        #
+        # We only want to do this for block-level HTML tags, such as headers,
+        # lists, and tables. That's because we still want to wrap <p>s around
+        # "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+        # phrase emphasis, and spans. The list of tags we're looking for is
+        # hard-coded.
+        #
+        # This works by calling _HashHTMLBlocks_InMarkdown, which then calls
+        # _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1"
+        # attribute is found whitin a tag, _HashHTMLBlocks_InHTML calls back
+        #  _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag.
+        # These two functions are calling each other. It's recursive!
+        #
         #
         # Call the HTML-in-Markdown hasher.
         #
-        list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
-        
+        list( $text, ) = $this->_hashHTMLBlocks_inMarkdown( $text );
+
         return $text;
     }
-    function _hashHTMLBlocks_inMarkdown($text, $indent = 0, 
-                                        $enclosing_tag_re = '', $span = false)
-    {
-    #
-    # Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags.
-    #
-    # *   $indent is the number of space to be ignored when checking for code 
-    #     blocks. This is important because if we don't take the indent into 
-    #     account, something like this (which looks right) won't work as expected:
-    #
-    #     <div>
-    #         <div markdown="1">
-    #         Hello World.  <-- Is this a Markdown code block or text?
-    #         </div>  <-- Is this a Markdown code block or a real tag?
-    #     <div>
-    #
-    #     If you don't like this, just don't indent the tag on which
-    #     you apply the markdown="1" attribute.
-    #
-    # *   If $enclosing_tag_re is not empty, stops at the first unmatched closing 
-    #     tag with that name. Nested tags supported.
-    #
-    # *   If $span is true, text inside must treated as span. So any double 
-    #     newline will be replaced by a single newline so that it does not create 
-    #     paragraphs.
-    #
-    # Returns an array of that form: ( processed text , remaining text )
-    #
-        if ($text === '') return array('', '');
+
+    function _hashHTMLBlocks_inMarkdown( $text, $indent = 0, $enclosing_tag_re = '', $span = false ) {
+        #
+        # Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags.
+        #
+        # *   $indent is the number of space to be ignored when checking for code
+        #     blocks. This is important because if we don't take the indent into
+        #     account, something like this (which looks right) won't work as expected:
+        #
+        #     <div>
+        #         <div markdown="1">
+        #         Hello World.  <-- Is this a Markdown code block or text?
+        #         </div>  <-- Is this a Markdown code block or a real tag?
+        #     <div>
+        #
+        #     If you don't like this, just don't indent the tag on which
+        #     you apply the markdown="1" attribute.
+        #
+        # *   If $enclosing_tag_re is not empty, stops at the first unmatched closing
+        #     tag with that name. Nested tags supported.
+        #
+        # *   If $span is true, text inside must treated as span. So any double
+        #     newline will be replaced by a single newline so that it does not create
+        #     paragraphs.
+        #
+        # Returns an array of that form: ( processed text , remaining text )
+        #
+        if ( $text === '' ) {
+            return array( '', '' );
+        }
 
         # Regex to check for the presense of newlines around a block tag.
         $newline_before_re = '/(?:^\n?|\n\n)*$/';
-        $newline_after_re = 
+        $newline_after_re  =
             '{
                 ^                       # Start of text following the tag.
@@ -1845 +1840 @@
                 [ ]*\n                  # Must be followed by newline.
             }xs';
-        
+
         # Regex to match any tag.
         $block_tag_re =
@@ -1852 +1847 @@
                     </?                 # Any opening or closing tag.
                         (?>             # Tag name.
-                            '.$this->block_tags_re.'            |
-                            '.$this->context_block_tags_re.'    |
-                            '.$this->clean_tags_re.'            |
-                            (?!\s)'.$enclosing_tag_re.'
+                            ' . $this->block_tags_re . '            |
+                            ' . $this->context_block_tags_re . '    |
+                            ' . $this->clean_tags_re . '            |
+                            (?!\s)' . $enclosing_tag_re . '
                         )
                         (?:
@@ -1875 +1870 @@
                     # Code span marker
                     `+
-                '. ( !$span ? ' # If not in span.
+                ' . ( ! $span ? ' # If not in span.
                 |
                     # Indented code block
                     (?: ^[ ]*\n | ^ | \n[ ]*\n )
-                    [ ]{'.($indent+4).'}[^\n]* \n
+                    [ ]{' . ( $indent + 4 ) . '}[^\n]* \n
                     (?>
-                        (?: [ ]{'.($indent+4).'}[^\n]* | [ ]* ) \n
+                        (?: [ ]{' . ( $indent + 4 ) . '}[^\n]* | [ ]* ) \n
                     )*
                 |
                     # Fenced code block marker
                     (?> ^ | \n )
-                    [ ]{'.($indent).'}~~~+[ ]*\n
-                ' : '' ). ' # End (if not is span).
+                    [ ]{' . ( $indent ) . '}~~~+[ ]*\n
+                ' : '' ) . ' # End (if not is span).
                 )
             }xs';
 
-        
-        $depth = 0;     # Current depth inside the tag tree.
-        $parsed = "";   # Parsed text that will be returned.
+        $depth  = 0;        # Current depth inside the tag tree.
+        $parsed = "";    # Parsed text that will be returned.
 
         #
@@ -1903 +1897 @@
             # Split the text using the first $tag_match pattern found.
             # Text before  pattern will be first in the array, text after
-            # pattern will be at the end, and between will be any catches made 
+            # pattern will be at the end, and between will be any catches made
             # by the pattern.
             #
-            $parts = preg_split($block_tag_re, $text, 2, 
-                                PREG_SPLIT_DELIM_CAPTURE);
-            
-            # If in Markdown span mode, add a empty-string span-level hash 
+            $parts = preg_split( $block_tag_re, $text, 2,
+                PREG_SPLIT_DELIM_CAPTURE );
+
+            # If in Markdown span mode, add a empty-string span-level hash
             # after each newline to prevent triggering any block element.
-            if ($span) {
-                $void = $this->hashPart("", ':');
-                $newline = "$void\n";
-                $parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void;
-            }
-            
+            if ( $span ) {
+                $void     = $this->hashPart( "", ':' );
+                $newline  = "$void\n";
+                $parts[0] = $void . str_replace( "\n", $newline, $parts[0] ) . $void;
+            }
+
             $parsed .= $parts[0]; # Text before current tag.
-            
+
             # If end of $text has been reached. Stop loop.
-            if (count($parts) < 3) {
+            if ( count( $parts ) < 3 ) {
                 $text = "";
                 break;
             }
-            
-            $tag  = $parts[1]; # Tag to handle.
-            $text = $parts[2]; # Remaining text after current tag.
-            $tag_re = preg_quote($tag); # For use in a regular expression.
-            
+
+            $tag    = $parts[1]; # Tag to handle.
+            $text   = $parts[2]; # Remaining text after current tag.
+            $tag_re = preg_quote( $tag ); # For use in a regular expression.
+
             #
             # Check for: Code span marker
             #
-            if ($tag{0} == "`") {
+            if ( $tag{0} == "`" ) {
                 # Find corresponding end marker.
-                $tag_re = preg_quote($tag);
-                if (preg_match('{^(?>.+?|\n(?!\n))*?(?<!`)'.$tag_re.'(?!`)}',
-                    $text, $matches))
-                {
+                $tag_re = preg_quote( $tag );
+                if ( preg_match( '{^(?>.+?|\n(?!\n))*?(?<!`)' . $tag_re . '(?!`)}',
+                    $text, $matches ) ) {
                     # End marker found: pass text unchanged until marker.
                     $parsed .= $tag . $matches[0];
-                    $text = substr($text, strlen($matches[0]));
-                }
-                else {
+                    $text = substr( $text, strlen( $matches[0] ) );
+                } else {
                     # Unmatched marker: just skip it.
                     $parsed .= $tag;
@@ -1950 +1942 @@
             # Check for: Indented code block.
             #
-            else if ($tag{0} == "\n" || $tag{0} == " ") {
-                # Indented code block: pass it unchanged, will be handled 
+            else if ( $tag{0} == "\n" || $tag{0} == " " ) {
+                # Indented code block: pass it unchanged, will be handled
                 # later.
                 $parsed .= $tag;
@@ -1958 +1950 @@
             # Check for: Fenced code block marker.
             #
-            else if ($tag{0} == "~") {
+            else if ( $tag{0} == "~" ) {
                 # Fenced code block marker: find matching end marker.
-                $tag_re = preg_quote(trim($tag));
-                if (preg_match('{^(?>.*\n)+?'.$tag_re.' *\n}', $text, 
-                    $matches)) 
-                {
+                $tag_re = preg_quote( trim( $tag ) );
+                if ( preg_match( '{^(?>.*\n)+?' . $tag_re . ' *\n}', $text,
+                    $matches ) ) {
                     # End marker found: pass text unchanged until marker.
                     $parsed .= $tag . $matches[0];
-                    $text = substr($text, strlen($matches[0]));
-                }
-                else {
+                    $text = substr( $text, strlen( $matches[0] ) );
+                } else {
                     # No end marker: just skip it.
                     $parsed .= $tag;
@@ -1975 +1965 @@
             #
             # Check for: Opening Block level tag or
-            #            Opening Context Block tag (like ins and del) 
+            #            Opening Context Block tag (like ins and del)
             #               used as a block tag (tag is alone on it's line).
             #
-            else if (preg_match('{^<(?:'.$this->block_tags_re.')\b}', $tag) ||
-                (   preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) &&
-                    preg_match($newline_before_re, $parsed) &&
-                    preg_match($newline_after_re, $text)    )
-                )
-            {
+            else if ( preg_match( '{^<(?:' . $this->block_tags_re . ')\b}', $tag ) ||
+                      ( preg_match( '{^<(?:' . $this->context_block_tags_re . ')\b}', $tag ) &&
+                        preg_match( $newline_before_re, $parsed ) &&
+                        preg_match( $newline_after_re, $text ) )
+            ) {
                 # Need to parse tag and following text using the HTML parser.
-                list($block_text, $text) = 
-                    $this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true);
-                
+                list( $block_text, $text ) =
+                    $this->_hashHTMLBlocks_inHTML( $tag . $text, "hashBlock", true );
+
                 # Make sure it stays outside of any paragraph by adding newlines.
                 $parsed .= "\n\n$block_text\n\n";
@@ -1995 +1984 @@
             #            HTML Comments, processing instructions.
             #
-            else if (preg_match('{^<(?:'.$this->clean_tags_re.')\b}', $tag) ||
-                $tag{1} == '!' || $tag{1} == '?')
-            {
+            else if ( preg_match( '{^<(?:' . $this->clean_tags_re . ')\b}', $tag ) ||
+                      $tag{1} == '!' || $tag{1} == '?'
+            ) {
                 # Need to parse tag and following text using the HTML parser.
                 # (don't check for markdown attribute)
-                list($block_text, $text) = 
-                    $this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false);
-                
+                list( $block_text, $text ) =
+                    $this->_hashHTMLBlocks_inHTML( $tag . $text, "hashClean", false );
+
                 $parsed .= $block_text;
             }
@@ -2008 +1997 @@
             # Check for: Tag with same name as enclosing tag.
             #
-            else if ($enclosing_tag_re !== '' &&
-                # Same name as enclosing tag.
-                preg_match('{^</?(?:'.$enclosing_tag_re.')\b}', $tag))
-            {
+            else if ( $enclosing_tag_re !== '' &&
+                      # Same name as enclosing tag.
+                      preg_match( '{^</?(?:' . $enclosing_tag_re . ')\b}', $tag )
+            ) {
                 #
                 # Increase/decrease nested tag count.
                 #
-                if ($tag{1} == '/')                     $depth--;
-                else if ($tag{strlen($tag)-2} != '/')   $depth++;
-
-                if ($depth < 0) {
+                if ( $tag{1} == '/' ) {
+                    $depth --;
+                } else if ( $tag{strlen( $tag ) - 2} != '/' ) {
+                    $depth ++;
+                }
+
+                if ( $depth < 0 ) {
                     #
                     # Going out of parent element. Clean up and break so we
@@ -2026 +2018 @@
                     break;
                 }
-                
+
                 $parsed .= $tag;
-            }
-            else {
+            } else {
                 $parsed .= $tag;
             }
-        } while ($depth >= 0);
-        
-        return array($parsed, $text);
-    }
-    function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
-    #
-    # Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
-    #
-    # *   Calls $hash_method to convert any blocks.
-    # *   Stops when the first opening tag closes.
-    # *   $md_attr indicate if the use of the `markdown="1"` attribute is allowed.
-    #     (it is not inside clean tags)
-    #
-    # Returns an array of that form: ( processed text , remaining text )
-    #
-        if ($text === '') return array('', '');
-        
+        } while ( $depth >= 0 );
+
+        return array( $parsed, $text );
+    }
+
+    function _hashHTMLBlocks_inHTML( $text, $hash_method, $md_attr ) {
+        #
+        # Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
+        #
+        # *   Calls $hash_method to convert any blocks.
+        # *   Stops when the first opening tag closes.
+        # *   $md_attr indicate if the use of the `markdown="1"` attribute is allowed.
+        #     (it is not inside clean tags)
+        #
+        # Returns an array of that form: ( processed text , remaining text )
+        #
+        if ( $text === '' ) {
+            return array( '', '' );
+        }
+
         # Regex to match `markdown` attribute inside of a tag.
         $markdown_attr_re = '
@@ -2056 +2050 @@
                 \s*=\s*
                 (?>
-                    (["\'])     # $1: quote delimiter       
+                    (["\'])     # $1: quote delimiter
                     (.*?)       # $2: attribute value
-                    \1          # matching delimiter    
+                    \1          # matching delimiter
                 |
                     ([^\s>]*)   # $3: unquoted attribute value
@@ -2064 +2058 @@
                 ()              # $4: make $3 always defined (avoid warnings)
             }xs';
-        
+
         # Regex to match any tag.
         $tag_re = '{
@@ -2087 +2081 @@
                 )
             }xs';
-        
-        $original_text = $text;     # Save original text in case of faliure.
-        
-        $depth      = 0;    # Current depth inside the tag tree.
-        $block_text = "";   # Temporary text holder for current text.
-        $parsed     = "";   # Parsed text that will be returned.
+
+        $original_text = $text;        # Save original text in case of faliure.
+
+        $depth      = 0;    # Current depth inside the tag tree.
+        $block_text = "";    # Temporary text holder for current text.
+        $parsed     = "";    # Parsed text that will be returned.
 
         #
@@ -2098 +2092 @@
         # (This pattern makes $base_tag_name_re safe without quoting.)
         #
-        if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
+        if ( preg_match( '/^<([\w:$]*)\b/', $text, $matches ) ) {
             $base_tag_name_re = $matches[1];
+        }
 
         #
@@ -2108 +2103 @@
             # Split the text using the first $tag_match pattern found.
             # Text before  pattern will be first in the array, text after
-            # pattern will be at the end, and between will be any catches made 
+            # pattern will be at the end, and between will be any catches made
             # by the pattern.
             #
-            $parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
-            
-            if (count($parts) < 3) {
+            $parts = preg_split( $tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE );
+
+            if ( count( $parts ) < 3 ) {
                 #
                 # End of $text reached with unbalenced tag(s).
                 # In that case, we return original text unchanged and pass the
-                # first character as filtered to prevent an infinite loop in the 
+                # first character as filtered to prevent an infinite loop in the
                 # parent function.
                 #
-                return array($original_text{0}, substr($original_text, 1));
-            }
-            
+                return array( $original_text{0}, substr( $original_text, 1 ) );
+            }
+
             $block_text .= $parts[0]; # Text before current tag.
-            $tag         = $parts[1]; # Tag to handle.
-            $text        = $parts[2]; # Remaining text after current tag.
-            
+            $tag  = $parts[1]; # Tag to handle.
+            $text = $parts[2]; # Remaining text after current tag.
+
             #
             # Check for: Auto-close tag (like <hr/>)
             #            Comments and Processing Instructions.
             #
-            if (preg_match('{^</?(?:'.$this->auto_close_tags_re.')\b}', $tag) ||
-                $tag{1} == '!' || $tag{1} == '?')
-            {
+            if ( preg_match( '{^</?(?:' . $this->auto_close_tags_re . ')\b}', $tag ) ||
+                 $tag{1} == '!' || $tag{1} == '?'
+            ) {
                 # Just add the tag to the block as if it was text.
                 $block_text .= $tag;
-            }
-            else {
+            } else {
                 #
                 # Increase/decrease nested tag count. Only do so if
                 # the tag's name match base tag's.
                 #
-                if (preg_match('{^</?'.$base_tag_name_re.'\b}', $tag)) {
-                    if ($tag{1} == '/')                     $depth--;
-                    else if ($tag{strlen($tag)-2} != '/')   $depth++;
+                if ( preg_match( '{^</?' . $base_tag_name_re . '\b}', $tag ) ) {
+                    if ( $tag{1} == '/' ) {
+                        $depth --;
+                    } else if ( $tag{strlen( $tag ) - 2} != '/' ) {
+                        $depth ++;
+                    }
                 }
-                
+
                 #
                 # Check for `markdown="1"` attribute and handle it.
                 #
-                if ($md_attr && 
-                    preg_match($markdown_attr_re, $tag, $attr_m) &&
-                    preg_match('/^1|block|span$/', $attr_m[2] . $attr_m[3]))
-                {
+                if ( $md_attr &&
+                     preg_match( $markdown_attr_re, $tag, $attr_m ) &&
+                     preg_match( '/^1|block|span$/', $attr_m[2] . $attr_m[3] )
+                ) {
                     # Remove `markdown` attribute from opening tag.
-                    $tag = preg_replace($markdown_attr_re, '', $tag);
-                    
+                    $tag = preg_replace( $markdown_attr_re, '', $tag );
+
                     # Check if text inside this tag must be parsed in span mode.
                     $this->mode = $attr_m[2] . $attr_m[3];
-                    $span_mode = $this->mode == 'span' || $this->mode != 'block' &&
-                        preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag);
-                    
+                    $span_mode  = $this->mode == 'span' || $this->mode != 'block' &&
+                                                           preg_match( '{^<(?:' . $this->contain_span_tags_re . ')\b}', $tag );
+
                     # Calculate indent before tag.
-                    if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
+                    if ( preg_match( '/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches ) ) {
                         $strlen = $this->utf8_strlen;
-                        $indent = $strlen($matches[1], 'UTF-8');
+                        $indent = $strlen( $matches[1], 'UTF-8' );
                     } else {
                         $indent = 0;
                     }
-                    
+
                     # End preceding block with this tag.
                     $block_text .= $tag;
-                    $parsed .= $this->$hash_method($block_text);
-                    
+                    $parsed .= $this->$hash_method( $block_text );
+
                     # Get enclosing tag name for the ParseMarkdown function.
                     # (This pattern makes $tag_name_re safe without quoting.)
-                    preg_match('/^<([\w:$]*)\b/', $tag, $matches);
+                    preg_match( '/^<([\w:$]*)\b/', $tag, $matches );
                     $tag_name_re = $matches[1];
-                    
+
                     # Parse the content using the HTML-in-Markdown parser.
-                    list ($block_text, $text)
-                        = $this->_hashHTMLBlocks_inMarkdown($text, $indent, 
-                            $tag_name_re, $span_mode);
-                    
+                    list ( $block_text, $text )
+                        = $this->_hashHTMLBlocks_inMarkdown( $text, $indent,
+                        $tag_name_re, $span_mode );
+
                     # Outdent markdown text.
-                    if ($indent > 0) {
-                        $block_text = preg_replace("/^[ ]{1,$indent}/m", "", 
-                                                    $block_text);
+                    if ( $indent > 0 ) {
+                        $block_text = preg_replace( "/^[ ]{1,$indent}/m", "",
+                            $block_text );
                     }
-                    
+
                     # Append tag content to parsed text.
-                    if (!$span_mode)    $parsed .= "\n\n$block_text\n\n";
-                    else                $parsed .= "$block_text";
-                    
+                    if ( ! $span_mode ) {
+                        $parsed .= "\n\n$block_text\n\n";
+                    } else {
+                        $parsed .= "$block_text";
+                    }
+
                     # Start over a new block.
                     $block_text = "";
+                } else {
+                    $block_text .= $tag;
                 }
-                else $block_text .= $tag;
-            }
-            
-        } while ($depth > 0);
-        
+            }
+        } while ( $depth > 0 );
+
         #
         # Hash last block text that wasn't processed inside the loop.
         #
-        $parsed .= $this->$hash_method($block_text);
-        
-        return array($parsed, $text);
-    }
-
-
-    function hashClean($text) {
-    #
-    # Called whenever a tag must be hashed when a function insert a "clean" tag
-    # in $text, it pass through this function and is automaticaly escaped, 
-    # blocking invalid nested overlap.
-    #
-        return $this->hashPart($text, 'C');
-    }
-
-
-    function doHeaders($text) {
-    #
-    # Redefined to add id attribute support.
-    #
+        $parsed .= $this->$hash_method( $block_text );
+
+        return array( $parsed, $text );
+    }
+
+    function hashClean( $text ) {
+        #
+        # Called whenever a tag must be hashed when a function insert a "clean" tag
+        # in $text, it pass through this function and is automaticaly escaped,
+        # blocking invalid nested overlap.
+        #
+        return $this->hashPart( $text, 'C' );
+    }
+
+    function doHeaders( $text ) {
+        #
+        # Redefined to add id attribute support.
+        #
         # Setext-style headers:
         #     Header 1  {#header1}
         #     ========
-        #  
+        #
         #     Header 2  {#header2}
         #     --------
@@ -2238 +2236 @@
                 [ ]*\n(=+|-+)[ ]*\n+                # $3: Header footer
             }mx',
-            array(&$this, '_doHeaders_callback_setext'), $text);
+            array( &$this, '_doHeaders_callback_setext' ), $text );
 
         # atx-style headers:
@@ -2247 +2245 @@
         #   ###### Header 6   {#header2}
         #
-        $text = preg_replace_callback('{
+        $text = preg_replace_callback( '{
                 ^(\#{1,6})  # $1 = string of #\'s
                 [ ]*
@@ -2257 +2255 @@
                 \n+
             }xm',
-            array(&$this, '_doHeaders_callback_atx'), $text);
+            array( &$this, '_doHeaders_callback_atx' ), $text );
 
         return $text;
     }
-    function _doHeaders_attr($attr) {
-        if (empty($attr))  return "";
+
+    function _doHeaders_attr( $attr ) {
+        if ( empty( $attr ) ) {
+            return "";
+        }
+
         return " id=\"$attr\"";
     }
-    function _doHeaders_callback_setext($matches) {
-        if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
+
+    function _doHeaders_callback_setext( $matches ) {
+        if ( $matches[3] == '-' && preg_match( '{^- }', $matches[1] ) ) {
             return $matches[0];
+        }
         $level = $matches[3]{0} == '=' ? 1 : 2;
-        $attr  = $this->_doHeaders_attr($id =& $matches[2]);
-        $block = "<h$level$attr>".$this->runSpanGamut($matches[1])."</h$level>";
-        return "\n" . $this->hashBlock($block) . "\n\n";
-    }
-    function _doHeaders_callback_atx($matches) {
-        $level = strlen($matches[1]);
-        $attr  = $this->_doHeaders_attr($id =& $matches[3]);
-        $block = "<h$level$attr>".$this->runSpanGamut($matches[2])."</h$level>";
-        return "\n" . $this->hashBlock($block) . "\n\n";
-    }
-
-
-    function doTables($text) {
-    #
-    # Form HTML tables.
-    #
+        $attr  = $this->_doHeaders_attr( $id =& $matches[2] );
+        $block = "<h$level$attr>" . $this->runSpanGamut( $matches[1] ) . "</h$level>";
+
+        return "\n" . $this->hashBlock( $block ) . "\n\n";
+    }
+
+    function _doHeaders_callback_atx( $matches ) {
+        $level = strlen( $matches[1] );
+        $attr  = $this->_doHeaders_attr( $id =& $matches[3] );
+        $block = "<h$level$attr>" . $this->runSpanGamut( $matches[2] ) . "</h$level>";
+
+        return "\n" . $this->hashBlock( $block ) . "\n\n";
+    }
+
+    function doTables( $text ) {
+        #
+        # Form HTML tables.
+        #
         $less_than_tab = $this->tab_width - 1;
         #
@@ -2294 +2300 @@
         #   | Cell 3   | Cell 4
         #
-        $text = preg_replace_callback('
+        $text = preg_replace_callback( '
             {
                 ^                           # Start of a line
-                [ ]{0,'.$less_than_tab.'}   # Allowed whitespace.
+                [ ]{0,' . $less_than_tab . '}   # Allowed whitespace.
                 [|]                         # Optional leading pipe (present)
                 (.+) \n                     # $1: Header row (at least one pipe)
-                
-                [ ]{0,'.$less_than_tab.'}   # Allowed whitespace.
+
+                [ ]{0,' . $less_than_tab . '}   # Allowed whitespace.
                 [|] ([ ]*[-:]+[-| :]*) \n   # $2: Header underline
-                
+
                 (                           # $3: Cells
                     (?>
@@ -2312 +2318 @@
                 (?=\n|\Z)                   # Stop at final double newline.
             }xm',
-            array(&$this, '_doTable_leadingPipe_callback'), $text);
-        
+            array( &$this, '_doTable_leadingPipe_callback' ), $text );
+
         #
         # Find tables without leading pipe.
@@ -2322 +2328 @@
         #   Cell 3   | Cell 4
         #
-        $text = preg_replace_callback('
+        $text = preg_replace_callback( '
             {
                 ^                           # Start of a line
-                [ ]{0,'.$less_than_tab.'}   # Allowed whitespace.
+                [ ]{0,' . $less_than_tab . '}   # Allowed whitespace.
                 (\S.*[|].*) \n              # $1: Header row (at least one pipe)
-                
-                [ ]{0,'.$less_than_tab.'}   # Allowed whitespace.
+
+                [ ]{0,' . $less_than_tab . '}   # Allowed whitespace.
                 ([-:]+[ ]*[|][-| :]*) \n    # $2: Header underline
-                
+
                 (                           # $3: Cells
                     (?>
@@ -2338 +2344 @@
                 (?=\n|\Z)                   # Stop at final double newline.
             }xm',
-            array(&$this, '_DoTable_callback'), $text);
+            array( &$this, '_DoTable_callback' ), $text );
 
         return $text;
     }
-    function _doTable_leadingPipe_callback($matches) {
-        $head       = $matches[1];
-        $underline  = $matches[2];
-        $content    = $matches[3];
-        
+
+    function _doTable_leadingPipe_callback( $matches ) {
+        $head      = $matches[1];
+        $underline = $matches[2];
+        $content   = $matches[3];
+
         # Remove leading pipe for each row.
-        $content    = preg_replace('/^ *[|]/m', '', $content);
-        
-        return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
-    }
-    function _doTable_callback($matches) {
-        $head       = $matches[1];
-        $underline  = $matches[2];
-        $content    = $matches[3];
+        $content = preg_replace( '/^ *[|]/m', '', $content );
+
+        return $this->_doTable_callback( array( $matches[0], $head, $underline, $content ) );
+    }
+
+    function _doTable_callback( $matches ) {
+        $head      = $matches[1];
+        $underline = $matches[2];
+        $content   = $matches[3];
 
         # Remove any tailing pipes for each line.
-        $head       = preg_replace('/[|] *$/m', '', $head);
-        $underline  = preg_replace('/[|] *$/m', '', $underline);
-        $content    = preg_replace('/[|] *$/m', '', $content);
-        
+        $head      = preg_replace( '/[|] *$/m', '', $head );
+        $underline = preg_replace( '/[|] *$/m', '', $underline );
+        $content   = preg_replace( '/[|] *$/m', '', $content );
+
         # Reading alignement from header underline.
-        $separators = preg_split('/ *[|] */', $underline);
-        foreach ($separators as $n => $s) {
-            if (preg_match('/^ *-+: *$/', $s))      $attr[$n] = ' align="right"';
-            else if (preg_match('/^ *:-+: *$/', $s))$attr[$n] = ' align="center"';
-            else if (preg_match('/^ *:-+ *$/', $s)) $attr[$n] = ' align="left"';
-            else                                    $attr[$n] = '';
-        }
-        
-        # Parsing span elements, including code spans, character escapes, 
+        $separators = preg_split( '/ *[|] */', $underline );
+        foreach ( $separators as $n => $s ) {
+            if ( preg_match( '/^ *-+: *$/', $s ) ) {
+                $attr[ $n ] = ' align="right"';
+            } else if ( preg_match( '/^ *:-+: *$/', $s ) ) {
+                $attr[ $n ] = ' align="center"';
+            } else if ( preg_match( '/^ *:-+ *$/', $s ) ) {
+                $attr[ $n ] = ' align="left"';
+            } else {
+                $attr[ $n ] = '';
+            }
+        }
+
+        # Parsing span elements, including code spans, character escapes,
         # and inline HTML tags, so that pipes inside those gets ignored.
-        $head       = $this->parseSpan($head);
-        $headers    = preg_split('/ *[|] */', $head);
-        $col_count  = count($headers);
-        
+        $head      = $this->parseSpan( $head );
+        $headers   = preg_split( '/ *[|] */', $head );
+        $col_count = count( $headers );
+
         # Write column headers.
         $text = "<table>\n";
         $text .= "<thead>\n";
         $text .= "<tr>\n";
-        foreach ($headers as $n => $header)
-            $text .= "  <th$attr[$n]>".$this->runSpanGamut(trim($header))."</th>\n";
+        foreach ( $headers as $n => $header ) {
+            $text .= "  <th$attr[$n]>" . $this->runSpanGamut( trim( $header ) ) . "</th>\n";
+        }
         $text .= "</tr>\n";
         $text .= "</thead>\n";
-        
+
         # Split content by row.
-        $rows = explode("\n", trim($content, "\n"));
-        
+        $rows = explode( "\n", trim( $content, "\n" ) );
+
         $text .= "<tbody>\n";
-        foreach ($rows as $row) {
-            # Parsing span elements, including code spans, character escapes, 
+        foreach ( $rows as $row ) {
+            # Parsing span elements, including code spans, character escapes,
             # and inline HTML tags, so that pipes inside those gets ignored.
-            $row = $this->parseSpan($row);
-            
+            $row = $this->parseSpan( $row );
+
             # Split row by cell.
-            $row_cells = preg_split('/ *[|] */', $row, $col_count);
-            $row_cells = array_pad($row_cells, $col_count, '');
-            
+            $row_cells = preg_split( '/ *[|] */', $row, $col_count );
+            $row_cells = array_pad( $row_cells, $col_count, '' );
+
             $text .= "<tr>\n";
-            foreach ($row_cells as $n => $cell)
-                $text .= "  <td$attr[$n]>".$this->runSpanGamut(trim($cell))."</td>\n";
+            foreach ( $row_cells as $n => $cell ) {
+                $text .= "  <td$attr[$n]>" . $this->runSpanGamut( trim( $cell ) ) . "</td>\n";
+            }
             $text .= "</tr>\n";
         }
         $text .= "</tbody>\n";
         $text .= "</table>";
-        
-        return $this->hashBlock($text) . "\n";
-    }
-
-    
-    function doDefLists($text) {
-    #
-    # Form HTML definition lists.
-    #
+
+        return $this->hashBlock( $text ) . "\n";
+    }
+
+    function doDefLists( $text ) {
+        #
+        # Form HTML definition lists.
+        #
         $less_than_tab = $this->tab_width - 1;
 
@@ -2421 +2435 @@
             (                               # $1 = whole list
               (                             # $2
-                [ ]{0,'.$less_than_tab.'}
+                [ ]{0,' . $less_than_tab . '}
                 ((?>.*\S.*\n)+)             # $3 = defined term
                 \n?
-                [ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+                [ ]{0,' . $less_than_tab . '}:[ ]+ # colon starting definition
               )
               (?s:.+?)
@@ -2433 +2447 @@
                   (?=\S)
                   (?!                       # Negative lookahead for another term
-                    [ ]{0,'.$less_than_tab.'}
+                    [ ]{0,' . $less_than_tab . '}
                     (?: \S.*\n )+?          # defined term
                     \n?
-                    [ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+                    [ ]{0,' . $less_than_tab . '}:[ ]+ # colon starting definition
                   )
                   (?!                       # Negative lookahead for another definition
-                    [ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+                    [ ]{0,' . $less_than_tab . '}:[ ]+ # colon starting definition
                   )
               )
@@ -2445 +2459 @@
         )'; // mx
 
-        $text = preg_replace_callback('{
+        $text = preg_replace_callback( '{
                 (?>\A\n?|(?<=\n\n))
-                '.$whole_list_re.'
+                ' . $whole_list_re . '
             }mx',
-            array(&$this, '_doDefLists_callback'), $text);
+            array( &$this, '_doDefLists_callback' ), $text );
 
         return $text;
     }
-    function _doDefLists_callback($matches) {
+
+    function _doDefLists_callback( $matches ) {
         # Re-usable patterns to match list item bullets and number markers:
         $list = $matches[1];
-        
+
         # Turn double returns into triple returns, so that we can make a
         # paragraph for the last item in a list, if necessary:
-        $result = trim($this->processDefListItems($list));
+        $result = trim( $this->processDefListItems( $list ) );
         $result = "<dl>\n" . $result . "\n</dl>";
-        return $this->hashBlock($result) . "\n\n";
-    }
-
-
-    function processDefListItems($list_str) {
-    #
-    #   Process the contents of a single definition list, splitting it
-    #   into individual term and definition list items.
-    #
+
+        return $this->hashBlock( $result ) . "\n\n";
+    }
+
+    function processDefListItems( $list_str ) {
+        #
+        #   Process the contents of a single definition list, splitting it
+        #   into individual term and definition list items.
+        #
         $less_than_tab = $this->tab_width - 1;
-        
+
         # trim trailing blank lines:
-        $list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
+        $list_str = preg_replace( "/\n{2,}\\z/", "\n", $list_str );
 
         # Process definition terms.
-        $list_str = preg_replace_callback('{
+        $list_str = preg_replace_callback( '{
             (?>\A\n?|\n\n+)                 # leading line
             (                               # definition terms = $1
-                [ ]{0,'.$less_than_tab.'}   # leading whitespace
-                (?![:][ ]|[ ])              # negative lookahead for a definition 
+                [ ]{0,' . $less_than_tab . '}   # leading whitespace
+                (?![:][ ]|[ ])              # negative lookahead for a definition
                                             #   mark (colon) or more whitespace.
-                (?> \S.* \n)+?              # actual term (not whitespace). 
-            )           
-            (?=\n?[ ]{0,3}:[ ])             # lookahead for following line feed 
+                (?> \S.* \n)+?              # actual term (not whitespace).
+            )
+            (?=\n?[ ]{0,3}:[ ])             # lookahead for following line feed
                                             #   with a definition mark.
             }xm',
-            array(&$this, '_processDefListItems_callback_dt'), $list_str);
+            array( &$this, '_processDefListItems_callback_dt' ), $list_str );
 
         # Process actual definitions.
-        $list_str = preg_replace_callback('{
+        $list_str = preg_replace_callback( '{
             \n(\n+)?                        # leading line = $1
             (                               # marker space = $2
-                [ ]{0,'.$less_than_tab.'}   # whitespace before colon
+                [ ]{0,' . $less_than_tab . '}   # whitespace before colon
                 [:][ ]+                     # definition mark (colon)
             )
@@ -2499 +2514 @@
             (?= \n+                         # stop at next definition mark,
                 (?:                         # next term or end of text
-                    [ ]{0,'.$less_than_tab.'} [:][ ]    |
+                    [ ]{0,' . $less_than_tab . '} [:][ ]    |
                     <dt> | \z
-                )                       
-            )                   
+                )
+            )
             }xm',
-            array(&$this, '_processDefListItems_callback_dd'), $list_str);
+            array( &$this, '_processDefListItems_callback_dd' ), $list_str );
 
         return $list_str;
     }
-    function _processDefListItems_callback_dt($matches) {
-        $terms = explode("\n", trim($matches[1]));
-        $text = '';
-        foreach ($terms as $term) {
-            $term = $this->runSpanGamut(trim($term));
+
+    function _processDefListItems_callback_dt( $matches ) {
+        $terms = explode( "\n", trim( $matches[1] ) );
+        $text  = '';
+        foreach ( $terms as $term ) {
+            $term = $this->runSpanGamut( trim( $term ) );
             $text .= "\n<dt>" . $term . "</dt>";
         }
+
         return $text . "\n";
     }
-    function _processDefListItems_callback_dd($matches) {
-        $leading_line   = $matches[1];
-        $marker_space   = $matches[2];
-        $def            = $matches[3];
-
-        if ($leading_line || preg_match('/\n{2,}/', $def)) {
+
+    function _processDefListItems_callback_dd( $matches ) {
+        $leading_line = $matches[1];
+        $marker_space = $matches[2];
+        $def          = $matches[3];
+
+        if ( $leading_line || preg_match( '/\n{2,}/', $def ) ) {
             # Replace marker with the appropriate whitespace indentation
-            $def = str_repeat(' ', strlen($marker_space)) . $def;
-            $def = $this->runBlockGamut($this->outdent($def . "\n\n"));
-            $def = "\n". $def ."\n";
-        }
-        else {
-            $def = rtrim($def);
-            $def = $this->runSpanGamut($this->outdent($def));
+            $def = str_repeat( ' ', strlen( $marker_space ) ) . $def;
+            $def = $this->runBlockGamut( $this->outdent( $def . "\n\n" ) );
+            $def = "\n" . $def . "\n";
+        } else {
+            $def = rtrim( $def );
+            $def = $this->runSpanGamut( $this->outdent( $def ) );
         }
 
@@ -2536 +2553 @@
     }
 
-
-    function doFencedCodeBlocks($text) {
-    #
-    # Adding the fenced code block syntax to regular Markdown:
-    #
-    # ~~~
-    # Code block
-    # ~~~
-    #
+    function doFencedCodeBlocks( $text ) {
+        #
+        # Adding the fenced code block syntax to regular Markdown:
+        #
+        # ~~~
+        # Code block
+        # ~~~
+        #
         $less_than_tab = $this->tab_width;
-        
-        $text = preg_replace_callback('{
+
+        $text = preg_replace_callback( '{
                 (?:\n|\A)
                 # 1: Opening marker
@@ -2554 +2570 @@
                 )
                 [ ]* \n # Whitespace and newline following marker.
-                
+
                 # 2: Content
                 (
@@ -2562 +2578 @@
                     )+
                 )
-                
+
                 # Closing marker.
                 \1 [ ]* \n
             }xm',
-            array(&$this, '_doFencedCodeBlocks_callback'), $text);
+            array( &$this, '_doFencedCodeBlocks_callback' ), $text );
 
         return $text;
     }
-    function _doFencedCodeBlocks_callback($matches) {
+
+    function _doFencedCodeBlocks_callback( $matches ) {
         $codeblock = $matches[2];
-        $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
-        $codeblock = preg_replace_callback('/^\n+/',
-            array(&$this, '_doFencedCodeBlocks_newlines'), $codeblock);
+        $codeblock = htmlspecialchars( $codeblock, ENT_NOQUOTES );
+        $codeblock = preg_replace_callback( '/^\n+/',
+            array( &$this, '_doFencedCodeBlocks_newlines' ), $codeblock );
         $codeblock = "<pre><code>$codeblock</code></pre>";
-        return "\n\n".$this->hashBlock($codeblock)."\n\n";
-    }
-    function _doFencedCodeBlocks_newlines($matches) {
-        return str_repeat("<br$this->empty_element_suffix", 
-            strlen($matches[0]));
+
+        return "\n\n" . $this->hashBlock( $codeblock ) . "\n\n";
+    }
+
+    function _doFencedCodeBlocks_newlines( $matches ) {
+        return str_repeat( "<br$this->empty_element_suffix",
+            strlen( $matches[0] ) );
     }
 
@@ -2592 +2611 @@
         '*' => '(?<=\S|^)(?<!\*)\*(?!\*)',
         '_' => '(?<=\S|^)(?<!_)_(?![a-zA-Z0-9_])',
-        );
+    );
     var $strong_relist = array(
         ''   => '(?:(?<!\*)\*\*(?!\*)|(?<![a-zA-Z0-9_])__(?!_))(?=\S|$)(?![.,:;]\s)',
         '**' => '(?<=\S|^)(?<!\*)\*\*(?!\*)',
         '__' => '(?<=\S|^)(?<!_)__(?![a-zA-Z0-9_])',
-        );
+    );
     var $em_strong_relist = array(
         ''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<![a-zA-Z0-9_])___(?!_))(?=\S|$)(?![.,:;]\s)',
         '***' => '(?<=\S|^)(?<!\*)\*\*\*(?!\*)',
         '___' => '(?<=\S|^)(?<!_)___(?![a-zA-Z0-9_])',
-        );
-
-
-    function formParagraphs($text) {
-    #
-    #   Params:
-    #       $text - string to process with html <p> tags
-    #
+    );
+
+    function formParagraphs( $text ) {
+        #
+        #   Params:
+        #       $text - string to process with html <p> tags
+        #
         # Strip leading and trailing lines:
-        $text = preg_replace('/\A\n+|\n+\z/', '', $text);
-        
-        $grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+        $text = preg_replace( '/\A\n+|\n+\z/', '', $text );
+
+        $grafs = preg_split( '/\n{2,}/', $text, - 1, PREG_SPLIT_NO_EMPTY );
 
         #
         # Wrap <p> tags and unhashify HTML blocks
         #
-        foreach ($grafs as $key => $value) {
-            $value = trim($this->runSpanGamut($value));
-            
+        foreach ( $grafs as $key => $value ) {
+            $value = trim( $this->runSpanGamut( $value ) );
+
             # Check if this should be enclosed in a paragraph.
             # Clean tag hashes & block tag hashes are left alone.
-            $is_p = !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value);
-            
-            if ($is_p) {
+            $is_p = ! preg_match( '/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value );
+
+            if ( $is_p ) {
                 $value = "<p>$value</p>";
             }
-            $grafs[$key] = $value;
-        }
-        
-        # Join grafs in one text, then unhash HTML tags. 
-        $text = implode("\n\n", $grafs);
-        
+            $grafs[ $key ] = $value;
+        }
+
+        # Join grafs in one text, then unhash HTML tags.
+        $text = implode( "\n\n", $grafs );
+
         # Finish by removing any tag hashes still present in $text.
-        $text = $this->unhash($text);
-        
+        $text = $this->unhash( $text );
+
         return $text;
     }
-    
-    
+
     ### Footnotes
-    
-    function stripFootnotes($text) {
-    #
-    # Strips link definitions from text, stores the URLs and titles in
-    # hash references.
-    #
+
+    function stripFootnotes( $text ) {
+        #
+        # Strips link definitions from text, stores the URLs and titles in
+        # hash references.
+        #
         $less_than_tab = $this->tab_width - 1;
 
         # Link defs are in the form: [^id]: url "optional title"
-        $text = preg_replace_callback('{
-            ^[ ]{0,'.$less_than_tab.'}\[\^(.+?)\][ ]?:  # note_id = $1
+        $text = preg_replace_callback( '{
+            ^[ ]{0,' . $less_than_tab . '}\[\^(.+?)\][ ]?:  # note_id = $1
               [ ]*
               \n?                   # maybe *one* newline
             (                       # text = $2 (no blank lines allowed)
-                (?:                 
+                (?:
                     .+              # actual text
                 |
-                    \n              # newlines but 
+                    \n              # newlines but
                     (?!\[\^.+?\]:\s)# negative lookahead for footnote marker.
-                    (?!\n+[ ]{0,3}\S)# ensure line is not blank and followed 
+                    (?!\n+[ ]{0,3}\S)# ensure line is not blank and followed
                                     # by non-indented content
                 )*
-            )       
+            )
             }xm',
-            array(&$this, '_stripFootnotes_callback'),
-            $text);
+            array( &$this, '_stripFootnotes_callback' ),
+            $text );
+
         return $text;
     }
-    function _stripFootnotes_callback($matches) {
-        $note_id = $this->fn_id_prefix . $matches[1];
-        $this->footnotes[$note_id] = $this->outdent($matches[2]);
+
+    function _stripFootnotes_callback( $matches ) {
+        $note_id                     = $this->fn_id_prefix . $matches[1];
+        $this->footnotes[ $note_id ] = $this->outdent( $matches[2] );
+
         return ''; # String that will replace the block
     }
 
-
-    function doFootnotes($text) {
-    #
-    # Replace footnote references in $text [^id] with a special text-token 
-    # which will be replaced by the actual footnote marker in appendFootnotes.
-    #
-        if (!$this->in_anchor) {
-            $text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text);
-        }
+    function doFootnotes( $text ) {
+        #
+        # Replace footnote references in $text [^id] with a special text-token
+        # which will be replaced by the actual footnote marker in appendFootnotes.
+        #
+        if ( ! $this->in_anchor ) {
+            $text = preg_replace( '{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text );
+        }
+
         return $text;
     }
 
-    
-    function appendFootnotes($text) {
-    #
-    # Append footnote list to text.
-    #
-        $text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', 
-            array(&$this, '_appendFootnotes_callback'), $text);
-    
-        if (!empty($this->footnotes_ordered)) {
+    function appendFootnotes( $text ) {
+        #
+        # Append footnote list to text.
+        #
+        $text = preg_replace_callback( '{F\x1Afn:(.*?)\x1A:}',
+            array( &$this, '_appendFootnotes_callback' ), $text );
+
+        if ( ! empty( $this->footnotes_ordered ) ) {
             $text .= "\n\n";
             $text .= "<div class=\"footnotes\">\n";
-            $text .= "<hr". $this->empty_element_suffix ."\n";
+            $text .= "<hr" . $this->empty_element_suffix . "\n";
             $text .= "<ol>\n\n";
-            
+
             $attr = " rev=\"footnote\"";
-            if ($this->fn_backlink_class != "") {
+            if ( $this->fn_backlink_class != "" ) {
                 $class = $this->fn_backlink_class;
-                $class = $this->encodeAttribute($class);
+                $class = $this->encodeAttribute( $class );
                 $attr .= " class=\"$class\"";
             }
-            if ($this->fn_backlink_title != "") {
+            if ( $this->fn_backlink_title != "" ) {
                 $title = $this->fn_backlink_title;
-                $title = $this->encodeAttribute($title);
+                $title = $this->encodeAttribute( $title );
                 $attr .= " title=\"$title\"";
             }
             $num = 0;
-            
-            while (!empty($this->footnotes_ordered)) {
-                $footnote = reset($this->footnotes_ordered);
-                $note_id = key($this->footnotes_ordered);
-                unset($this->footnotes_ordered[$note_id]);
-                
+
+            while ( ! empty( $this->footnotes_ordered ) ) {
+                $footnote = reset( $this->footnotes_ordered );
+                $note_id  = key( $this->footnotes_ordered );
+                unset( $this->footnotes_ordered[ $note_id ] );
+
                 $footnote .= "\n"; # Need to append newline before parsing.
-                $footnote = $this->runBlockGamut("$footnote\n");                
-                $footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', 
-                    array(&$this, '_appendFootnotes_callback'), $footnote);
-                
-                $attr = str_replace("%%", ++$num, $attr);
-                $note_id = $this->encodeAttribute($note_id);
-                
+                $footnote = $this->runBlockGamut( "$footnote\n" );
+                $footnote = preg_replace_callback( '{F\x1Afn:(.*?)\x1A:}',
+                    array( &$this, '_appendFootnotes_callback' ), $footnote );
+
+                $attr    = str_replace( "%%", ++ $num, $attr );
+                $note_id = $this->encodeAttribute( $note_id );
+
                 # Add backlink to last paragraph; create new paragraph if needed.
                 $backlink = "<a href=\"#fnref:$note_id\"$attr>&#8617;</a>";
-                if (preg_match('{</p>$}', $footnote)) {
-                    $footnote = substr($footnote, 0, -4) . "&#160;$backlink</p>";
+                if ( preg_match( '{</p>$}', $footnote ) ) {
+                    $footnote = substr( $footnote, 0, - 4 ) . "&#160;$backlink</p>";
                 } else {
                     $footnote .= "\n\n<p>$backlink</p>";
                 }
-                
+
                 $text .= "<li id=\"fn:$note_id\">\n";
                 $text .= $footnote . "\n";
                 $text .= "</li>\n\n";
             }
-            
+
             $text .= "</ol>\n";
             $text .= "</div>";
         }
+
         return $text;
     }
-    function _appendFootnotes_callback($matches) {
+
+    function _appendFootnotes_callback( $matches ) {
         $node_id = $this->fn_id_prefix . $matches[1];
-        
+
         # Create footnote marker only if it has a corresponding footnote *and*
         # the footnote hasn't been used by another marker.
-        if (isset($this->footnotes[$node_id])) {
+        if ( isset( $this->footnotes[ $node_id ] ) ) {
             # Transfert footnote content to the ordered list.
-            $this->footnotes_ordered[$node_id] = $this->footnotes[$node_id];
-            unset($this->footnotes[$node_id]);
-            
-            $num = $this->footnote_counter++;
+            $this->footnotes_ordered[ $node_id ] = $this->footnotes[ $node_id ];
+            unset( $this->footnotes[ $node_id ] );
+
+            $num  = $this->footnote_counter ++;
             $attr = " rel=\"footnote\"";
-            if ($this->fn_link_class != "") {
+            if ( $this->fn_link_class != "" ) {
                 $class = $this->fn_link_class;
-                $class = $this->encodeAttribute($class);
+                $class = $this->encodeAttribute( $class );
                 $attr .= " class=\"$class\"";
             }
-            if ($this->fn_link_title != "") {
+            if ( $this->fn_link_title != "" ) {
                 $title = $this->fn_link_title;
-                $title = $this->encodeAttribute($title);
+                $title = $this->encodeAttribute( $title );
                 $attr .= " title=\"$title\"";
             }
-            
-            $attr = str_replace("%%", $num, $attr);
-            $node_id = $this->encodeAttribute($node_id);
-            
+
+            $attr    = str_replace( "%%", $num, $attr );
+            $node_id = $this->encodeAttribute( $node_id );
+
             return
-                "<sup id=\"fnref:$node_id\">".
-                "<a href=\"#fn:$node_id\"$attr>$num</a>".
+                "<sup id=\"fnref:$node_id\">" .
+                "<a href=\"#fn:$node_id\"$attr>$num</a>" .
                 "</sup>";
         }
-        
-        return "[^".$matches[1]."]";
-    }
-        
-    
+
+        return "[^" . $matches[1] . "]";
+    }
+
     ### Abbreviations ###
-    
-    function stripAbbreviations($text) {
-    #
-    # Strips abbreviations from text, stores titles in hash references.
-    #
+
+    function stripAbbreviations( $text ) {
+        #
+        # Strips abbreviations from text, stores titles in hash references.
+        #
         $less_than_tab = $this->tab_width - 1;
 
         # Link defs are in the form: [id]*: url "optional title"
-        $text = preg_replace_callback('{
-            ^[ ]{0,'.$less_than_tab.'}\*\[(.+?)\][ ]?:  # abbr_id = $1
-            (.*)                    # text = $2 (no blank lines allowed)    
+        $text = preg_replace_callback( '{
+            ^[ ]{0,' . $less_than_tab . '}\*\[(.+?)\][ ]?:  # abbr_id = $1
+            (.*)                    # text = $2 (no blank lines allowed)
             }xm',
-            array(&$this, '_stripAbbreviations_callback'),
-            $text);
+            array( &$this, '_stripAbbreviations_callback' ),
+            $text );
+
         return $text;
     }
-    function _stripAbbreviations_callback($matches) {
+
+    function _stripAbbreviations_callback( $matches ) {
         $abbr_word = $matches[1];
         $abbr_desc = $matches[2];
-        if ($this->abbr_word_re)
+        if ( $this->abbr_word_re ) {
             $this->abbr_word_re .= '|';
-        $this->abbr_word_re .= preg_quote($abbr_word);
-        $this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
+        }
+        $this->abbr_word_re .= preg_quote( $abbr_word );
+        $this->abbr_desciptions[ $abbr_word ] = trim( $abbr_desc );
+
         return ''; # String that will replace the block
     }
-    
-    
-    function doAbbreviations($text) {
-    #
-    # Find defined abbreviations in text and wrap them in <abbr> elements.
-    #
-        if ($this->abbr_word_re) {
-            // cannot use the /x modifier because abbr_word_re may 
+
+    function doAbbreviations( $text ) {
+        #
+        # Find defined abbreviations in text and wrap them in <abbr> elements.
+        #
+        if ( $this->abbr_word_re ) {
+            // cannot use the /x modifier because abbr_word_re may
             // contain significant spaces:
-            $text = preg_replace_callback('{'.
-                '(?<![\w\x1A])'.
-                '(?:'.$this->abbr_word_re.')'.
-                '(?![\w\x1A])'.
-                '}', 
-                array(&$this, '_doAbbreviations_callback'), $text);
-        }
+            $text = preg_replace_callback( '{' .
+                                           '(?<![\w\x1A])' .
+                                           '(?:' . $this->abbr_word_re . ')' .
+                                           '(?![\w\x1A])' .
+                                           '}',
+                array( &$this, '_doAbbreviations_callback' ), $text );
+        }
+
         return $text;
     }
-    function _doAbbreviations_callback($matches) {
+
+    function _doAbbreviations_callback( $matches ) {
         $abbr = $matches[0];
-        if (isset($this->abbr_desciptions[$abbr])) {
-            $desc = $this->abbr_desciptions[$abbr];
-            if (empty($desc)) {
-                return $this->hashPart("<abbr>$abbr</abbr>");
+        if ( isset( $this->abbr_desciptions[ $abbr ] ) ) {
+            $desc = $this->abbr_desciptions[ $abbr ];
+            if ( empty( $desc ) ) {
+                return $this->hashPart( "<abbr>$abbr</abbr>" );
             } else {
-                $desc = $this->encodeAttribute($desc);
-                return $this->hashPart("<abbr title=\"$desc\">$abbr</abbr>");
+                $desc = $this->encodeAttribute( $desc );
+
+                return $this->hashPart( "<abbr title=\"$desc\">$abbr</abbr>" );
             }
         } else {
@@ -2840 +2866 @@
         }
     }
-
 }
-
 
 /*
@@ -2852 +2876 @@
 -----------
 
-This is a PHP port of the original Markdown formatter written in Perl 
-by John Gruber. This special "Extra" version of PHP Markdown features 
-further enhancements to the syntax for making additional constructs 
+This is a PHP port of the original Markdown formatter written in Perl
+by John Gruber. This special "Extra" version of PHP Markdown features
+further enhancements to the syntax for making additional constructs
 such as tables and definition list.
 
@@ -2884 +2908 @@
 
 Version History
---------------- 
+---------------
 
 See the readme file for detailed release notes for this version.
@@ -2892 +2916 @@
 ---------------------
 
-PHP Markdown & Extra  
-Copyright (c) 2004-2009 Michel Fortin  
-<http://michelf.com/>  
+PHP Markdown & Extra
+Copyright (c) 2004-2009 Michel Fortin
+<http://michelf.com/>
 All rights reserved.
 
-Based on Markdown  
-Copyright (c) 2003-2006 John Gruber   
-<http://daringfireball.net/>   
+Based on Markdown
+Copyright (c) 2003-2006 John Gruber
+<http://daringfireball.net/>
 All rights reserved.