ci-bonfire / Sprint

application/helpers/markdown_helper.php

Doc Comments +18 added lines

@@ -1122,6 +1122,10 @@ 
 
     var $list_level = 0;
 
+    /**
+     * @param string $list_str
+     * @param string $marker_any_re
+     */
     function processListItems($list_str, $marker_any_re)
     {
         #
@@ -1234,6 +1238,9 @@ 
         return "\n\n" . $this->hashBlock($codeblock) . "\n\n";
     }
 
+    /**
+     * @param string $code
+     */
     function makeCodeSpan($code)
     {
         #
@@ -1751,6 +1758,9 @@ 
     # hanlde UTF-8 if the default function does not exist.
     var $utf8_strlen = 'mb_strlen';
 
+    /**
+     * @param string $text
+     */
     function detab($text)
     {
         #
@@ -2340,6 +2350,11 @@ 
         return array($parsed, $text);
     }
 
+    /**
+     * @param string $text
+     * @param string $hash_method
+     * @param boolean $md_attr
+     */
     function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr)
     {
         #
@@ -3078,6 +3093,9 @@ 
         return $this->hashBlock($result) . "\n\n";
     }
 
+    /**
+     * @return string
+     */
     function processDefListItems($list_str)
     {
         #

Indentation +2725 added lines, -2725 removed lines

@@ -56,15 +56,15 @@ 
 #
 # Initialize the parser and return the result of its transform method.
 #
-    # Setup static parser variable.
-    static $parser;
-    if (!isset($parser)) {
-        $parser_class = MARKDOWN_PARSER_CLASS;
-        $parser       = new $parser_class;
-    }
-
-    # Transform text using parser.
-    return $parser->transform($text);
+	# Setup static parser variable.
+	static $parser;
+	if (!isset($parser)) {
+		$parser_class = MARKDOWN_PARSER_CLASS;
+		$parser       = new $parser_class;
+	}
+
+	# Transform text using parser.
+	return $parser->transform($text);
 }
 
 ### WordPress Plugin Interface ###
@@ -80,120 +80,120 @@ 
 */
 
 if (isset($wp_version)) {
-    # More details about how it works here:
-    # <http://michelf.ca/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);
-    }
-
-    # Add a footnote id prefix to posts when inside a loop.
-    function mdwp_MarkdownPost($text)
-    {
-        static $parser;
-        if (!$parser) {
-            $parser_class = MARKDOWN_PARSER_CLASS;
-            $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);
-    }
-
-    # Comments
-    # - Remove WordPress paragraph generator.
-    # - Remove WordPress auto-link generator.
-    # - 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);
-
-        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);
-        }
-        return $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)
-    {
-        global $mdwp_hidden_tags, $mdwp_placeholders;
-        return str_replace($mdwp_placeholders, $mdwp_hidden_tags, $text);
-    }
+	# More details about how it works here:
+	# <http://michelf.ca/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);
+	}
+
+	# Add a footnote id prefix to posts when inside a loop.
+	function mdwp_MarkdownPost($text)
+	{
+		static $parser;
+		if (!$parser) {
+			$parser_class = MARKDOWN_PARSER_CLASS;
+			$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);
+	}
+
+	# Comments
+	# - Remove WordPress paragraph generator.
+	# - Remove WordPress auto-link generator.
+	# - 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);
+
+		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);
+		}
+		return $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)
+	{
+		global $mdwp_hidden_tags, $mdwp_placeholders;
+		return str_replace($mdwp_placeholders, $mdwp_hidden_tags, $text);
+	}
 }
 
 ### bBlog Plugin Info ###
 
 function identify_modifier_markdown()
 {
-    return array(
-        '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.ca/projects/php-markdown/">More...</a>',
-    );
+	return array(
+		'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.ca/projects/php-markdown/">More...</a>',
+	);
 }
 
 ### Smarty Modifier Interface ###
 
 function smarty_modifier_markdown($text)
 {
-    return Markdown($text);
+	return Markdown($text);
 }
 
 ### Textile Compatibility Mode ###
@@ -201,32 +201,32 @@ 
 # Rename this file to "classTextile.php" and it can replace Textile everywhere.
 
 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);
-            }
-            return $text;
-        }
-
-        # Fake restricted version: restrictions are not supported for now.
-        function TextileRestricted($text, $lite = '', $noimage = '')
-        {
-            return $this->TextileThis($text, $lite);
-        }
-
-        # Workaround to ensure compatibility with TextPattern 4.0.3.
-        function blockLite($text) { return $text; }
-    }
+	# 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);
+			}
+			return $text;
+		}
+
+		# Fake restricted version: restrictions are not supported for now.
+		function TextileRestricted($text, $lite = '', $noimage = '')
+		{
+			return $this->TextileThis($text, $lite);
+		}
+
+		# Workaround to ensure compatibility with TextPattern 4.0.3.
+		function blockLite($text) { return $text; }
+	}
 }
 
 #
@@ -236,156 +236,156 @@ 
 class Markdown_Parser
 {
 
-    ### Configuration Variables ###
+	### Configuration Variables ###
 
-    # Change to ">" for HTML output.
-    var $empty_element_suffix = MARKDOWN_EMPTY_ELEMENT_SUFFIX;
+	# Change to ">" for HTML output.
+	var $empty_element_suffix = MARKDOWN_EMPTY_ELEMENT_SUFFIX;
 
-    var $tab_width = MARKDOWN_TAB_WIDTH;
+	var $tab_width = MARKDOWN_TAB_WIDTH;
 
-    # Change to `true` to disallow markup or entities.
-    var $no_markup = false;
+	# Change to `true` to disallow markup or entities.
+	var $no_markup = false;
 
-    var $no_entities = false;
+	var $no_entities = false;
 
-    # Predefined urls and titles for reference links and images.
-    var $predef_urls = array();
+	# Predefined urls and titles for reference links and images.
+	var $predef_urls = array();
 
-    var $predef_titles = array();
+	var $predef_titles = array();
 
-    ### Parser Implementation ###
+	### Parser Implementation ###
 
-    # Regex to match balanced [brackets].
-    # Needed to insert a maximum bracked depth while converting to PHP.
-    var $nested_brackets_depth = 6;
+	# 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_brackets_re;
 
-    var $nested_url_parenthesis_depth = 4;
+	var $nested_url_parenthesis_depth = 4;
 
-    var $nested_url_parenthesis_re;
+	var $nested_url_parenthesis_re;
 
-    # Table of hash values for escaped characters:
-    var $escape_chars = '\`*_{}[]()>#+-.!';
+	# Table of hash values for escaped characters:
+	var $escape_chars = '\`*_{}[]()>#+-.!';
 
-    var $escape_chars_re;
+	var $escape_chars_re;
 
-    function __construct()
-    {
-        #
-        # Constructor function. Initialize appropriate member variables.
-        #
-        $this->_initDetab();
-        $this->prepareItalicsAndBold();
+	function __construct()
+	{
+		#
+		# 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_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->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->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);
-    }
+		# Sort document, block, and span gamut in ascendent priority order.
+		asort($this->document_gamut);
+		asort($this->block_gamut);
+		asort($this->span_gamut);
+	}
 
-    # Internal hashes used during transformation.
-    var $urls = array();
+	# Internal hashes used during transformation.
+	var $urls = array();
 
-    var $titles = array();
+	var $titles = array();
 
-    var $html_hashes = array();
+	var $html_hashes = array();
 
-    # Status flag to avoid invalid nesting.
-    var $in_anchor = false;
+	# Status flag to avoid invalid nesting.
+	var $in_anchor = false;
 
-    function setup()
-    {
-        #
-        # Called before the transformation process starts to setup parser
-        # states.
-        #
-        # Clear global hashes.
-        $this->urls        = $this->predef_urls;
-        $this->titles      = $this->predef_titles;
-        $this->html_hashes = array();
+	function setup()
+	{
+		#
+		# Called before the transformation process starts to setup parser
+		# states.
+		#
+		# Clear global hashes.
+		$this->urls        = $this->predef_urls;
+		$this->titles      = $this->predef_titles;
+		$this->html_hashes = array();
 
-        $this->in_anchor = false;
-    }
+		$this->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();
-        $this->html_hashes = array();
-    }
+	function teardown()
+	{
+		#
+		# 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.
-        #
-        $this->setup();
+	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);
+		# Remove UTF-8 BOM and marker character in input, if present.
+		$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);
+		# Standardize line endings:
+		#   DOS to Unix and Mac to Unix
+		$text = preg_replace('{\r\n?}', "\n", $text);
 
-        # Make sure $text ends with a couple of newlines:
-        $text .= "\n\n";
-
-        # Convert all tabs to spaces.
-        $text = $this->detab($text);
-
-        # Turn block-level HTML blocks into hash entries
-        $text = $this->hashHTMLBlocks($text);
-
-        # Strip any lines consisting only of spaces and tabs.
-        # This makes subsequent regexen easier to write, because we can
-        # match consecutive blank lines with /\n+/ instead of something
-        # contorted like /[ ]*\n+/ .
-        $text = preg_replace('/^[ ]+$/m', '', $text);
-
-        # Run document gamut methods.
-        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.
-        #
-        $less_than_tab = $this->tab_width - 1;
-
-        # Link defs are in the form: ^[id]: url "optional title"
-        $text = preg_replace_callback(
-            '{
+		# Make sure $text ends with a couple of newlines:
+		$text .= "\n\n";
+
+		# Convert all tabs to spaces.
+		$text = $this->detab($text);
+
+		# Turn block-level HTML blocks into hash entries
+		$text = $this->hashHTMLBlocks($text);
+
+		# Strip any lines consisting only of spaces and tabs.
+		# This makes subsequent regexen easier to write, because we can
+		# match consecutive blank lines with /\n+/ instead of something
+		# contorted like /[ ]*\n+/ .
+		$text = preg_replace('/^[ ]+$/m', '', $text);
+
+		# Run document gamut methods.
+		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.
+		#
+		$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
 							  [ ]*
 							  \n?				# maybe *one* newline
@@ -407,51 +407,51 @@ 
 							)?	# title is optional
 							(?:\n+|\Z)
 			}xm',
-            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];
-        return ''; # String that will replace the block
-    }
-
-    function hashHTMLBlocks($text)
-    {
-        if ($this->no_markup) {
-            return $text;
-        }
-
-        $less_than_tab = $this->tab_width - 1;
-
-        # Hashify HTML blocks:
-        # 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:
-        #
-        # *  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
-        #    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|svg|' .
-                           'article|section|nav|aside|hgroup|header|footer|' .
-                           'figure';
-
-        # Regular expression for the content of a block tag.
-        $nested_tags_level = 4;
-        $attr              = '
+			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];
+		return ''; # String that will replace the block
+	}
+
+	function hashHTMLBlocks($text)
+	{
+		if ($this->no_markup) {
+			return $text;
+		}
+
+		$less_than_tab = $this->tab_width - 1;
+
+		# Hashify HTML blocks:
+		# 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:
+		#
+		# *  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
+		#    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|svg|' .
+						   'article|section|nav|aside|hgroup|header|footer|' .
+						   'figure';
+
+		# Regular expression for the content of a block tag.
+		$nested_tags_level = 4;
+		$attr              = '
 			(?>				# optional tag attributes
 			  \s			# starts with whitespace
 			  (?>
@@ -465,9 +465,9 @@ 
 			  )*
 			)?
 			';
-        $content           =
-            str_repeat(
-                '
+		$content           =
+			str_repeat(
+				'
 				(?>
 				  [^<]+			# content without tag
 				|
@@ -477,34 +477,34 @@ 
 					  />
 					|
 					  >',
-                $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);
-
-        # First, look for nested blocks, e.g.:
-        # 	<div>
-        # 		<div>
-        # 		tags for inner block must be indented.
-        # 		</div>
-        # 	</div>
-        #
-        # The outermost tags must start at the left margin for this to match, and
-        # the inner nested divs must be indented.
-        # 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(
-            '{(?>
+				$nested_tags_level
+			);
+		$content2          = str_replace('\2', '\3', $content);
+
+		# First, look for nested blocks, e.g.:
+		# 	<div>
+		# 		<div>
+		# 		tags for inner block must be indented.
+		# 		</div>
+		# 	</div>
+		#
+		# The outermost tags must start at the left margin for this to match, and
+		# the inner nested divs must be indented.
+		# 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(
+			'{(?>
 			(?>
 				(?<=\n\n)		# Starting after a blank line
 				|				# or
@@ -565,100 +565,100 @@ 
 
 			)
 			)}Sxmi',
-            array(&$this, '_hashHTMLBlocks_callback'),
-            $text
-        );
-
-        return $text;
-    }
-
-    function _hashHTMLBlocks_callback($matches)
-    {
-        $text = $matches[1];
-        $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.
-        #
-        # Swap back any tag hash found in $text so we do not have to `unhash`
-        # multiple times at the end.
-        $text = $this->unhash($text);
-
-        # Then hash the block.
-        static $i = 0;
-        $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');
-    }
-
-    var $block_gamut = array(
-        #
-        # 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
-        # begining in the Markdown function since hashed blocks can be part of
-        # 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);
-        }
-
-        # Finally form paragraph and restore hashed blocks.
-        $text = $this->formParagraphs($text);
-
-        return $text;
-    }
-
-    function doHorizontalRules($text)
-    {
-        # Do Horizontal Rules:
-        return preg_replace(
-            '{
+			array(&$this, '_hashHTMLBlocks_callback'),
+			$text
+		);
+
+		return $text;
+	}
+
+	function _hashHTMLBlocks_callback($matches)
+	{
+		$text = $matches[1];
+		$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.
+		#
+		# Swap back any tag hash found in $text so we do not have to `unhash`
+		# multiple times at the end.
+		$text = $this->unhash($text);
+
+		# Then hash the block.
+		static $i = 0;
+		$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');
+	}
+
+	var $block_gamut = array(
+		#
+		# 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
+		# begining in the Markdown function since hashed blocks can be part of
+		# 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);
+		}
+
+		# Finally form paragraph and restore hashed blocks.
+		$text = $this->formParagraphs($text);
+
+		return $text;
+	}
+
+	function doHorizontalRules($text)
+	{
+		# Do Horizontal Rules:
+		return preg_replace(
+			'{
 				^[ ]{0,3}	# Leading space
 				([-*_])		# $1: First marker
 				(?>			# Repeated marker group
@@ -668,74 +668,74 @@ 
 				[ ]*		# Tailing spaces
 				$			# End of line.
 			}mx',
-            "\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.
-        #
-        # Process character escapes, code spans, and inline HTML
-        # in one shot.
-        "parseSpan"           => - 30,
-        # Process anchor and image tags. Images must come first,
-        # because ![foo][f] looks like an anchor.
-        "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);
-        }
-
-        return $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;
-        }
-        $this->in_anchor = true;
-
-        #
-        # First, handle reference-style links: [link text] [id]
-        #
-        $text = preg_replace_callback(
-            '{
+			"\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.
+		#
+		# Process character escapes, code spans, and inline HTML
+		# in one shot.
+		"parseSpan"           => - 30,
+		# Process anchor and image tags. Images must come first,
+		# because ![foo][f] looks like an anchor.
+		"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);
+		}
+
+		return $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;
+		}
+		$this->in_anchor = true;
+
+		#
+		# First, handle reference-style links: [link text] [id]
+		#
+		$text = preg_replace_callback(
+			'{
 			(					# wrap whole match in $1
 			  \[
 				(' . $this->nested_brackets_re . ')	# link text = $2
@@ -749,15 +749,15 @@ 
 			  \]
 			)
 			}xs',
-            array(&$this, '_doAnchors_reference_callback'),
-            $text
-        );
-
-        #
-        # Next, inline-style links: [link text](url "optional title")
-        #
-        $text = preg_replace_callback(
-            '{
+			array(&$this, '_doAnchors_reference_callback'),
+			$text
+		);
+
+		#
+		# Next, inline-style links: [link text](url "optional title")
+		#
+		$text = preg_replace_callback(
+			'{
 			(				# wrap whole match in $1
 			  \[
 				(' . $this->nested_brackets_re . ')	# link text = $2
@@ -779,97 +779,97 @@ 
 			  \)
 			)
 			}xs',
-            array(&$this, '_doAnchors_inline_callback'),
-            $text
-        );
-
-        #
-        # Last, handle reference-style shortcuts: [link text]
-        # These must come last in case you've also got [link text][1]
-        # or [link text](/foo)
-        #
-        $text = preg_replace_callback(
-            '{
+			array(&$this, '_doAnchors_inline_callback'),
+			$text
+		);
+
+		#
+		# Last, handle reference-style shortcuts: [link text]
+		# These must come last in case you've also got [link text][1]
+		# or [link text](/foo)
+		#
+		$text = preg_replace_callback(
+			'{
 			(					# wrap whole match in $1
 			  \[
 				([^\[\]]+)		# link text = $2; can\'t contain [ or ]
 			  \]
 			)
 			}xs',
-            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];
-        $link_id     =& $matches[3];
-
-        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);
-
-            $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);
-            $result .= ">$link_text</a>";
-            $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);
-
-        $result = "<a href=\"$url\"";
-        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.
-        #
-        #
-        # First, handle reference-style labeled images: ![alt text][id]
-        #
-        $text = preg_replace_callback(
-            '{
+			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];
+		$link_id     =& $matches[3];
+
+		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);
+
+			$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);
+			$result .= ">$link_text</a>";
+			$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);
+
+		$result = "<a href=\"$url\"";
+		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.
+		#
+		#
+		# First, handle reference-style labeled images: ![alt text][id]
+		#
+		$text = preg_replace_callback(
+			'{
 			(				# wrap whole match in $1
 			  !\[
 				(' . $this->nested_brackets_re . ')		# alt text = $2
@@ -884,16 +884,16 @@ 
 
 			)
 			}xs',
-            array(&$this, '_doImages_reference_callback'),
-            $text
-        );
-
-        #
-        # Next, handle inline images:  ![alt text](url "optional title")
-        # Don't forget: encode * and _
-        #
-        $text = preg_replace_callback(
-            '{
+			array(&$this, '_doImages_reference_callback'),
+			$text
+		);
+
+		#
+		# Next, handle inline images:  ![alt text](url "optional title")
+		# Don't forget: encode * and _
+		#
+		$text = preg_replace_callback(
+			'{
 			(				# wrap whole match in $1
 			  !\[
 				(' . $this->nested_brackets_re . ')		# alt text = $2
@@ -916,85 +916,85 @@ 
 			  \)
 			)
 			}xs',
-            array(&$this, '_doImages_inline_callback'),
-            $text
-        );
-
-        return $text;
-    }
-
-    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]);
-            $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\"";
-            }
-            $result .= $this->empty_element_suffix;
-            $result = $this->hashPart($result);
-        } else {
-            # If there's no such link ID, leave intact:
-            $result = $whole_match;
-        }
-
-        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
-        }
-        $result .= $this->empty_element_suffix;
-
-        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
-        );
-
-        # atx-style headers:
-        #	# Header 1
-        #	## Header 2
-        #	## Header 2 with closing hashes ##
-        #	...
-        #	###### Header 6
-        #
-        $text = preg_replace_callback(
-            '{
+			array(&$this, '_doImages_inline_callback'),
+			$text
+		);
+
+		return $text;
+	}
+
+	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]);
+			$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\"";
+			}
+			$result .= $this->empty_element_suffix;
+			$result = $this->hashPart($result);
+		} else {
+			# If there's no such link ID, leave intact:
+			$result = $whole_match;
+		}
+
+		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
+		}
+		$result .= $this->empty_element_suffix;
+
+		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
+		);
+
+		# atx-style headers:
+		#	# Header 1
+		#	## Header 2
+		#	## Header 2 with closing hashes ##
+		#	...
+		#	###### Header 6
+		#
+		$text = preg_replace_callback(
+			'{
 				^(\#{1,6})	# $1 = string of #\'s
 				[ ]*
 				(.+?)		# $2 = Header text
@@ -1002,52 +1002,52 @@ 
 				\#*			# optional closing #\'s (not counted)
 				\n+
 			}xm',
-            array(&$this, '_doHeaders_callback_atx'),
-            $text
-        );
-
-        return $text;
-    }
-
-    function _doHeaders_callback_setext($matches)
-    {
-        # Terrible hack to check we haven't found an empty list item.
-        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.
-        #
-        $less_than_tab = $this->tab_width - 1;
-
-        # 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)";
-
-        $markers_relist = array(
-            $marker_ul_re => $marker_ol_re,
-            $marker_ol_re => $marker_ul_re,
-        );
-
-        foreach ($markers_relist as $marker_re => $other_marker_re) {
-            # Re-usable pattern to match any entirel ul or ol list:
-            $whole_list_re = '
+			array(&$this, '_doHeaders_callback_atx'),
+			$text
+		);
+
+		return $text;
+	}
+
+	function _doHeaders_callback_setext($matches)
+	{
+		# Terrible hack to check we haven't found an empty list item.
+		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.
+		#
+		$less_than_tab = $this->tab_width - 1;
+
+		# 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)";
+
+		$markers_relist = array(
+			$marker_ul_re => $marker_ol_re,
+			$marker_ol_re => $marker_ul_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
@@ -1074,88 +1074,88 @@ 
 				)
 			'; // mx
 
-            # We use a different prefix before nested lists than top-level lists.
-            # See extended comment in _ProcessListItems().
+			# 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 . '
 					}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 . '
 					}mx',
-                    array(&$this, '_doLists_callback'),
-                    $text
-                );
-            }
-        }
-
-        return $text;
-    }
-
-    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";
-
-        $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";
-    }
-
-    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.
-        #
-        # 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,
-        # we decrement. If it's zero, we're not in a list anymore.
-        #
-        # We do this because when we're not inside a list, we want to treat
-        # something like this:
-        #
-        #		I recommend upgrading to version
-        #		8. Oops, now this line is treated
-        #		as a sub-list.
-        #
-        # As a single paragraph, despite the fact that the second line starts
-        # with a digit-period-space sequence.
-        #
-        # Whereas when we're inside a list (or sub-list), that line will be
-        # treated as the start of a sub-list. What a kludge, huh? This is
-        # an aspect of Markdown's syntax that's hard to parse perfectly
-        # without resorting to mind-reading. Perhaps the solution is to
-        # change the syntax rules such that sub-lists must start with a
-        # starting cardinal number; e.g. "1." or "a.".
-
-        $this->list_level ++;
-
-        # trim trailing blank lines:
-        $list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
-
-        $list_str = preg_replace_callback(
-            '{
+					array(&$this, '_doLists_callback'),
+					$text
+				);
+			}
+		}
+
+		return $text;
+	}
+
+	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";
+
+		$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";
+	}
+
+	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.
+		#
+		# 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,
+		# we decrement. If it's zero, we're not in a list anymore.
+		#
+		# We do this because when we're not inside a list, we want to treat
+		# something like this:
+		#
+		#		I recommend upgrading to version
+		#		8. Oops, now this line is treated
+		#		as a sub-list.
+		#
+		# As a single paragraph, despite the fact that the second line starts
+		# with a digit-period-space sequence.
+		#
+		# Whereas when we're inside a list (or sub-list), that line will be
+		# treated as the start of a sub-list. What a kludge, huh? This is
+		# an aspect of Markdown's syntax that's hard to parse perfectly
+		# without resorting to mind-reading. Perhaps the solution is to
+		# change the syntax rules such that sub-lists must start with a
+		# starting cardinal number; e.g. "1." or "a.".
+
+		$this->list_level ++;
+
+		# trim trailing blank lines:
+		$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
@@ -1165,45 +1165,45 @@ 
 			(?:(\n+(?=\n))|\n)				# tailing blank line = $5
 			(?= \n* (\z | \2 (' . $marker_any_re . ') (?:[ ]+|(?=\n))))
 			}xm',
-            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];
-        $tailing_blank_line =& $matches[5];
-
-        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 {
-            # Recursion for sub-lists:
-            $item = $this->doLists($this->outdent($item));
-            $item = preg_replace('/\n+$/', '', $item);
-            $item = $this->runSpanGamut($item);
-        }
-
-        return "<li>" . $item . "</li>\n";
-    }
-
-    function doCodeBlocks($text)
-    {
-        #
-        #	Process Markdown `<pre><code>` blocks.
-        #
-        $text = preg_replace_callback(
-            '{
+			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];
+		$tailing_blank_line =& $matches[5];
+
+		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 {
+			# Recursion for sub-lists:
+			$item = $this->doLists($this->outdent($item));
+			$item = preg_replace('/\n+$/', '', $item);
+			$item = $this->runSpanGamut($item);
+		}
+
+		return "<li>" . $item . "</li>\n";
+	}
+
+	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
 				  (?>
@@ -1213,206 +1213,206 @@ 
 				)
 				((?=^[ ]{0,' . $this->tab_width . '}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
 			}xm',
-            array(&$this, '_doCodeBlocks_callback'),
-            $text
-        );
-
-        return $text;
-    }
-
-    function _doCodeBlocks_callback($matches)
-    {
-        $codeblock = $matches[1];
-
-        $codeblock = $this->outdent($codeblock);
-        $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
-
-        # trim leading newlines and trailing newlines
-        $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>");
-    }
-
-    var $em_relist = array(
-        ''  => '(?:(?<!\*)\*(?!\*)|(?<!_)_(?!_))(?=\S|$)(?![\.,:;]\s)',
-        '*' => '(?<=\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) {
-                # Construct list of allowed token expressions.
-                $token_relist = array();
-                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) . ')}';
-                $this->em_strong_prepared_relist["$em$strong"] = $token_re;
-            }
-        }
-    }
-
-    function doItalicsAndBold($text)
-    {
-        $token_stack  = array('');
-        $text_stack   = array('');
-        $em           = '';
-        $strong       = '';
-        $tree_char_em = false;
-
-        while (1) {
-            #
-            # Get prepared regular expression for seraching emphasis tokens
-            # in current context.
-            #
-            $token_re = $this->em_strong_prepared_relist["$em$strong"];
-
-            #
-            # 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);
-            $text_stack[0] .= $parts[0];
-            $token =& $parts[1];
-            $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);
-                }
-                break;
-            }
-
-            $token_len = strlen($token);
-            if ($tree_char_em) {
-                # Reached closing marker while inside a three-char emphasis.
-                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);
-                    $span = "<strong><em>$span</em></strong>";
-                    $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
-                }
-                $tree_char_em = false;
-            } 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);
-                        $$tag = ''; # $$tag stands for $em or $strong
-                    }
-                } else {
-                    # Reached opening three-char emphasis marker. Push on token
-                    # stack; will be handled by the special condition above.
-                    $em     = $token{0};
-                    $strong = "$em$em";
-                    array_unshift($token_stack, $token);
-                    array_unshift($text_stack, '');
-                    $tree_char_em = true;
-                }
-            } 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);
-                    }
-                    # Closing strong marker:
-                    array_shift($token_stack);
-                    $span = array_shift($text_stack);
-                    $span = $this->runSpanGamut($span);
-                    $span = "<strong>$span</strong>";
-                    $text_stack[0] .= $this->hashPart($span);
-                    $strong = '';
-                } else {
-                    array_unshift($token_stack, $token);
-                    array_unshift($text_stack, '');
-                    $strong = $token;
-                }
-            } else {
-                # Here $token_len == 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);
-                        $span = "<em>$span</em>";
-                        $text_stack[0] .= $this->hashPart($span);
-                        $em = '';
-                    } else {
-                        $text_stack[0] .= $token;
-                    }
-                } else {
-                    array_unshift($token_stack, $token);
-                    array_unshift($text_stack, '');
-                    $em = $token;
-                }
-            }
-        }
-        return $text_stack[0];
-    }
-
-    function doBlockQuotes($text)
-    {
-        $text = preg_replace_callback(
-            '/
+			array(&$this, '_doCodeBlocks_callback'),
+			$text
+		);
+
+		return $text;
+	}
+
+	function _doCodeBlocks_callback($matches)
+	{
+		$codeblock = $matches[1];
+
+		$codeblock = $this->outdent($codeblock);
+		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+
+		# trim leading newlines and trailing newlines
+		$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>");
+	}
+
+	var $em_relist = array(
+		''  => '(?:(?<!\*)\*(?!\*)|(?<!_)_(?!_))(?=\S|$)(?![\.,:;]\s)',
+		'*' => '(?<=\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) {
+				# Construct list of allowed token expressions.
+				$token_relist = array();
+				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) . ')}';
+				$this->em_strong_prepared_relist["$em$strong"] = $token_re;
+			}
+		}
+	}
+
+	function doItalicsAndBold($text)
+	{
+		$token_stack  = array('');
+		$text_stack   = array('');
+		$em           = '';
+		$strong       = '';
+		$tree_char_em = false;
+
+		while (1) {
+			#
+			# Get prepared regular expression for seraching emphasis tokens
+			# in current context.
+			#
+			$token_re = $this->em_strong_prepared_relist["$em$strong"];
+
+			#
+			# 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);
+			$text_stack[0] .= $parts[0];
+			$token =& $parts[1];
+			$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);
+				}
+				break;
+			}
+
+			$token_len = strlen($token);
+			if ($tree_char_em) {
+				# Reached closing marker while inside a three-char emphasis.
+				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);
+					$span = "<strong><em>$span</em></strong>";
+					$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
+				}
+				$tree_char_em = false;
+			} 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);
+						$$tag = ''; # $$tag stands for $em or $strong
+					}
+				} else {
+					# Reached opening three-char emphasis marker. Push on token
+					# stack; will be handled by the special condition above.
+					$em     = $token{0};
+					$strong = "$em$em";
+					array_unshift($token_stack, $token);
+					array_unshift($text_stack, '');
+					$tree_char_em = true;
+				}
+			} 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);
+					}
+					# Closing strong marker:
+					array_shift($token_stack);
+					$span = array_shift($text_stack);
+					$span = $this->runSpanGamut($span);
+					$span = "<strong>$span</strong>";
+					$text_stack[0] .= $this->hashPart($span);
+					$strong = '';
+				} else {
+					array_unshift($token_stack, $token);
+					array_unshift($text_stack, '');
+					$strong = $token;
+				}
+			} else {
+				# Here $token_len == 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);
+						$span = "<em>$span</em>";
+						$text_stack[0] .= $this->hashPart($span);
+						$em = '';
+					} else {
+						$text_stack[0] .= $token;
+					}
+				} else {
+					array_unshift($token_stack, $token);
+					array_unshift($text_stack, '');
+					$em = $token;
+				}
+			}
+		}
+		return $text_stack[0];
+	}
+
+	function doBlockQuotes($text)
+	{
+		$text = preg_replace_callback(
+			'/
 			  (								# Wrap whole match in $1
 				(?>
 				  ^[ ]*>[ ]?			# ">" at the start of a line
@@ -1422,66 +1422,66 @@ 
 				)+
 			  )
 			/xm',
-            array(&$this, '_doBlockQuotes_callback'),
-            $text
-        );
-
-        return $text;
-    }
-
-    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,
-        # 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)
-    {
-        $pre = $matches[1];
-        $pre = preg_replace('/^  /m', '', $pre);
-        return $pre;
-    }
-
-    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);
-
-        #
-        # Wrap <p> tags and unhashify HTML blocks
-        #
-        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 .= "</p>";
-                $grafs[$key] = $this->unhash($value);
-            } else {
-                # Is a block.
-                # Modify elements of @grafs in-place...
-                $graf  = $value;
-                $block = $this->html_hashes[$graf];
-                $graf  = $block;
+			array(&$this, '_doBlockQuotes_callback'),
+			$text
+		);
+
+		return $text;
+	}
+
+	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,
+		# 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)
+	{
+		$pre = $matches[1];
+		$pre = preg_replace('/^  /m', '', $pre);
+		return $pre;
+	}
+
+	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);
+
+		#
+		# Wrap <p> tags and unhashify HTML blocks
+		#
+		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 .= "</p>";
+				$grafs[$key] = $this->unhash($value);
+			} else {
+				# Is a block.
+				# Modify elements of @grafs in-place...
+				$graf  = $value;
+				$block = $this->html_hashes[$graf];
+				$graf  = $block;
 //				if (preg_match('{
 //					\A
 //					(							# $1 = <div> tag
@@ -1517,59 +1517,59 @@ 
 //
 //					$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);
-        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);
-        } 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
-            );;
-        }
-        # Encode remaining <'s
-        $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
-        );
-
-        # Email addresses: <address@domain.foo>
-        $text = preg_replace_callback(
-            '{
+				$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);
+		} 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
+			);;
+		}
+		# Encode remaining <'s
+		$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
+		);
+
+		# Email addresses: <address@domain.foo>
+		$text = preg_replace_callback(
+			'{
 			<
 			(?:mailto:)?
 			(
@@ -1587,81 +1587,81 @@ 
 			)
 			>
 			}xi',
-            array(&$this, '_doAutoLinks_email_callback'),
-            $text
-        );
-
-        return $text;
-    }
-
-    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)
-    {
-        $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);
-            # Ignore non-ascii chars.
-            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:`
-        $addr = "<a href=\"$addr\">$text</a>";
-
-        return $addr;
-    }
-
-    function parseSpan($str)
-    {
-        #
-        # Take the string $str and parse it into tokens, hashing embeded HTML,
-        # escaped characters and handling code spans.
-        #
-        $output = '';
-
-        $span_re = '{
+			array(&$this, '_doAutoLinks_email_callback'),
+			$text
+		);
+
+		return $text;
+	}
+
+	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)
+	{
+		$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);
+			# Ignore non-ascii chars.
+			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:`
+		$addr = "<a href=\"$addr\">$text</a>";
+
+		return $addr;
+	}
+
+	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 . '
 				|
@@ -1687,142 +1687,142 @@ 
 				)
 				}xs';
 
-        while (1) {
-            #
-            # 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);
-
-            # Create token from text preceding tag.
-            if ($parts[0] != "") {
-                $output .= $parts[0];
-            }
-
-            # Check if we reach the end.
-            if (isset($parts[1])) {
-                $output .= $this->handleSpanToken($parts[1], $parts[2]);
-                $str = $parts[2];
-            } 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}) {
-            case "\\":
-                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);
-                }
-                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
-    # 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.
-        #
-        # For each line we separate the line in blocks delemited by
-        # 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
-        );
-
-        return $text;
-    }
-
-    function _detab_callback($matches)
-    {
-        $line   = $matches[0];
-        $strlen = $this->utf8_strlen; # strlen function for UTF-8.
-
-        # Split in blocks.
-        $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) {
-            # Calculate amount of space, insert spaces, insert 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(
+		while (1) {
+			#
+			# 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);
+
+			# Create token from text preceding tag.
+			if ($parts[0] != "") {
+				$output .= $parts[0];
+			}
+
+			# Check if we reach the end.
+			if (isset($parts[1])) {
+				$output .= $this->handleSpanToken($parts[1], $parts[2]);
+				$str = $parts[2];
+			} 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}) {
+			case "\\":
+				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);
+				}
+				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
+	# 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.
+		#
+		# For each line we separate the line in blocks delemited by
+		# 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
+		);
+
+		return $text;
+	}
+
+	function _detab_callback($matches)
+	{
+		$line   = $matches[0];
+		$strlen = $this->utf8_strlen; # strlen function for UTF-8.
+
+		# Split in blocks.
+		$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) {
+			# Calculate amount of space, insert spaces, insert 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]];
-    }
+		);
+	}
+
+	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]];
+	}
 }
 
 #
@@ -1832,178 +1832,178 @@ 
 class MarkdownExtra_Parser extends Markdown_Parser
 {
 
-    ### Configuration Variables ###
-
-    # 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;
-
-    # Optional class prefix for fenced code block.
-    var $code_class_prefix = MARKDOWN_CODE_CLASS_PREFIX;
+	### Configuration Variables ###
+
+	# 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;
+
+	# Optional class prefix for fenced code block.
+	var $code_class_prefix = MARKDOWN_CODE_CLASS_PREFIX;
 
-    # Class attribute for code blocks goes on the `code` tag;
-    # setting this to true will put attributes on the `pre` tag instead.
-    var $code_attr_on_pre = MARKDOWN_CODE_ATTR_ON_PRE;
+	# Class attribute for code blocks goes on the `code` tag;
+	# setting this to true will put attributes on the `pre` tag instead.
+	var $code_attr_on_pre = MARKDOWN_CODE_ATTR_ON_PRE;
 
-    # Predefined abbreviations.
-    var $predef_abbr = array();
-
-    ### Parser Implementation ###
-
-    function __construct()
-    {
-        #
-        # 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.
-        # Parent constructor will do the sorting.
-        $this->document_gamut += array(
-            "doFencedCodeBlocks" => 5,
-            "stripFootnotes"     => 15,
-            "stripAbbreviations" => 25,
-            "appendFootnotes"    => 50,
-        );
-        $this->block_gamut += array(
-            "doFencedCodeBlocks" => 5,
-            "doTables"           => 15,
-            "doDefLists"         => 45,
-        );
-        $this->span_gamut += array(
-            "doFootnotes"     => 5,
-            "doAbbreviations" => 70,
-        );
-
-        parent::__construct();
-    }
-
-    # Extra variables used during extra transformations.
-    var $footnotes = array();
-
-    var $footnotes_ordered = array();
-
-    var $footnotes_ref_count = array();
-
-    var $footnotes_numbers = array();
-
-    var $abbr_desciptions = array();
-
-    var $abbr_word_re = '';
-
-    # Give the current footnote number.
-    var $footnote_counter = 1;
-
-    function setup()
-    {
-        #
-        # Setting up Extra-specific variables.
-        #
-        parent::setup();
-
-        $this->footnotes           = array();
-        $this->footnotes_ordered   = array();
-        $this->footnotes_ref_count = array();
-        $this->footnotes_numbers   = 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_word_re .= '|';
-            }
-            $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();
-        $this->footnotes_ordered   = array();
-        $this->footnotes_ref_count = array();
-        $this->footnotes_numbers   = array();
-        $this->abbr_desciptions    = array();
-        $this->abbr_word_re        = '';
-
-        parent::teardown();
-    }
-
-
-    ### Extra Attribute Parser ###
-
-    # Expression to use to catch attributes (includes the braces)
-    var $id_class_attr_catch_re = '\{((?:[ ]*[#.][-_:a-zA-Z0-9]+){1,})[ ]*\}';
-
-    # Expression to use when parsing in a context when no capture is desired
-    var $id_class_attr_nocatch_re = '\{(?:[ ]*[#.][-_:a-zA-Z0-9]+){1,}[ ]*\}';
-
-    function doExtraAttributes($tag_name, $attr)
-    {
-        #
-        # Parse attributes caught by the $this->id_class_attr_catch_re expression
-        # and return the HTML-formatted list of attributes.
-        #
-        # Currently supported attributes are .class and #id.
-        #
-        if (empty($attr)) {
-            return "";
-        }
-
-        # Split on components
-        preg_match_all('/[#.][-_:a-zA-Z0-9]+/', $attr, $matches);
-        $elements = $matches[0];
-
-        # handle classes and ids (only first id taken into account)
-        $classes = array();
-        $id      = false;
-        foreach ($elements as $element) {
-            if ($element{0} == '.') {
-                $classes[] = substr($element, 1);
-            } else if ($element{0} == '#') {
-                if ($id === false) {
-                    $id = substr($element, 1);
-                }
-            }
-        }
-
-        # compose attributes as string
-        $attr_str = "";
-        if (!empty($id)) {
-            $attr_str .= ' id="' . $id . '"';
-        }
-        if (!empty($classes)) {
-            $attr_str .= ' class="' . implode(" ", $classes) . '"';
-        }
-        return $attr_str;
-    }
-
-    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(
-            '{
+	# Predefined abbreviations.
+	var $predef_abbr = array();
+
+	### Parser Implementation ###
+
+	function __construct()
+	{
+		#
+		# 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.
+		# Parent constructor will do the sorting.
+		$this->document_gamut += array(
+			"doFencedCodeBlocks" => 5,
+			"stripFootnotes"     => 15,
+			"stripAbbreviations" => 25,
+			"appendFootnotes"    => 50,
+		);
+		$this->block_gamut += array(
+			"doFencedCodeBlocks" => 5,
+			"doTables"           => 15,
+			"doDefLists"         => 45,
+		);
+		$this->span_gamut += array(
+			"doFootnotes"     => 5,
+			"doAbbreviations" => 70,
+		);
+
+		parent::__construct();
+	}
+
+	# Extra variables used during extra transformations.
+	var $footnotes = array();
+
+	var $footnotes_ordered = array();
+
+	var $footnotes_ref_count = array();
+
+	var $footnotes_numbers = array();
+
+	var $abbr_desciptions = array();
+
+	var $abbr_word_re = '';
+
+	# Give the current footnote number.
+	var $footnote_counter = 1;
+
+	function setup()
+	{
+		#
+		# Setting up Extra-specific variables.
+		#
+		parent::setup();
+
+		$this->footnotes           = array();
+		$this->footnotes_ordered   = array();
+		$this->footnotes_ref_count = array();
+		$this->footnotes_numbers   = 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_word_re .= '|';
+			}
+			$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();
+		$this->footnotes_ordered   = array();
+		$this->footnotes_ref_count = array();
+		$this->footnotes_numbers   = array();
+		$this->abbr_desciptions    = array();
+		$this->abbr_word_re        = '';
+
+		parent::teardown();
+	}
+
+
+	### Extra Attribute Parser ###
+
+	# Expression to use to catch attributes (includes the braces)
+	var $id_class_attr_catch_re = '\{((?:[ ]*[#.][-_:a-zA-Z0-9]+){1,})[ ]*\}';
+
+	# Expression to use when parsing in a context when no capture is desired
+	var $id_class_attr_nocatch_re = '\{(?:[ ]*[#.][-_:a-zA-Z0-9]+){1,}[ ]*\}';
+
+	function doExtraAttributes($tag_name, $attr)
+	{
+		#
+		# Parse attributes caught by the $this->id_class_attr_catch_re expression
+		# and return the HTML-formatted list of attributes.
+		#
+		# Currently supported attributes are .class and #id.
+		#
+		if (empty($attr)) {
+			return "";
+		}
+
+		# Split on components
+		preg_match_all('/[#.][-_:a-zA-Z0-9]+/', $attr, $matches);
+		$elements = $matches[0];
+
+		# handle classes and ids (only first id taken into account)
+		$classes = array();
+		$id      = false;
+		foreach ($elements as $element) {
+			if ($element{0} == '.') {
+				$classes[] = substr($element, 1);
+			} else if ($element{0} == '#') {
+				if ($id === false) {
+					$id = substr($element, 1);
+				}
+			}
+		}
+
+		# compose attributes as string
+		$attr_str = "";
+		if (!empty($id)) {
+			$attr_str .= ' id="' . $id . '"';
+		}
+		if (!empty($classes)) {
+			$attr_str .= ' class="' . implode(" ", $classes) . '"';
+		}
+		return $attr_str;
+	}
+
+	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
 							  [ ]*
 							  \n?				# maybe *one* newline
@@ -2026,117 +2026,117 @@ 
 					(?:[ ]* ' . $this->id_class_attr_catch_re . ' )?  # $5 = extra id & class attr
 							(?:\n+|\Z)
 			}xm',
-            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];
-        $this->ref_attr[$link_id] = $this->doExtraAttributes("", $dummy =& $matches[5]);
-        return ''; # String that will replace the block
-    }
-
-
-    ### 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|article|section|nav|aside|hgroup|header|footer|figcaption';
-
-    # Tags treated as block tags only if the opening tag is alone on its line:
-    var $context_block_tags_re = 'script|noscript|ins|del|iframe|object|source|track|param|math|svg|canvas|audio|video';
-
-    # 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
-    # they appear:
-    var $clean_tags_re = 'script|math|svg';
-
-    # Tags that do not need to be closed.
-    var $auto_close_tags_re = 'hr|img|param|source|track';
-
-    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 within 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!
-        #
-        if ($this->no_markup) {
-            return $text;
-        }
-
-        #
-        # Call the HTML-in-Markdown hasher.
-        #
-        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('', '');
-        }
-
-        # Regex to check for the presense of newlines around a block tag.
-        $newline_before_re = '/(?:^\n?|\n\n)*$/';
-        $newline_after_re  =
-            '{
+			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];
+		$this->ref_attr[$link_id] = $this->doExtraAttributes("", $dummy =& $matches[5]);
+		return ''; # String that will replace the block
+	}
+
+
+	### 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|article|section|nav|aside|hgroup|header|footer|figcaption';
+
+	# Tags treated as block tags only if the opening tag is alone on its line:
+	var $context_block_tags_re = 'script|noscript|ins|del|iframe|object|source|track|param|math|svg|canvas|audio|video';
+
+	# 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
+	# they appear:
+	var $clean_tags_re = 'script|math|svg';
+
+	# Tags that do not need to be closed.
+	var $auto_close_tags_re = 'hr|img|param|source|track';
+
+	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 within 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!
+		#
+		if ($this->no_markup) {
+			return $text;
+		}
+
+		#
+		# Call the HTML-in-Markdown hasher.
+		#
+		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('', '');
+		}
+
+		# Regex to check for the presense of newlines around a block tag.
+		$newline_before_re = '/(?:^\n?|\n\n)*$/';
+		$newline_after_re  =
+			'{
 				^						# Start of text following the tag.
 				(?>[ ]*<!--.*?-->)?		# Optional comment.
 				[ ]*\n					# Must be followed by newline.
 			}xs';
 
-        # Regex to match any tag.
-        $block_tag_re =
-            '{
+		# Regex to match any tag.
+		$block_tag_re =
+			'{
 				(					# $2: Capture whole tag.
 					</?					# Any opening or closing tag.
 						(?>				# Tag name.
@@ -2187,177 +2187,177 @@ 
 				)
 			}xs';
 
-        $depth  = 0; # Current depth inside the tag tree.
-        $parsed = ""; # Parsed text that will be returned.
-
-        #
-        # Loop through every tag until we find the closing tag of the parent
-        # or loop until reaching the end of text if no parent tag specified.
-        #
-        do {
-            #
-            # 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
-            # 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
-            # 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;
-            }
-
-            $parsed .= $parts[0]; # Text before current tag.
-
-            # If end of $text has been reached. Stop loop.
-            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.
-
-            #
-            # Check for: Code span marker
-            #
-            if ($tag{0} == "`") {
-                # Find corresponding end marker.
-                $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 {
-                    # Unmatched marker: just skip it.
-                    $parsed .= $tag;
-                }
-            }
-            #
-            # Check for: Fenced code block marker.
-            #
-            else if (preg_match('{^\n?([ ]{0,' . ($indent + 3) . '})(~+)}', $tag, $capture)) {
-                # Fenced code block marker: find matching end marker.
-                $fence_indent = strlen($capture[1]); # use captured indent in re
-                $fence_re     = $capture[2]; # use captured fence in re
-                if (preg_match(
-                    '{^(?>.*\n)*?[ ]{' . ($fence_indent) . '}' . $fence_re . '[ ]*(?:\n|$)}',
-                    $text,
-                    $matches
-                )) {
-                    # End marker found: pass text unchanged until marker.
-                    $parsed .= $tag . $matches[0];
-                    $text = substr($text, strlen($matches[0]));
-                } else {
-                    # No end marker: just skip it.
-                    $parsed .= $tag;
-                }
-            }
-            #
-            # Check for: Indented code block.
-            #
-            else if ($tag{0} == "\n" || $tag{0} == " ") {
-                # Indented code block: pass it unchanged, will be handled
-                # later.
-                $parsed .= $tag;
-            }
-            #
-            # Check for: Opening Block level tag or
-            #            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))
-            ) {
-                # Need to parse tag and following text using the HTML parser.
-                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";
-            }
-            #
-            # Check for: Clean tag (like script, math)
-            #            HTML Comments, processing instructions.
-            #
-            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);
-
-                $parsed .= $block_text;
-            }
-            #
-            # 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)
-            ) {
-                #
-                # Increase/decrease nested tag count.
-                #
-                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
-                    # return to the calling function.
-                    #
-                    $text = $tag . $text;
-                    break;
-                }
-
-                $parsed .= $tag;
-            } 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('', '');
-        }
-
-        # Regex to match `markdown` attribute inside of a tag.
-        $markdown_attr_re = '
+		$depth  = 0; # Current depth inside the tag tree.
+		$parsed = ""; # Parsed text that will be returned.
+
+		#
+		# Loop through every tag until we find the closing tag of the parent
+		# or loop until reaching the end of text if no parent tag specified.
+		#
+		do {
+			#
+			# 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
+			# 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
+			# 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;
+			}
+
+			$parsed .= $parts[0]; # Text before current tag.
+
+			# If end of $text has been reached. Stop loop.
+			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.
+
+			#
+			# Check for: Code span marker
+			#
+			if ($tag{0} == "`") {
+				# Find corresponding end marker.
+				$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 {
+					# Unmatched marker: just skip it.
+					$parsed .= $tag;
+				}
+			}
+			#
+			# Check for: Fenced code block marker.
+			#
+			else if (preg_match('{^\n?([ ]{0,' . ($indent + 3) . '})(~+)}', $tag, $capture)) {
+				# Fenced code block marker: find matching end marker.
+				$fence_indent = strlen($capture[1]); # use captured indent in re
+				$fence_re     = $capture[2]; # use captured fence in re
+				if (preg_match(
+					'{^(?>.*\n)*?[ ]{' . ($fence_indent) . '}' . $fence_re . '[ ]*(?:\n|$)}',
+					$text,
+					$matches
+				)) {
+					# End marker found: pass text unchanged until marker.
+					$parsed .= $tag . $matches[0];
+					$text = substr($text, strlen($matches[0]));
+				} else {
+					# No end marker: just skip it.
+					$parsed .= $tag;
+				}
+			}
+			#
+			# Check for: Indented code block.
+			#
+			else if ($tag{0} == "\n" || $tag{0} == " ") {
+				# Indented code block: pass it unchanged, will be handled
+				# later.
+				$parsed .= $tag;
+			}
+			#
+			# Check for: Opening Block level tag or
+			#            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))
+			) {
+				# Need to parse tag and following text using the HTML parser.
+				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";
+			}
+			#
+			# Check for: Clean tag (like script, math)
+			#            HTML Comments, processing instructions.
+			#
+			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);
+
+				$parsed .= $block_text;
+			}
+			#
+			# 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)
+			) {
+				#
+				# Increase/decrease nested tag count.
+				#
+				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
+					# return to the calling function.
+					#
+					$text = $tag . $text;
+					break;
+				}
+
+				$parsed .= $tag;
+			} 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('', '');
+		}
+
+		# Regex to match `markdown` attribute inside of a tag.
+		$markdown_attr_re = '
 			{
 				\s*			# Eat whitespace before the `markdown` attribute
 				markdown
@@ -2372,8 +2372,8 @@ 
 				()				# $4: make $3 always defined (avoid warnings)
 			}xs';
 
-        # Regex to match any tag.
-        $tag_re = '{
+		# Regex to match any tag.
+		$tag_re = '{
 				(					# $2: Capture whole tag.
 					</?					# Any opening or closing tag.
 						[\w:$]+			# Tag name.
@@ -2395,169 +2395,169 @@ 
 				)
 			}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.
-
-        #
-        # Get the name of the starting tag.
-        # (This pattern makes $base_tag_name_re safe without quoting.)
-        #
-        if (preg_match('/^<([\w:$]*)\b/', $text, $matches)) {
-            $base_tag_name_re = $matches[1];
-        }
-
-        #
-        # Loop through every tag until we find the corresponding closing tag.
-        #
-        do {
-            #
-            # 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
-            # by the pattern.
-            #
-            $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
-                # parent function.
-                #
-                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.
-
-            #
-            # 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} == '?'
-            ) {
-                # Just add the tag to the block as if it was text.
-                $block_text .= $tag;
-            } 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 ++;
-                    }
-                }
-
-                #
-                # 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])
-                ) {
-                    # Remove `markdown` attribute from opening 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
-                                                           );
-
-                    # Calculate indent before tag.
-                    if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
-                        $strlen = $this->utf8_strlen;
-                        $indent = $strlen($matches[1], 'UTF-8');
-                    } else {
-                        $indent = 0;
-                    }
-
-                    # End preceding block with this tag.
-                    $block_text .= $tag;
-                    $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);
-                    $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
-                    );
-
-                    # Outdent markdown 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";
-                    }
-
-                    # Start over with a new block.
-                    $block_text = "";
-                } else {
-                    $block_text .= $tag;
-                }
-            }
-        } 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 inserts a "clean" tag
-        # in $text, it passes through this function and is automaticaly escaped,
-        # blocking invalid nested overlap.
-        #
-        return $this->hashPart($text, 'C');
-    }
-
-    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(
-            '{
+		$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.
+
+		#
+		# Get the name of the starting tag.
+		# (This pattern makes $base_tag_name_re safe without quoting.)
+		#
+		if (preg_match('/^<([\w:$]*)\b/', $text, $matches)) {
+			$base_tag_name_re = $matches[1];
+		}
+
+		#
+		# Loop through every tag until we find the corresponding closing tag.
+		#
+		do {
+			#
+			# 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
+			# by the pattern.
+			#
+			$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
+				# parent function.
+				#
+				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.
+
+			#
+			# 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} == '?'
+			) {
+				# Just add the tag to the block as if it was text.
+				$block_text .= $tag;
+			} 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 ++;
+					}
+				}
+
+				#
+				# 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])
+				) {
+					# Remove `markdown` attribute from opening 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
+														   );
+
+					# Calculate indent before tag.
+					if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
+						$strlen = $this->utf8_strlen;
+						$indent = $strlen($matches[1], 'UTF-8');
+					} else {
+						$indent = 0;
+					}
+
+					# End preceding block with this tag.
+					$block_text .= $tag;
+					$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);
+					$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
+					);
+
+					# Outdent markdown 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";
+					}
+
+					# Start over with a new block.
+					$block_text = "";
+				} else {
+					$block_text .= $tag;
+				}
+			}
+		} 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 inserts a "clean" tag
+		# in $text, it passes through this function and is automaticaly escaped,
+		# blocking invalid nested overlap.
+		#
+		return $this->hashPart($text, 'C');
+	}
+
+	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(
+			'{
 			(					# wrap whole match in $1
 			  \[
 				(' . $this->nested_brackets_re . ')	# link text = $2
@@ -2571,15 +2571,15 @@ 
 			  \]
 			)
 			}xs',
-            array(&$this, '_doAnchors_reference_callback'),
-            $text
-        );
-
-        #
-        # Next, inline-style links: [link text](url "optional title")
-        #
-        $text = preg_replace_callback(
-            '{
+			array(&$this, '_doAnchors_reference_callback'),
+			$text
+		);
+
+		#
+		# Next, inline-style links: [link text](url "optional title")
+		#
+		$text = preg_replace_callback(
+			'{
 			(				# wrap whole match in $1
 			  \[
 				(' . $this->nested_brackets_re . ')	# link text = $2
@@ -2602,102 +2602,102 @@ 
 			  (?:[ ]? ' . $this->id_class_attr_catch_re . ' )?	 # $8 = id/class attributes
 			)
 			}xs',
-            array(&$this, '_doAnchors_inline_callback'),
-            $text
-        );
-
-        #
-        # Last, handle reference-style shortcuts: [link text]
-        # These must come last in case you've also got [link text][1]
-        # or [link text](/foo)
-        #
-        $text = preg_replace_callback(
-            '{
+			array(&$this, '_doAnchors_inline_callback'),
+			$text
+		);
+
+		#
+		# Last, handle reference-style shortcuts: [link text]
+		# These must come last in case you've also got [link text][1]
+		# or [link text](/foo)
+		#
+		$text = preg_replace_callback(
+			'{
 			(					# wrap whole match in $1
 			  \[
 				([^\[\]]+)		# link text = $2; can\'t contain [ or ]
 			  \]
 			)
 			}xs',
-            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];
-        $link_id     =& $matches[3];
-
-        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);
-
-            $result = "<a href=\"$url\"";
-            if (isset($this->titles[$link_id])) {
-                $title = $this->titles[$link_id];
-                $title = $this->encodeAttribute($title);
-                $result .= " title=\"$title\"";
-            }
-            if (isset($this->ref_attr[$link_id])) {
-                $result .= $this->ref_attr[$link_id];
-            }
-
-            $link_text = $this->runSpanGamut($link_text);
-            $result .= ">$link_text</a>";
-            $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];
-        $attr        = $this->doExtraAttributes("a", $dummy =& $matches[8]);
-
-        $url = $this->encodeAttribute($url);
-
-        $result = "<a href=\"$url\"";
-        if (isset($title)) {
-            $title = $this->encodeAttribute($title);
-            $result .= " title=\"$title\"";
-        }
-        $result .= $attr;
-
-        $link_text = $this->runSpanGamut($link_text);
-        $result .= ">$link_text</a>";
-
-        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(
-            '{
+			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];
+		$link_id     =& $matches[3];
+
+		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);
+
+			$result = "<a href=\"$url\"";
+			if (isset($this->titles[$link_id])) {
+				$title = $this->titles[$link_id];
+				$title = $this->encodeAttribute($title);
+				$result .= " title=\"$title\"";
+			}
+			if (isset($this->ref_attr[$link_id])) {
+				$result .= $this->ref_attr[$link_id];
+			}
+
+			$link_text = $this->runSpanGamut($link_text);
+			$result .= ">$link_text</a>";
+			$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];
+		$attr        = $this->doExtraAttributes("a", $dummy =& $matches[8]);
+
+		$url = $this->encodeAttribute($url);
+
+		$result = "<a href=\"$url\"";
+		if (isset($title)) {
+			$title = $this->encodeAttribute($title);
+			$result .= " title=\"$title\"";
+		}
+		$result .= $attr;
+
+		$link_text = $this->runSpanGamut($link_text);
+		$result .= ">$link_text</a>";
+
+		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(
+			'{
 			(				# wrap whole match in $1
 			  !\[
 				(' . $this->nested_brackets_re . ')		# alt text = $2
@@ -2712,16 +2712,16 @@ 
 
 			)
 			}xs',
-            array(&$this, '_doImages_reference_callback'),
-            $text
-        );
-
-        #
-        # Next, handle inline images:  ![alt text](url "optional title")
-        # Don't forget: encode * and _
-        #
-        $text = preg_replace_callback(
-            '{
+			array(&$this, '_doImages_reference_callback'),
+			$text
+		);
+
+		#
+		# Next, handle inline images:  ![alt text](url "optional title")
+		# Don't forget: encode * and _
+		#
+		$text = preg_replace_callback(
+			'{
 			(				# wrap whole match in $1
 			  !\[
 				(' . $this->nested_brackets_re . ')		# alt text = $2
@@ -2745,97 +2745,97 @@ 
 			  (?:[ ]? ' . $this->id_class_attr_catch_re . ' )?	 # $8 = id/class attributes
 			)
 			}xs',
-            array(&$this, '_doImages_inline_callback'),
-            $text
-        );
-
-        return $text;
-    }
-
-    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]);
-            $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->ref_attr[$link_id])) {
-                $result .= $this->ref_attr[$link_id];
-            }
-            $result .= $this->empty_element_suffix;
-            $result = $this->hashPart($result);
-        } else {
-            # If there's no such link ID, leave intact:
-            $result = $whole_match;
-        }
-
-        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];
-        $attr        = $this->doExtraAttributes("img", $dummy =& $matches[8]);
-
-        $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 .= $attr;
-        $result .= $this->empty_element_suffix;
-
-        return $this->hashPart($result);
-    }
-
-    function doHeaders($text)
-    {
-        #
-        # Redefined to add id and class attribute support.
-        #
-        # Setext-style headers:
-        #	  Header 1  {#header1}
-        #	  ========
-        #
-        #	  Header 2  {#header2 .class1 .class2}
-        #	  --------
-        #
-        $text = preg_replace_callback(
-            '{
+			array(&$this, '_doImages_inline_callback'),
+			$text
+		);
+
+		return $text;
+	}
+
+	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]);
+			$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->ref_attr[$link_id])) {
+				$result .= $this->ref_attr[$link_id];
+			}
+			$result .= $this->empty_element_suffix;
+			$result = $this->hashPart($result);
+		} else {
+			# If there's no such link ID, leave intact:
+			$result = $whole_match;
+		}
+
+		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];
+		$attr        = $this->doExtraAttributes("img", $dummy =& $matches[8]);
+
+		$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 .= $attr;
+		$result .= $this->empty_element_suffix;
+
+		return $this->hashPart($result);
+	}
+
+	function doHeaders($text)
+	{
+		#
+		# Redefined to add id and class attribute support.
+		#
+		# Setext-style headers:
+		#	  Header 1  {#header1}
+		#	  ========
+		#
+		#	  Header 2  {#header2 .class1 .class2}
+		#	  --------
+		#
+		$text = preg_replace_callback(
+			'{
 				(^.+?)								# $1: Header text
 				(?:[ ]+ ' . $this->id_class_attr_catch_re . ' )?	 # $3 = id/class attributes
 				[ ]*\n(=+|-+)[ ]*\n+				# $3: Header footer
 			}mx',
-            array(&$this, '_doHeaders_callback_setext'),
-            $text
-        );
-
-        # atx-style headers:
-        #	# Header 1        {#header1}
-        #	## Header 2       {#header2}
-        #	## Header 2 with closing hashes ##  {#header3.class1.class2}
-        #	...
-        #	###### Header 6   {.class2}
-        #
-        $text = preg_replace_callback(
-            '{
+			array(&$this, '_doHeaders_callback_setext'),
+			$text
+		);
+
+		# atx-style headers:
+		#	# Header 1        {#header1}
+		#	## Header 2       {#header2}
+		#	## Header 2 with closing hashes ##  {#header3.class1.class2}
+		#	...
+		#	###### Header 6   {.class2}
+		#
+		$text = preg_replace_callback(
+			'{
 				^(\#{1,6})	# $1 = string of #\'s
 				[ ]*
 				(.+?)		# $2 = Header text
@@ -2845,48 +2845,48 @@ 
 				[ ]*
 				\n+
 			}xm',
-            array(&$this, '_doHeaders_callback_atx'),
-            $text
-        );
-
-        return $text;
-    }
-
-    function _doHeaders_callback_setext($matches)
-    {
-        if ($matches[3] == '-' && preg_match('{^- }', $matches[1])) {
-            return $matches[0];
-        }
-        $level = $matches[3]{0} == '=' ? 1 : 2;
-        $attr  = $this->doExtraAttributes("h$level", $dummy =& $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->doExtraAttributes("h$level", $dummy =& $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;
-        #
-        # Find tables with leading pipe.
-        #
-        #	| Header 1 | Header 2
-        #	| -------- | --------
-        #	| Cell 1   | Cell 2
-        #	| Cell 3   | Cell 4
-        #
-        $text = preg_replace_callback(
-            '
+			array(&$this, '_doHeaders_callback_atx'),
+			$text
+		);
+
+		return $text;
+	}
+
+	function _doHeaders_callback_setext($matches)
+	{
+		if ($matches[3] == '-' && preg_match('{^- }', $matches[1])) {
+			return $matches[0];
+		}
+		$level = $matches[3]{0} == '=' ? 1 : 2;
+		$attr  = $this->doExtraAttributes("h$level", $dummy =& $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->doExtraAttributes("h$level", $dummy =& $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;
+		#
+		# Find tables with leading pipe.
+		#
+		#	| Header 1 | Header 2
+		#	| -------- | --------
+		#	| Cell 1   | Cell 2
+		#	| Cell 3   | Cell 4
+		#
+		$text = preg_replace_callback(
+			'
 			{
 				^							# Start of a line
 				[ ]{0,' . $less_than_tab . '}	# Allowed whitespace.
@@ -2904,20 +2904,20 @@ 
 				)
 				(?=\n|\Z)					# Stop at final double newline.
 			}xm',
-            array(&$this, '_doTable_leadingPipe_callback'),
-            $text
-        );
-
-        #
-        # Find tables without leading pipe.
-        #
-        #	Header 1 | Header 2
-        #	-------- | --------
-        #	Cell 1   | Cell 2
-        #	Cell 3   | Cell 4
-        #
-        $text = preg_replace_callback(
-            '
+			array(&$this, '_doTable_leadingPipe_callback'),
+			$text
+		);
+
+		#
+		# Find tables without leading pipe.
+		#
+		#	Header 1 | Header 2
+		#	-------- | --------
+		#	Cell 1   | Cell 2
+		#	Cell 3   | Cell 4
+		#
+		$text = preg_replace_callback(
+			'
 			{
 				^							# Start of a line
 				[ ]{0,' . $less_than_tab . '}	# Allowed whitespace.
@@ -2933,101 +2933,101 @@ 
 				)
 				(?=\n|\Z)					# Stop at final double newline.
 			}xm',
-            array(&$this, '_DoTable_callback'),
-            $text
-        );
-
-        return $text;
-    }
-
-    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];
-
-        # Remove any tailing pipes for each line.
-        $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,
-        # and inline HTML tags, so that pipes inside those gets ignored.
-        $head      = $this->parseSpan($head);
-        $headers   = preg_split('/ *[|] */', $head);
-        $col_count = count($headers);
-        $attr      = array_pad($attr, $col_count, '');
-
-        # 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";
-        }
-        $text .= "</tr>\n";
-        $text .= "</thead>\n";
-
-        # Split content by row.
-        $rows = explode("\n", trim($content, "\n"));
-
-        $text .= "<tbody>\n";
-        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);
-
-            # Split row by cell.
-            $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";
-            }
-            $text .= "</tr>\n";
-        }
-        $text .= "</tbody>\n";
-        $text .= "</table>";
-
-        return $this->hashBlock($text) . "\n";
-    }
-
-    function doDefLists($text)
-    {
-        #
-        # Form HTML definition lists.
-        #
-        $less_than_tab = $this->tab_width - 1;
-
-        # Re-usable pattern to match any entire dl list:
-        $whole_list_re = '(?>
+			array(&$this, '_DoTable_callback'),
+			$text
+		);
+
+		return $text;
+	}
+
+	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];
+
+		# Remove any tailing pipes for each line.
+		$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,
+		# and inline HTML tags, so that pipes inside those gets ignored.
+		$head      = $this->parseSpan($head);
+		$headers   = preg_split('/ *[|] */', $head);
+		$col_count = count($headers);
+		$attr      = array_pad($attr, $col_count, '');
+
+		# 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";
+		}
+		$text .= "</tr>\n";
+		$text .= "</thead>\n";
+
+		# Split content by row.
+		$rows = explode("\n", trim($content, "\n"));
+
+		$text .= "<tbody>\n";
+		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);
+
+			# Split row by cell.
+			$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";
+			}
+			$text .= "</tr>\n";
+		}
+		$text .= "</tbody>\n";
+		$text .= "</table>";
+
+		return $this->hashBlock($text) . "\n";
+	}
+
+	function doDefLists($text)
+	{
+		#
+		# Form HTML definition lists.
+		#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Re-usable pattern to match any entire dl list:
+		$whole_list_re = '(?>
 			(								# $1 = whole list
 			  (								# $2
 				[ ]{0,' . $less_than_tab . '}
@@ -3054,44 +3054,44 @@ 
 			)
 		)'; // mx
 
-        $text = preg_replace_callback(
-            '{
+		$text = preg_replace_callback(
+			'{
 				(?>\A\n?|(?<=\n\n))
 				' . $whole_list_re . '
 			}mx',
-            array(&$this, '_doDefLists_callback'),
-            $text
-        );
-
-        return $text;
-    }
-
-    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 = "<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.
-        #
-        $less_than_tab = $this->tab_width - 1;
-
-        # trim trailing blank lines:
-        $list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
-
-        # Process definition terms.
-        $list_str = preg_replace_callback(
-            '{
+			array(&$this, '_doDefLists_callback'),
+			$text
+		);
+
+		return $text;
+	}
+
+	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 = "<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.
+		#
+		$less_than_tab = $this->tab_width - 1;
+
+		# trim trailing blank lines:
+		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
+
+		# Process definition terms.
+		$list_str = preg_replace_callback(
+			'{
 			(?>\A\n?|\n\n+)					# leading line
 			(								# definition terms = $1
 				[ ]{0,' . $less_than_tab . '}	# leading whitespace
@@ -3102,13 +3102,13 @@ 
 			(?=\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(
-            '{
+		# Process actual definitions.
+		$list_str = preg_replace_callback(
+			'{
 			\n(\n+)?						# leading line = $1
 			(								# marker space = $2
 				[ ]{0,' . $less_than_tab . '}	# whitespace before colon
@@ -3122,56 +3122,56 @@ 
 				)
 			)
 			}xm',
-            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));
-            $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)) {
-            # 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));
-        }
-
-        return "\n<dd>" . $def . "</dd>\n";
-    }
-
-    function doFencedCodeBlocks($text)
-    {
-        #
-        # Adding the fenced code block syntax to regular Markdown:
-        #
-        # ~~~
-        # Code block
-        # ~~~
-        #
-        $less_than_tab = $this->tab_width;
-
-        $text = preg_replace_callback(
-            '{
+			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));
+			$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)) {
+			# 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));
+		}
+
+		return "\n<dd>" . $def . "</dd>\n";
+	}
+
+	function doFencedCodeBlocks($text)
+	{
+		#
+		# Adding the fenced code block syntax to regular Markdown:
+		#
+		# ~~~
+		# Code block
+		# ~~~
+		#
+		$less_than_tab = $this->tab_width;
+
+		$text = preg_replace_callback(
+			'{
 				(?:\n|\A)
 				# 1: Opening marker
 				(
@@ -3196,120 +3196,120 @@ 
 				# Closing marker.
 				\1 [ ]* \n
 			}xm',
-            array(&$this, '_doFencedCodeBlocks_callback'),
-            $text
-        );
-
-        return $text;
-    }
-
-    function _doFencedCodeBlocks_callback($matches)
-    {
-        $classname =& $matches[2];
-        $attrs     =& $matches[3];
-        $codeblock = $matches[4];
-        $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
-        $codeblock = preg_replace_callback(
-            '/^\n+/',
-            array(&$this, '_doFencedCodeBlocks_newlines'),
-            $codeblock
-        );
-
-        if ($classname != "") {
-            if ($classname{0} == '.') {
-                $classname = substr($classname, 1);
-            }
-            $attr_str = ' class="' . $this->code_class_prefix . $classname . '"';
-        } else {
-            $attr_str = $this->doExtraAttributes($this->code_attr_on_pre ? "pre" : "code", $attrs);
-        }
-        $pre_attr_str  = $this->code_attr_on_pre ? $attr_str : '';
-        $code_attr_str = $this->code_attr_on_pre ? '' : $attr_str;
-        $codeblock     = "<pre$pre_attr_str><code$code_attr_str>$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])
-        );
-    }
-
-
-    #
-    # Redefining emphasis markers so that emphasis by underscore does not
-    # work in the middle of a word.
-    #
-    var $em_relist = array(
-        ''  => '(?:(?<!\*)\*(?!\*)|(?<![a-zA-Z0-9_])_(?!_))(?=\S|$)(?![\.,:;]\s)',
-        '*' => '(?<=\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
-        #
-        # Strip leading and trailing lines:
-        $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));
-
-            # 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) {
-                $value = "<p>$value</p>";
-            }
-            $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);
-
-        return $text;
-    }
-
-    ### Footnotes
-
-    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(
-            '{
+			array(&$this, '_doFencedCodeBlocks_callback'),
+			$text
+		);
+
+		return $text;
+	}
+
+	function _doFencedCodeBlocks_callback($matches)
+	{
+		$classname =& $matches[2];
+		$attrs     =& $matches[3];
+		$codeblock = $matches[4];
+		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+		$codeblock = preg_replace_callback(
+			'/^\n+/',
+			array(&$this, '_doFencedCodeBlocks_newlines'),
+			$codeblock
+		);
+
+		if ($classname != "") {
+			if ($classname{0} == '.') {
+				$classname = substr($classname, 1);
+			}
+			$attr_str = ' class="' . $this->code_class_prefix . $classname . '"';
+		} else {
+			$attr_str = $this->doExtraAttributes($this->code_attr_on_pre ? "pre" : "code", $attrs);
+		}
+		$pre_attr_str  = $this->code_attr_on_pre ? $attr_str : '';
+		$code_attr_str = $this->code_attr_on_pre ? '' : $attr_str;
+		$codeblock     = "<pre$pre_attr_str><code$code_attr_str>$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])
+		);
+	}
+
+
+	#
+	# Redefining emphasis markers so that emphasis by underscore does not
+	# work in the middle of a word.
+	#
+	var $em_relist = array(
+		''  => '(?:(?<!\*)\*(?!\*)|(?<![a-zA-Z0-9_])_(?!_))(?=\S|$)(?![\.,:;]\s)',
+		'*' => '(?<=\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
+		#
+		# Strip leading and trailing lines:
+		$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));
+
+			# 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) {
+				$value = "<p>$value</p>";
+			}
+			$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);
+
+		return $text;
+	}
+
+	### Footnotes
+
+	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
 			  [ ]*
 			  \n?					# maybe *one* newline
@@ -3324,215 +3324,215 @@ 
 				)*
 			)
 			}xm',
-            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]);
-        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);
-        }
-        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)) {
-            $text .= "\n\n";
-            $text .= "<div class=\"footnotes\">\n";
-            $text .= "<hr" . $this->empty_element_suffix . "\n";
-            $text .= "<ol>\n\n";
-
-            $attr = " rev=\"footnote\"";
-            if ($this->fn_backlink_class != "") {
-                $class = $this->fn_backlink_class;
-                $class = $this->encodeAttribute($class);
-                $attr .= " class=\"$class\"";
-            }
-            if ($this->fn_backlink_title != "") {
-                $title = $this->fn_backlink_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]);
-                $ref_count = $this->footnotes_ref_count[$note_id];
-                unset($this->footnotes_ref_count[$note_id]);
-                unset($this->footnotes[$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);
-
-                # Prepare backlink, multiple backlinks if multiple references
-                $backlink = "<a href=\"#fnref:$note_id\"$attr>&#8617;</a>";
-                for ($ref_num = 2; $ref_num <= $ref_count; ++ $ref_num) {
-                    $backlink .= " <a href=\"#fnref$ref_num:$note_id\"$attr>&#8617;</a>";
-                }
-                # Add backlink to last paragraph; create new paragraph if needed.
-                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)
-    {
-        $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])) {
-            $num =& $this->footnotes_numbers[$node_id];
-            if (!isset($num)) {
-                # Transfer footnote content to the ordered list and give it its
-                # number
-                $this->footnotes_ordered[$node_id]   = $this->footnotes[$node_id];
-                $this->footnotes_ref_count[$node_id] = 1;
-                $num                                 = $this->footnote_counter ++;
-                $ref_count_mark                      = '';
-            } else {
-                $ref_count_mark = $this->footnotes_ref_count[$node_id] += 1;
-            }
-
-            $attr = " rel=\"footnote\"";
-            if ($this->fn_link_class != "") {
-                $class = $this->fn_link_class;
-                $class = $this->encodeAttribute($class);
-                $attr .= " class=\"$class\"";
-            }
-            if ($this->fn_link_title != "") {
-                $title = $this->fn_link_title;
-                $title = $this->encodeAttribute($title);
-                $attr .= " title=\"$title\"";
-            }
-
-            $attr    = str_replace("%%", $num, $attr);
-            $node_id = $this->encodeAttribute($node_id);
-
-            return
-                "<sup id=\"fnref$ref_count_mark:$node_id\">" .
-                "<a href=\"#fn:$node_id\"$attr>$num</a>" .
-                "</sup>";
-        }
-
-        return "[^" . $matches[1] . "]";
-    }
-
-    ### Abbreviations ###
-
-    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(
-            '{
+			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]);
+		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);
+		}
+		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)) {
+			$text .= "\n\n";
+			$text .= "<div class=\"footnotes\">\n";
+			$text .= "<hr" . $this->empty_element_suffix . "\n";
+			$text .= "<ol>\n\n";
+
+			$attr = " rev=\"footnote\"";
+			if ($this->fn_backlink_class != "") {
+				$class = $this->fn_backlink_class;
+				$class = $this->encodeAttribute($class);
+				$attr .= " class=\"$class\"";
+			}
+			if ($this->fn_backlink_title != "") {
+				$title = $this->fn_backlink_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]);
+				$ref_count = $this->footnotes_ref_count[$note_id];
+				unset($this->footnotes_ref_count[$note_id]);
+				unset($this->footnotes[$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);
+
+				# Prepare backlink, multiple backlinks if multiple references
+				$backlink = "<a href=\"#fnref:$note_id\"$attr>&#8617;</a>";
+				for ($ref_num = 2; $ref_num <= $ref_count; ++ $ref_num) {
+					$backlink .= " <a href=\"#fnref$ref_num:$note_id\"$attr>&#8617;</a>";
+				}
+				# Add backlink to last paragraph; create new paragraph if needed.
+				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)
+	{
+		$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])) {
+			$num =& $this->footnotes_numbers[$node_id];
+			if (!isset($num)) {
+				# Transfer footnote content to the ordered list and give it its
+				# number
+				$this->footnotes_ordered[$node_id]   = $this->footnotes[$node_id];
+				$this->footnotes_ref_count[$node_id] = 1;
+				$num                                 = $this->footnote_counter ++;
+				$ref_count_mark                      = '';
+			} else {
+				$ref_count_mark = $this->footnotes_ref_count[$node_id] += 1;
+			}
+
+			$attr = " rel=\"footnote\"";
+			if ($this->fn_link_class != "") {
+				$class = $this->fn_link_class;
+				$class = $this->encodeAttribute($class);
+				$attr .= " class=\"$class\"";
+			}
+			if ($this->fn_link_title != "") {
+				$title = $this->fn_link_title;
+				$title = $this->encodeAttribute($title);
+				$attr .= " title=\"$title\"";
+			}
+
+			$attr    = str_replace("%%", $num, $attr);
+			$node_id = $this->encodeAttribute($node_id);
+
+			return
+				"<sup id=\"fnref$ref_count_mark:$node_id\">" .
+				"<a href=\"#fn:$node_id\"$attr>$num</a>" .
+				"</sup>";
+		}
+
+		return "[^" . $matches[1] . "]";
+	}
+
+	### Abbreviations ###
+
+	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)
 			}xm',
-            array(&$this, '_stripAbbreviations_callback'),
-            $text
-        );
-        return $text;
-    }
-
-    function _stripAbbreviations_callback($matches)
-    {
-        $abbr_word = $matches[1];
-        $abbr_desc = $matches[2];
-        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);
-        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
-            // contain significant spaces:
-            $text = preg_replace_callback(
-                '{' .
-                '(?<![\w\x1A])' .
-                '(?:' . $this->abbr_word_re . ')' .
-                '(?![\w\x1A])' .
-                '}',
-                array(&$this, '_doAbbreviations_callback'),
-                $text
-            );
-        }
-        return $text;
-    }
-
-    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>");
-            } else {
-                $desc = $this->encodeAttribute($desc);
-                return $this->hashPart("<abbr title=\"$desc\">$abbr</abbr>");
-            }
-        } else {
-            return $matches[0];
-        }
-    }
+			array(&$this, '_stripAbbreviations_callback'),
+			$text
+		);
+		return $text;
+	}
+
+	function _stripAbbreviations_callback($matches)
+	{
+		$abbr_word = $matches[1];
+		$abbr_desc = $matches[2];
+		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);
+		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
+			// contain significant spaces:
+			$text = preg_replace_callback(
+				'{' .
+				'(?<![\w\x1A])' .
+				'(?:' . $this->abbr_word_re . ')' .
+				'(?![\w\x1A])' .
+				'}',
+				array(&$this, '_doAbbreviations_callback'),
+				$text
+			);
+		}
+		return $text;
+	}
+
+	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>");
+			} else {
+				$desc = $this->encodeAttribute($desc);
+				return $this->hashPart("<abbr title=\"$desc\">$abbr</abbr>");
+			}
+		} else {
+			return $matches[0];
+		}
+	}
 }
 
 /*

application/libraries/Migration.php

Doc Comments +2 added lines, -2 removed lines

@@ -321,7 +321,7 @@ 
      *
      * @param string $type  Any key from _migration_paths, or {module_name}
      *
-     * @return bool|string
+     * @return false|string
      */
     public function get_latest($type='app')
     {
@@ -465,7 +465,7 @@ 
 	/**
 	 * Based on the 'type', determines the correct migration path.
 	 *
-	 * @param $type
+	 * @param string $type
 	 * @param bool $create
 	 *
 	 * @return null|string

Indentation +508 added lines, -508 removed lines

@@ -51,415 +51,415 @@ 
  */
 class CI_Migration {
 
-    /**
-     * Whether the library is enabled
-     *
-     * @var bool
-     */
-    protected $_migration_enabled = FALSE;
-
-    /**
-     * Migration numbering type
-     *
-     * @var	bool
-     */
-    protected $_migration_type = 'sequential';
-
-    /**
-     * Path to migration classes
-     *
-     * @var string
-     */
-    protected  $_migration_paths = NULL;
-
-    /**
-     * Current migration version
-     *
-     * @var mixed
-     */
-    protected $_migration_version = 0;
-
-    /**
-     * Database table with migration info
-     *
-     * @var string
-     */
-    protected $_migration_table = 'migrations';
-
-    /**
-     * Whether to automatically run migrations
-     *
-     * @var	bool
-     */
-    protected $_migration_auto_latest = FALSE;
-
-    /**
-     * Migration basename regex
-     *
-     * @var bool
-     */
-    protected $_migration_regex = NULL;
-
-    /**
-     * Error message
-     *
-     * @var string
-     */
-    protected $_error_string = '';
-
-    /**
-     * Initialize Migration Class
-     *
-     * @param	array	$config
-     * @return	void
-     */
-    public function __construct($config = array())
-    {
-        // Only run this constructor on main library load
-        if ( ! in_array(get_class($this), array('CI_Migration', config_item('subclass_prefix').'Migration'), TRUE))
-        {
-            return;
-        }
-
-        foreach ($config as $key => $val)
-        {
-            $this->{'_'.$key} = $val;
-        }
-
-        log_message('debug', 'Migrations class initialized');
-
-        // Are they trying to use migrations while it is disabled?
-        if ($this->_migration_enabled !== TRUE)
-        {
-            show_error('Migrations has been loaded but is disabled or set up incorrectly.');
-        }
-
-        // If not set, set it
-        count($this->_migration_paths) OR $this->_migration_paths = array(APPPATH.'database/migrations/');
-
-        // Add trailing slash if not set
-        foreach ($this->_migration_paths as $alias => $path) {
-            $this->_migration_paths[$alias] = rtrim($this->_migration_paths[$alias], '/') . '/';
-        }
-
-        // Load migration language
-        $this->lang->load('migration');
-
-        // They'll probably be using dbforge
-        $this->load->dbforge();
-
-        // Make sure the migration table name was set.
-        if (empty($this->_migration_table))
-        {
-            show_error('Migrations configuration file (migration.php) must have "migration_table" set.');
-        }
-
-        // Migration basename regex
-        $this->_migration_regex = ($this->_migration_type === 'timestamp')
-            ? '/^\d{14}_(\w+)$/'
-            : '/^\d{3}_(\w+)$/';
-
-        // Make sure a valid migration numbering type was set.
-        if ( ! in_array($this->_migration_type, array('sequential', 'timestamp')))
-        {
-            show_error('An invalid migration numbering type was specified: '.$this->_migration_type);
-        }
-
-        // If the migrations table is missing, make it
-        if ( ! $this->db->table_exists($this->_migration_table))
-        {
-            $this->dbforge->add_field(array(
-                'version' => array('type' => 'BIGINT', 'constraint' => 20),
-                'alias' => array('type' => 'VARCHAR', 'constraint' => 255),
-                'ondate'  => array('type' => 'DATETIME')
-            ));
-
-            $this->dbforge->add_key('alias');
-
-            $this->dbforge->create_table($this->_migration_table, TRUE);
-        }
-
-        // Do we auto migrate to the latest migration?
-        if ($this->_migration_auto_latest === TRUE && ! $this->latest())
-        {
-            show_error($this->error_string());
-        }
-
-    }
-
-    // --------------------------------------------------------------------
-
-    /**
-     * Migrate to a schema version
-     *
-     * Calls each migration step required to get to the schema version of
-     * choice
-     *
-     * @param string $type  Any key from _migration_paths, or {module_name}
-     * @param	string	$target_version	Target schema version
-     *
-     * @return	mixed	TRUE if already latest, FALSE if failed, string if upgraded
-     */
-    public function version($type='all', $target_version)
-    {
-        // Note: We use strings, so that timestamp versions work on 32-bit systems
-        $current_version = $this->get_version($type);
-
-        if ($this->_migration_type === 'sequential')
-        {
-            $target_version = sprintf('%03d', $target_version);
-        }
-        else
-        {
-            $target_version = (string) $target_version;
-        }
-
-        $migrations = $this->find_migrations($type);
-
-        if ($target_version > 0 && ! isset($migrations[$target_version]))
-        {
-            $this->_error_string = sprintf($this->lang->line('migration_not_found'), $target_version);
-            return FALSE;
-        }
-
-        if ($target_version > $current_version)
-        {
-            // Moving Up
-            $method = 'up';
-        }
-        else
-        {
-            // Moving Down, apply in reverse order
-            $method = 'down';
-            krsort($migrations);
-        }
-
-        if (empty($migrations))
-        {
-            return TRUE;
-        }
-
-        $previous = FALSE;
-
-        // Validate all available migrations, and run the ones within our target range
-        foreach ($migrations as $number => $file)
-        {
-            // Check for sequence gaps
-            if ($this->_migration_type === 'sequential' && $previous !== FALSE && abs($number - $previous) > 1)
-            {
-                $this->_error_string = sprintf($this->lang->line('migration_sequence_gap'), $number);
-                return FALSE;
-            }
-
-            include_once($file);
-            $class = 'Migration_'.ucfirst(strtolower($this->_get_migration_name(basename($file, '.php'))));
-
-            // Validate the migration file structure
-            if ( ! class_exists($class, FALSE))
-            {
-                $this->_error_string = sprintf($this->lang->line('migration_class_doesnt_exist'), $class);
-                return FALSE;
-            }
-
-            $previous = $number;
-
-            // Run migrations that are inside the target range
-            if (
-                ($method === 'up'   && $number > $current_version && $number <= $target_version) OR
-                ($method === 'down' && $number <= $current_version && $number > $target_version)
-            )
-            {
-                $instance = new $class();
-                if ( ! is_callable(array($instance, $method)))
-                {
-                    $this->_error_string = sprintf($this->lang->line('migration_missing_'.$method.'_method'), $class);
-                    return FALSE;
-                }
-
-                log_message('debug', 'Migrating '.$method.' from version '.$current_version.' to version '.$number);
-                call_user_func(array($instance, $method));
-                $current_version = $number;
-                $this->_update_version($type, $current_version);
-            }
-        }
-
-        // This is necessary when moving down, since the the last migration applied
-        // will be the down() method for the next migration up from the target
-        if ($current_version <> $target_version)
-        {
-            $current_version = $target_version;
-            $this->_update_version($type, $current_version);
-        }
-
-        log_message('debug', 'Finished migrating to '.$current_version);
-
-        return $current_version;
-    }
-
-    // --------------------------------------------------------------------
-
-    /**
-     * Sets the schema to the latest migration
-     *
-     * @param string $type  Any key from _migration_paths, or {module_name}
-     *
-     * @return	mixed	TRUE if already latest, FALSE if failed, string if upgraded
-     */
-    public function latest($type='app')
-    {
-        $last_migration = $this->get_latest($type);
-
-        // Calculate the last migration step from existing migration
-        // filenames and proceed to the standard version migration
-        return $this->version($type, $this->_get_migration_number($last_migration));
-    }
-
-    // --------------------------------------------------------------------
-
-    /**
-     * Retrieves the latest migration version available.
-     *
-     * @param string $type  Any key from _migration_paths, or {module_name}
-     *
-     * @return bool|string
-     */
-    public function get_latest($type='app')
-    {
-        $migrations = $this->find_migrations($type);
-
-        if (empty($migrations))
-        {
-            $this->_error_string = $this->lang->line('migration_none_found');
-            return FALSE;
-        }
-
-        return basename(end($migrations));
-    }
-
-    //--------------------------------------------------------------------
-
-
-
-    /**
-     * Sets the schema to the migration version set in config
-     *
-     * @return	mixed	TRUE if already current, FALSE if failed, string if upgraded
-     */
-    public function current()
-    {
-        return $this->version($this->_migration_version);
-    }
-
-    // --------------------------------------------------------------------
-
-    /**
-     * Error string
-     *
-     * @return	string	Error message returned as a string
-     */
-    public function error_string()
-    {
-        return $this->_error_string;
-    }
-
-    // --------------------------------------------------------------------
-
-    /**
-     * Retrieves list of available migration scripts
-     *
-     * @return	array	list of migration file paths sorted by version
-     */
-    public function find_migrations($type='app')
-    {
-        $migrations = array();
-
-        $path = $this->determine_migration_path($type);
-
-        // Load all *_*.php files in the migrations path
-        foreach (glob($path.'*_*.php') as $file)
-        {
-            $name = basename($file, '.php');
-
-            // Filter out non-migration files
-            if (preg_match($this->_migration_regex, $name))
-            {
-                $number = $this->_get_migration_number($name);
-
-                // There cannot be duplicate migration numbers
-                if (isset($migrations[$number]))
-                {
-                    $this->_error_string = sprintf($this->lang->line('migration_multiple_version'), $number);
-                    show_error($this->_error_string);
-                }
-
-                $migrations[$number] = $file;
-            }
-        }
-
-        ksort($migrations);
-        return $migrations;
-    }
-
-    // --------------------------------------------------------------------
-
-    /**
-     * Retrieves current schema version
-     *
-     * @return	string	Current migration version
-     */
-    public function get_version($type='app')
-    {
-        $row = $this->db->select('version')
-                        ->where('alias', $type)
-                        ->get($this->_migration_table)
-                        ->row();
-
-        return $row ? $row->version : '0';
-    }
-
-    // --------------------------------------------------------------------
-
-    /**
-     * Given the string for the name of the file, will
-     * generate the rest of the filename based on the current
-     * $config['migration_type'] setting.
-     *
-     * @param $name
-     * @return string The final name (with extension)
-     */
-    public function make_name($name)
-    {
-        if (empty($name))
-        {
-            return null;
-        }
-
-        if ($this->_migration_type == 'timestamp')
-        {
-            $prefix = date('YmdHis');
-        }
-        else
-        {
-            $prefix = str_pad($this->get_version() + 1, 3, '0', STR_PAD_LEFT);
-        }
-
-        return $prefix .'_'. ucfirst(strtolower($name)) .'.php';
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Enable the use of CI super-global
-     *
-     * @param	string	$var
-     * @return	mixed
-     */
-    public function __get($var)
-    {
-        return get_instance()->$var;
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Whether the library is enabled
+	 *
+	 * @var bool
+	 */
+	protected $_migration_enabled = FALSE;
+
+	/**
+	 * Migration numbering type
+	 *
+	 * @var	bool
+	 */
+	protected $_migration_type = 'sequential';
+
+	/**
+	 * Path to migration classes
+	 *
+	 * @var string
+	 */
+	protected  $_migration_paths = NULL;
+
+	/**
+	 * Current migration version
+	 *
+	 * @var mixed
+	 */
+	protected $_migration_version = 0;
+
+	/**
+	 * Database table with migration info
+	 *
+	 * @var string
+	 */
+	protected $_migration_table = 'migrations';
+
+	/**
+	 * Whether to automatically run migrations
+	 *
+	 * @var	bool
+	 */
+	protected $_migration_auto_latest = FALSE;
+
+	/**
+	 * Migration basename regex
+	 *
+	 * @var bool
+	 */
+	protected $_migration_regex = NULL;
+
+	/**
+	 * Error message
+	 *
+	 * @var string
+	 */
+	protected $_error_string = '';
+
+	/**
+	 * Initialize Migration Class
+	 *
+	 * @param	array	$config
+	 * @return	void
+	 */
+	public function __construct($config = array())
+	{
+		// Only run this constructor on main library load
+		if ( ! in_array(get_class($this), array('CI_Migration', config_item('subclass_prefix').'Migration'), TRUE))
+		{
+			return;
+		}
+
+		foreach ($config as $key => $val)
+		{
+			$this->{'_'.$key} = $val;
+		}
+
+		log_message('debug', 'Migrations class initialized');
+
+		// Are they trying to use migrations while it is disabled?
+		if ($this->_migration_enabled !== TRUE)
+		{
+			show_error('Migrations has been loaded but is disabled or set up incorrectly.');
+		}
+
+		// If not set, set it
+		count($this->_migration_paths) OR $this->_migration_paths = array(APPPATH.'database/migrations/');
+
+		// Add trailing slash if not set
+		foreach ($this->_migration_paths as $alias => $path) {
+			$this->_migration_paths[$alias] = rtrim($this->_migration_paths[$alias], '/') . '/';
+		}
+
+		// Load migration language
+		$this->lang->load('migration');
+
+		// They'll probably be using dbforge
+		$this->load->dbforge();
+
+		// Make sure the migration table name was set.
+		if (empty($this->_migration_table))
+		{
+			show_error('Migrations configuration file (migration.php) must have "migration_table" set.');
+		}
+
+		// Migration basename regex
+		$this->_migration_regex = ($this->_migration_type === 'timestamp')
+			? '/^\d{14}_(\w+)$/'
+			: '/^\d{3}_(\w+)$/';
+
+		// Make sure a valid migration numbering type was set.
+		if ( ! in_array($this->_migration_type, array('sequential', 'timestamp')))
+		{
+			show_error('An invalid migration numbering type was specified: '.$this->_migration_type);
+		}
+
+		// If the migrations table is missing, make it
+		if ( ! $this->db->table_exists($this->_migration_table))
+		{
+			$this->dbforge->add_field(array(
+				'version' => array('type' => 'BIGINT', 'constraint' => 20),
+				'alias' => array('type' => 'VARCHAR', 'constraint' => 255),
+				'ondate'  => array('type' => 'DATETIME')
+			));
+
+			$this->dbforge->add_key('alias');
+
+			$this->dbforge->create_table($this->_migration_table, TRUE);
+		}
+
+		// Do we auto migrate to the latest migration?
+		if ($this->_migration_auto_latest === TRUE && ! $this->latest())
+		{
+			show_error($this->error_string());
+		}
+
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Migrate to a schema version
+	 *
+	 * Calls each migration step required to get to the schema version of
+	 * choice
+	 *
+	 * @param string $type  Any key from _migration_paths, or {module_name}
+	 * @param	string	$target_version	Target schema version
+	 *
+	 * @return	mixed	TRUE if already latest, FALSE if failed, string if upgraded
+	 */
+	public function version($type='all', $target_version)
+	{
+		// Note: We use strings, so that timestamp versions work on 32-bit systems
+		$current_version = $this->get_version($type);
+
+		if ($this->_migration_type === 'sequential')
+		{
+			$target_version = sprintf('%03d', $target_version);
+		}
+		else
+		{
+			$target_version = (string) $target_version;
+		}
+
+		$migrations = $this->find_migrations($type);
+
+		if ($target_version > 0 && ! isset($migrations[$target_version]))
+		{
+			$this->_error_string = sprintf($this->lang->line('migration_not_found'), $target_version);
+			return FALSE;
+		}
+
+		if ($target_version > $current_version)
+		{
+			// Moving Up
+			$method = 'up';
+		}
+		else
+		{
+			// Moving Down, apply in reverse order
+			$method = 'down';
+			krsort($migrations);
+		}
+
+		if (empty($migrations))
+		{
+			return TRUE;
+		}
+
+		$previous = FALSE;
+
+		// Validate all available migrations, and run the ones within our target range
+		foreach ($migrations as $number => $file)
+		{
+			// Check for sequence gaps
+			if ($this->_migration_type === 'sequential' && $previous !== FALSE && abs($number - $previous) > 1)
+			{
+				$this->_error_string = sprintf($this->lang->line('migration_sequence_gap'), $number);
+				return FALSE;
+			}
+
+			include_once($file);
+			$class = 'Migration_'.ucfirst(strtolower($this->_get_migration_name(basename($file, '.php'))));
+
+			// Validate the migration file structure
+			if ( ! class_exists($class, FALSE))
+			{
+				$this->_error_string = sprintf($this->lang->line('migration_class_doesnt_exist'), $class);
+				return FALSE;
+			}
+
+			$previous = $number;
+
+			// Run migrations that are inside the target range
+			if (
+				($method === 'up'   && $number > $current_version && $number <= $target_version) OR
+				($method === 'down' && $number <= $current_version && $number > $target_version)
+			)
+			{
+				$instance = new $class();
+				if ( ! is_callable(array($instance, $method)))
+				{
+					$this->_error_string = sprintf($this->lang->line('migration_missing_'.$method.'_method'), $class);
+					return FALSE;
+				}
+
+				log_message('debug', 'Migrating '.$method.' from version '.$current_version.' to version '.$number);
+				call_user_func(array($instance, $method));
+				$current_version = $number;
+				$this->_update_version($type, $current_version);
+			}
+		}
+
+		// This is necessary when moving down, since the the last migration applied
+		// will be the down() method for the next migration up from the target
+		if ($current_version <> $target_version)
+		{
+			$current_version = $target_version;
+			$this->_update_version($type, $current_version);
+		}
+
+		log_message('debug', 'Finished migrating to '.$current_version);
+
+		return $current_version;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Sets the schema to the latest migration
+	 *
+	 * @param string $type  Any key from _migration_paths, or {module_name}
+	 *
+	 * @return	mixed	TRUE if already latest, FALSE if failed, string if upgraded
+	 */
+	public function latest($type='app')
+	{
+		$last_migration = $this->get_latest($type);
+
+		// Calculate the last migration step from existing migration
+		// filenames and proceed to the standard version migration
+		return $this->version($type, $this->_get_migration_number($last_migration));
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Retrieves the latest migration version available.
+	 *
+	 * @param string $type  Any key from _migration_paths, or {module_name}
+	 *
+	 * @return bool|string
+	 */
+	public function get_latest($type='app')
+	{
+		$migrations = $this->find_migrations($type);
+
+		if (empty($migrations))
+		{
+			$this->_error_string = $this->lang->line('migration_none_found');
+			return FALSE;
+		}
+
+		return basename(end($migrations));
+	}
+
+	//--------------------------------------------------------------------
+
+
+
+	/**
+	 * Sets the schema to the migration version set in config
+	 *
+	 * @return	mixed	TRUE if already current, FALSE if failed, string if upgraded
+	 */
+	public function current()
+	{
+		return $this->version($this->_migration_version);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Error string
+	 *
+	 * @return	string	Error message returned as a string
+	 */
+	public function error_string()
+	{
+		return $this->_error_string;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Retrieves list of available migration scripts
+	 *
+	 * @return	array	list of migration file paths sorted by version
+	 */
+	public function find_migrations($type='app')
+	{
+		$migrations = array();
+
+		$path = $this->determine_migration_path($type);
+
+		// Load all *_*.php files in the migrations path
+		foreach (glob($path.'*_*.php') as $file)
+		{
+			$name = basename($file, '.php');
+
+			// Filter out non-migration files
+			if (preg_match($this->_migration_regex, $name))
+			{
+				$number = $this->_get_migration_number($name);
+
+				// There cannot be duplicate migration numbers
+				if (isset($migrations[$number]))
+				{
+					$this->_error_string = sprintf($this->lang->line('migration_multiple_version'), $number);
+					show_error($this->_error_string);
+				}
+
+				$migrations[$number] = $file;
+			}
+		}
+
+		ksort($migrations);
+		return $migrations;
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Retrieves current schema version
+	 *
+	 * @return	string	Current migration version
+	 */
+	public function get_version($type='app')
+	{
+		$row = $this->db->select('version')
+						->where('alias', $type)
+						->get($this->_migration_table)
+						->row();
+
+		return $row ? $row->version : '0';
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Given the string for the name of the file, will
+	 * generate the rest of the filename based on the current
+	 * $config['migration_type'] setting.
+	 *
+	 * @param $name
+	 * @return string The final name (with extension)
+	 */
+	public function make_name($name)
+	{
+		if (empty($name))
+		{
+			return null;
+		}
+
+		if ($this->_migration_type == 'timestamp')
+		{
+			$prefix = date('YmdHis');
+		}
+		else
+		{
+			$prefix = str_pad($this->get_version() + 1, 3, '0', STR_PAD_LEFT);
+		}
+
+		return $prefix .'_'. ucfirst(strtolower($name)) .'.php';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Enable the use of CI super-global
+	 *
+	 * @param	string	$var
+	 * @return	mixed
+	 */
+	public function __get($var)
+	{
+		return get_instance()->$var;
+	}
+
+	//--------------------------------------------------------------------
 
 
 	/**
@@ -470,109 +470,109 @@ 
 	 *
 	 * @return null|string
 	 */
-    public function determine_migration_path($type, $create=false)
-    {
-        $type = strtolower($type);
+	public function determine_migration_path($type, $create=false)
+	{
+		$type = strtolower($type);
 
-        // Is it a module?
-        if (strpos($type, 'mod:') === 0)
-        {
-            $module = str_replace('mod:', '', $type);
+		// Is it a module?
+		if (strpos($type, 'mod:') === 0)
+		{
+			$module = str_replace('mod:', '', $type);
 
-            $path = \Myth\Modules::path($module, 'migrations');
+			$path = \Myth\Modules::path($module, 'migrations');
 
-	        // Should we return a 'created' module?
-	        // Use the first module path.
-	        if (empty($path) && $create === true)
-	        {
+			// Should we return a 'created' module?
+			// Use the first module path.
+			if (empty($path) && $create === true)
+			{
 				$folders = config_item('modules_locations');
 
-		        if (is_array($folders) && count($folders))
-		        {
-			        $path = $folders[0] . $module .'/migrations';
-		        }
-	        }
-
-            return rtrim($path, '/') .'/';
-        }
-
-        // Look in our predefined groups.
-        if (! empty($this->_migration_paths[$type]))
-        {
-            return rtrim($this->_migration_paths[$type], '/') .'/';
-        }
-
-        return null;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns the default migration path. This is basically the first
-     * path in the migration_paths array.
-     *
-     * @return string
-     */
-    public function default_migration_path()
-    {
-        return key($this->_migration_paths);
-    }
-
-    //--------------------------------------------------------------------
-
-
-    //--------------------------------------------------------------------
-    // Protected Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Extracts the migration number from a filename
-     *
-     * @param	string	$migration
-     * @return	string	Numeric portion of a migration filename
-     */
-    protected function _get_migration_number($migration)
-    {
-        return sscanf($migration, '%[0-9]+', $number)
-            ? $number : '0';
-    }
-
-    // --------------------------------------------------------------------
-
-    /**
-     * Extracts the migration class name from a filename
-     *
-     * @param	string	$migration
-     * @return	string	text portion of a migration filename
-     */
-    protected function _get_migration_name($migration)
-    {
-        $parts = explode('_', $migration);
-        array_shift($parts);
-        return implode('_', $parts);
-    }
-
-    // --------------------------------------------------------------------
-
-    /**
-     * Stores the current schema version
-     *
-     * @param   string  $type  Any key from _migration_paths, or {module_name}
-     * @param	string	$migration	Migration reached
-     * @return	mixed	Outputs a report of the migration
-     */
-    protected function _update_version($type='all', $migration)
-    {
-        $this->db->where('alias', $type)
-                 ->delete($this->_migration_table);
-
-        return $this->db->insert($this->_migration_table, array(
-            'version'   => $migration,
-            'alias'     => $type,
-            'ondate'    => date('Y-m-d H:i:s')
-        ));
-    }
-
-    // --------------------------------------------------------------------
+				if (is_array($folders) && count($folders))
+				{
+					$path = $folders[0] . $module .'/migrations';
+				}
+			}
+
+			return rtrim($path, '/') .'/';
+		}
+
+		// Look in our predefined groups.
+		if (! empty($this->_migration_paths[$type]))
+		{
+			return rtrim($this->_migration_paths[$type], '/') .'/';
+		}
+
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the default migration path. This is basically the first
+	 * path in the migration_paths array.
+	 *
+	 * @return string
+	 */
+	public function default_migration_path()
+	{
+		return key($this->_migration_paths);
+	}
+
+	//--------------------------------------------------------------------
+
+
+	//--------------------------------------------------------------------
+	// Protected Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Extracts the migration number from a filename
+	 *
+	 * @param	string	$migration
+	 * @return	string	Numeric portion of a migration filename
+	 */
+	protected function _get_migration_number($migration)
+	{
+		return sscanf($migration, '%[0-9]+', $number)
+			? $number : '0';
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Extracts the migration class name from a filename
+	 *
+	 * @param	string	$migration
+	 * @return	string	text portion of a migration filename
+	 */
+	protected function _get_migration_name($migration)
+	{
+		$parts = explode('_', $migration);
+		array_shift($parts);
+		return implode('_', $parts);
+	}
+
+	// --------------------------------------------------------------------
+
+	/**
+	 * Stores the current schema version
+	 *
+	 * @param   string  $type  Any key from _migration_paths, or {module_name}
+	 * @param	string	$migration	Migration reached
+	 * @return	mixed	Outputs a report of the migration
+	 */
+	protected function _update_version($type='all', $migration)
+	{
+		$this->db->where('alias', $type)
+				 ->delete($this->_migration_table);
+
+		return $this->db->insert($this->_migration_table, array(
+			'version'   => $migration,
+			'alias'     => $type,
+			'ondate'    => date('Y-m-d H:i:s')
+		));
+	}
+
+	// --------------------------------------------------------------------
 
 }

application/models/User_model.php

Doc Comments +1 added lines, -1 removed lines

@@ -292,7 +292,7 @@
      * @param $user_id
      * @param $key
      *
-     * @return bool
+     * @return false|null
      */
     public function removeMetaFromUser($user_id, $key)
     {

Indentation +356 added lines, -356 removed lines

@@ -4,363 +4,363 @@
 
 class User_model extends \Myth\Models\CIDbModel {
 
-    protected $table_name = 'users';
-
-    protected $soft_deletes = true;
-
-    protected $set_created = true;
-
-    protected $set_modified = false;
-
-    protected $protected_attributes = ['id', 'submit'];
-
-    protected $validation_rules = [
-        [
-            'field' => 'first_name',
-            'label' => 'lang:auth.first_name',
-            'rules' => 'trim|alpha|max_length[255]'
-        ],
-        [
-            'field' => 'last_name',
-            'label' => 'lang:auth.last_name',
-            'rules' => 'trim|alpha|max_length[255]'
-        ],
-        [
-            'field' => 'email',
-            'label' => 'lang:auth.email',
-            'rules' => 'trim|valid_email|max_length[255]'
-        ],
-        [
-            'field' => 'username',
-            'label' => 'lang:auth.username',
-            'rules' => 'trim|alpha_numeric|max_length[255]'
-        ],
-        [
-            'field' => 'password',
-            'label' => 'lang:auth.password',
-            'rules' => 'trim|max_length[255]|isStrongPassword'
-        ],
-        [
-            'field' => 'pass_confirm',
-            'label' => 'lang:auth.pass_confirm',
-            'rules' => 'trim|matches[password]'
-        ],
-    ];
-
-    protected $insert_validate_rules = [
-        'email'        => 'required|is_unique[users.email]',
-        'username'     => 'required|is_unique[users.username]',
-        'password'     => 'required',
-        'pass_confirm' => 'required'
-    ];
-
-    protected $before_insert = ['hashPassword'];
-    protected $before_update = ['hashPassword'];
-    protected $after_insert  = ['updateMeta'];
-    protected $after_update  = ['updateMeta'];
-
-    // The columns in the 'users_meta' table - for auto updating of profile information.
-    protected $meta_fields = ['first_name', 'last_name'];
-
-    protected $fields = ['id', 'email', 'username', 'password_hash', 'reset_hash', 'activate_hash', 'created_on', 'status', 'status_message', 'active', 'deleted', 'force_pass_reset'];
-
-    //--------------------------------------------------------------------
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->load->helper('auth/password');
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Works with any find queries to return user_meta information.
-     *
-     * @return $this
-     */
-    public function withMeta()
-    {
-        $this->after_find[] = 'grabMeta';
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * If exists, will take our password out of the data array, and
-     * create a new hash for it, which is inserted back into the
-     * data array to be saved to the database.
-     *
-     * @param array $data
-     *
-     * @return array
-     */
-    protected function hashPassword($data)
-    {
-        if (isset($data['fields']))
-        {
-            $data = $data['fields'];
-        }
-
-        if (isset($data['password']))
-        {
-            $data['password_hash'] = \Myth\Auth\Password::hashPassword($data['password']);
-
-            unset($data['password'], $data['pass_confirm']);
-        }
-
-        return $data;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * A callback designed to work with Digest Authentication to create
-     * and store the $A1 value since we'll never have access to the
-     * password except during inserts or updates.
-     *
-     * This assumes that this is working as part of an API and that
-     * the api config file is already loaded into memory.
-     *
-     * @param $data
-     *
-     * @return $data
-     */
-    public function createDigestKey($data)
-    {
-        $field = config_item('api.auth_field');
-        $value = null;
-
-        // If it's an update, we probably won't have the username/email
-        // so grab it so that we can use it.
-        if (! empty($data[ $this->primary_key ]))
-        {
-            if (! isset($data[$field]) )
-            {
-                $value = $this->get_field( $data['id'], $field );
-            }
-        }
-        // However, if it's an insert, then we should have it, If we don't, leave.
-        else
-        {
-            if (empty($data[$field]))
-            {
-                return $data;
-            }
-
-            $value = $data[$field];
-        }
-
-        // Still here? then create the hash based on the current realm.
-        if (! empty($data['password']) )
-        {
-            $key = md5($value .':'. config_item('api.realm') .':'. $data['password']);
-            $data['api_key'] = $key;
-        }
-
-        return $data;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * A callback method intended to hook into the after_insert and after_udpate
-     * methods.
-     *
-     * NOTE: Will only work for insert and update methods.
-     *
-     * @param array $data
-     * @return mixed
-     */
-    public function updateMeta($data)
-    {
-        // If no 'id' is in the $data array, then
-        // we don't have successful insert, get out of here
-        if (empty($data['id']) || ($data['method'] != 'insert' && $data['method'] != 'update'))
-        {
-            return $data;
-        }
-
-        // Collect any meta fields
-        foreach ($data['fields'] as $key => $value)
-        {
-            if (in_array($key, $this->meta_fields))
-            {
-                $this->db->where('user_id', $data['id']);
-                $this->db->where('meta_key', $key);
-                $query = $this->db->get('user_meta');
-
-                $obj = [
-                    'user_id'    => $data['id'],
-                    'meta_key'   => $key,
-                    'meta_value' => $value
-                ];
-
-                if ($query->num_rows() == 0)
-                {
-                    $this->db->insert('user_meta', $obj);
-                }
-                else if ($query->num_rows() > 0)
-                {
-                    $this->db->where('user_id', $data['id'])
-                             ->where('meta_key', $key)
-                             ->set('meta_value', $value)
-                             ->update('user_meta', $obj);
-                }
-            }
-        }
-
-        return $data;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds a single piece of meta information to a user.
-     *
-     * @param $user_id
-     * @param $key
-     * @param null $value
-     *
-     * @return object
-     */
-    public function saveMetaToUser($user_id, $key, $value=null)
-    {
-        if (! Events::trigger('beforeAddMetaToUser', [$user_id, $key]))
-        {
-            return false;
-        }
-
-        $user_id = (int)$user_id;
-
-        // Does this key already exist?
-        $test = $this->db->where([ 'user_id' => $user_id, 'meta_key' => $key ])->get('user_meta');
-
-        // Doesn't exist, so insert it.
-        if (! $test->num_rows())
-        {
-            $data = [
-                'user_id'       => $user_id,
-                'meta_key'      => $key,
-                'meta_value'    => $value
-            ];
-
-            return $this->db->insert('user_meta', $data);
-        }
-
-        // Otherwise, we need to update the existing.
-        return $this->db->where('user_id', $user_id)
-                        ->where('meta_key', $key)
-                        ->set('meta_value', $value)
-                        ->update('user_meta');
-    }
+	protected $table_name = 'users';
+
+	protected $soft_deletes = true;
+
+	protected $set_created = true;
+
+	protected $set_modified = false;
+
+	protected $protected_attributes = ['id', 'submit'];
+
+	protected $validation_rules = [
+		[
+			'field' => 'first_name',
+			'label' => 'lang:auth.first_name',
+			'rules' => 'trim|alpha|max_length[255]'
+		],
+		[
+			'field' => 'last_name',
+			'label' => 'lang:auth.last_name',
+			'rules' => 'trim|alpha|max_length[255]'
+		],
+		[
+			'field' => 'email',
+			'label' => 'lang:auth.email',
+			'rules' => 'trim|valid_email|max_length[255]'
+		],
+		[
+			'field' => 'username',
+			'label' => 'lang:auth.username',
+			'rules' => 'trim|alpha_numeric|max_length[255]'
+		],
+		[
+			'field' => 'password',
+			'label' => 'lang:auth.password',
+			'rules' => 'trim|max_length[255]|isStrongPassword'
+		],
+		[
+			'field' => 'pass_confirm',
+			'label' => 'lang:auth.pass_confirm',
+			'rules' => 'trim|matches[password]'
+		],
+	];
+
+	protected $insert_validate_rules = [
+		'email'        => 'required|is_unique[users.email]',
+		'username'     => 'required|is_unique[users.username]',
+		'password'     => 'required',
+		'pass_confirm' => 'required'
+	];
+
+	protected $before_insert = ['hashPassword'];
+	protected $before_update = ['hashPassword'];
+	protected $after_insert  = ['updateMeta'];
+	protected $after_update  = ['updateMeta'];
+
+	// The columns in the 'users_meta' table - for auto updating of profile information.
+	protected $meta_fields = ['first_name', 'last_name'];
+
+	protected $fields = ['id', 'email', 'username', 'password_hash', 'reset_hash', 'activate_hash', 'created_on', 'status', 'status_message', 'active', 'deleted', 'force_pass_reset'];
+
+	//--------------------------------------------------------------------
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->load->helper('auth/password');
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Works with any find queries to return user_meta information.
+	 *
+	 * @return $this
+	 */
+	public function withMeta()
+	{
+		$this->after_find[] = 'grabMeta';
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * If exists, will take our password out of the data array, and
+	 * create a new hash for it, which is inserted back into the
+	 * data array to be saved to the database.
+	 *
+	 * @param array $data
+	 *
+	 * @return array
+	 */
+	protected function hashPassword($data)
+	{
+		if (isset($data['fields']))
+		{
+			$data = $data['fields'];
+		}
+
+		if (isset($data['password']))
+		{
+			$data['password_hash'] = \Myth\Auth\Password::hashPassword($data['password']);
+
+			unset($data['password'], $data['pass_confirm']);
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * A callback designed to work with Digest Authentication to create
+	 * and store the $A1 value since we'll never have access to the
+	 * password except during inserts or updates.
+	 *
+	 * This assumes that this is working as part of an API and that
+	 * the api config file is already loaded into memory.
+	 *
+	 * @param $data
+	 *
+	 * @return $data
+	 */
+	public function createDigestKey($data)
+	{
+		$field = config_item('api.auth_field');
+		$value = null;
+
+		// If it's an update, we probably won't have the username/email
+		// so grab it so that we can use it.
+		if (! empty($data[ $this->primary_key ]))
+		{
+			if (! isset($data[$field]) )
+			{
+				$value = $this->get_field( $data['id'], $field );
+			}
+		}
+		// However, if it's an insert, then we should have it, If we don't, leave.
+		else
+		{
+			if (empty($data[$field]))
+			{
+				return $data;
+			}
+
+			$value = $data[$field];
+		}
+
+		// Still here? then create the hash based on the current realm.
+		if (! empty($data['password']) )
+		{
+			$key = md5($value .':'. config_item('api.realm') .':'. $data['password']);
+			$data['api_key'] = $key;
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * A callback method intended to hook into the after_insert and after_udpate
+	 * methods.
+	 *
+	 * NOTE: Will only work for insert and update methods.
+	 *
+	 * @param array $data
+	 * @return mixed
+	 */
+	public function updateMeta($data)
+	{
+		// If no 'id' is in the $data array, then
+		// we don't have successful insert, get out of here
+		if (empty($data['id']) || ($data['method'] != 'insert' && $data['method'] != 'update'))
+		{
+			return $data;
+		}
+
+		// Collect any meta fields
+		foreach ($data['fields'] as $key => $value)
+		{
+			if (in_array($key, $this->meta_fields))
+			{
+				$this->db->where('user_id', $data['id']);
+				$this->db->where('meta_key', $key);
+				$query = $this->db->get('user_meta');
+
+				$obj = [
+					'user_id'    => $data['id'],
+					'meta_key'   => $key,
+					'meta_value' => $value
+				];
+
+				if ($query->num_rows() == 0)
+				{
+					$this->db->insert('user_meta', $obj);
+				}
+				else if ($query->num_rows() > 0)
+				{
+					$this->db->where('user_id', $data['id'])
+							 ->where('meta_key', $key)
+							 ->set('meta_value', $value)
+							 ->update('user_meta', $obj);
+				}
+			}
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds a single piece of meta information to a user.
+	 *
+	 * @param $user_id
+	 * @param $key
+	 * @param null $value
+	 *
+	 * @return object
+	 */
+	public function saveMetaToUser($user_id, $key, $value=null)
+	{
+		if (! Events::trigger('beforeAddMetaToUser', [$user_id, $key]))
+		{
+			return false;
+		}
+
+		$user_id = (int)$user_id;
+
+		// Does this key already exist?
+		$test = $this->db->where([ 'user_id' => $user_id, 'meta_key' => $key ])->get('user_meta');
+
+		// Doesn't exist, so insert it.
+		if (! $test->num_rows())
+		{
+			$data = [
+				'user_id'       => $user_id,
+				'meta_key'      => $key,
+				'meta_value'    => $value
+			];
+
+			return $this->db->insert('user_meta', $data);
+		}
+
+		// Otherwise, we need to update the existing.
+		return $this->db->where('user_id', $user_id)
+						->where('meta_key', $key)
+						->set('meta_value', $value)
+						->update('user_meta');
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Gets the value of a single Meta item from a user.
-     *
-     * @param $user_id
-     * @param $key
-     *
-     * @return mixed
-     */
-    public function getMetaItem($user_id, $key)
-    {
-        $query = $this->db->where('user_id', (int)$user_id)
-                          ->where('meta_key', $key)
-                          ->select('meta_value')
-                          ->get('user_meta');
-
-        if (! $query->num_rows())
-        {
-            return null;
-        }
-
-        return $query->row()->meta_value;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Deletes one or more meta values from a user.
-     *
-     * @param $user_id
-     * @param $key
-     *
-     * @return bool
-     */
-    public function removeMetaFromUser($user_id, $key)
-    {
-        if (! Events::trigger('beforeRemoveMetaFromUser', [$user_id, $key]))
-        {
-            return false;
-        }
-
-	    if (is_array($key))
-	    {
-		    $this->db->where_in('meta_key', $key);
-	    }
-	    else
-	    {
-		    $this->db->where('meta_key', $key);
-	    }
-
-        $this->db->where('user_id', (int)$user_id)
-                 ->delete('user_meta');
-    }
-
-    //--------------------------------------------------------------------
-
-    public function getMetaForUser($user_id)
-    {
-        $query = $this->db->where('user_id', (int)$user_id)
-                          ->select('meta_key, meta_value')
-                          ->get('user_meta');
-
-        $rows = $query->result();
-
-        $meta = [];
-
-        if (count($rows))
-        {
-            array_walk( $rows, function ( $row ) use ( &$meta )
-            {
-                $meta[ $row->meta_key ] = $row->meta_value;
-            } );
-        }
-
-        return $meta;
-    }
-
-    //--------------------------------------------------------------------
-
-    protected function grabMeta($data)
-    {
-        if (strpos($data['method'], 'find') === false)
-        {
-            return $data;
-        }
-
-        $meta = $this->getMetaForUser($data['fields']->id);
-
-        if (is_object($data['fields']))
-        {
-            $data['fields']->meta = (object)$meta;
-        }
-        else
-        {
-            $data['fields']['meta']= $meta;
-        }
-
-        return $data;
-    }
-
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the value of a single Meta item from a user.
+	 *
+	 * @param $user_id
+	 * @param $key
+	 *
+	 * @return mixed
+	 */
+	public function getMetaItem($user_id, $key)
+	{
+		$query = $this->db->where('user_id', (int)$user_id)
+						  ->where('meta_key', $key)
+						  ->select('meta_value')
+						  ->get('user_meta');
+
+		if (! $query->num_rows())
+		{
+			return null;
+		}
+
+		return $query->row()->meta_value;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Deletes one or more meta values from a user.
+	 *
+	 * @param $user_id
+	 * @param $key
+	 *
+	 * @return bool
+	 */
+	public function removeMetaFromUser($user_id, $key)
+	{
+		if (! Events::trigger('beforeRemoveMetaFromUser', [$user_id, $key]))
+		{
+			return false;
+		}
+
+		if (is_array($key))
+		{
+			$this->db->where_in('meta_key', $key);
+		}
+		else
+		{
+			$this->db->where('meta_key', $key);
+		}
+
+		$this->db->where('user_id', (int)$user_id)
+				 ->delete('user_meta');
+	}
+
+	//--------------------------------------------------------------------
+
+	public function getMetaForUser($user_id)
+	{
+		$query = $this->db->where('user_id', (int)$user_id)
+						  ->select('meta_key, meta_value')
+						  ->get('user_meta');
+
+		$rows = $query->result();
+
+		$meta = [];
+
+		if (count($rows))
+		{
+			array_walk( $rows, function ( $row ) use ( &$meta )
+			{
+				$meta[ $row->meta_key ] = $row->meta_value;
+			} );
+		}
+
+		return $meta;
+	}
+
+	//--------------------------------------------------------------------
+
+	protected function grabMeta($data)
+	{
+		if (strpos($data['method'], 'find') === false)
+		{
+			return $data;
+		}
+
+		$meta = $this->getMetaForUser($data['fields']->id);
+
+		if (is_object($data['fields']))
+		{
+			$data['fields']->meta = (object)$meta;
+		}
+		else
+		{
+			$data['fields']['meta']= $meta;
+		}
+
+		return $data;
+	}
+
+	//--------------------------------------------------------------------
 
 
 }

application/third_party/HMVC/Loader.php

Doc Comments +6 added lines, -6 removed lines

@@ -107,7 +107,7 @@ 
      * @param	string	the name of the class
      * @param	mixed	the optional parameters
      * @param	string	an optional object name
-     * @return	void
+     * @return	null|HMVC_Loader
      */
     public function library($library = '', $params = NULL, $object_name = NULL) {
         if (is_array($library)) {
@@ -147,7 +147,7 @@ 
      * @param	string	the name of the class
      * @param	string	name for the model
      * @param	bool	database connection
-     * @return	void
+     * @return	null|HMVC_Loader
      */
     public function model($model, $name = '', $db_conn = FALSE) {
         if (is_array($model)) {
@@ -232,7 +232,7 @@ 
      * @param	string
      * @param	bool
      * @param 	bool
-     * @return	void
+     * @return	boolean|null
      */
     public function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) {
         // Detect module
@@ -263,7 +263,7 @@ 
      * This function loads the specified helper file.
      *
      * @param	mixed
-     * @return	void
+     * @return	null|HMVC_Loader
      */
     public function helper($helper = array()) {
         if (is_array($helper)) {
@@ -300,7 +300,7 @@ 
      *
      * @param	array
      * @param	string
-     * @return	void
+     * @return	null|HMVC_Loader
      */
     public function language($file = array(), $lang = '') {
         if (is_array($file)) {
@@ -517,7 +517,7 @@ 
      * Searches a given module name. Returns the path if found, FALSE otherwise
      *
      * @param string $module
-     * @return string|boolean
+     * @return string|false
      */
     private function find_module($module) {
         $config = & $this->_ci_get_component('config');

Indentation +499 added lines, -499 removed lines

@@ -30,506 +30,506 @@
  */
 
 if (!defined("BASEPATH"))
-    exit("No direct script access allowed");
+	exit("No direct script access allowed");
 
 class HMVC_Loader extends CI_Loader {
 
-    /**
-     * List of loaded modules
-     *
-     * @var array
-     * @access protected
-     */
-    protected $_ci_modules = array();
-
-    /**
-     * List of loaded controllers
-     *
-     * @var array
-     * @access protected
-     */
-    protected $_ci_controllers = array();
-
-    /**
-     * Constructor
-     *
-     * Add the current module to all paths permanently
-     */
-    public function __construct() {
-        parent::__construct();
-
-        // Get current module from the router
-        $router = & $this->_ci_get_component('router');
-        if ($router->module) {
-            $this->add_module($router->module);
-        }
-    }
-
-    /**
-     * Controller Loader
-     *
-     * This function lets users load and hierarchical controllers to enable HMVC support
-     *
-     * @param	string	the uri to the controller
-     * @param	array	parameters for the requested method
-     * @param	boolean return the result instead of showing it
-     * @return	void
-     */
-    public function controller($uri, $params = array(), $return = FALSE) {
-        // No valid module detected, add current module to uri
-        list($module) = $this->detect_module($uri);
-        if (!isset($module)) {
-            $router = & $this->_ci_get_component('router');
-            if ($router->module) {
-                $module = $router->module;
-                $uri = $module . '/' . $uri;
-            }
-        }
-
-        // Add module
-        $this->add_module($module);
-
-        // Execute the controller method and capture output
-        $void = $this->_load_controller($uri, $params, $return);
-
-        // Remove module
-        $this->remove_module();
-
-        return $void;
-    }
-
-    /**
-     * Class Loader
-     *
-     * This function lets users load and instantiate classes.
-     * It is designed to be called from a user's app controllers.
-     *
-     * @param	string	the name of the class
-     * @param	mixed	the optional parameters
-     * @param	string	an optional object name
-     * @return	void
-     */
-    public function library($library = '', $params = NULL, $object_name = NULL) {
-        if (is_array($library)) {
-            foreach ($library as $class) {
-                $this->library($class, $params);
-            }
-            return;
-        }
-
-        // Detect module
-        if (list($module, $class) = $this->detect_module($library)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return parent::library($class, $params, $object_name);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Let parent do the heavy work
-            $void = parent::library($class, $params, $object_name);
-
-            // Remove module
-            $this->remove_module();
-
-            return $void;
-        } else {
-            return parent::library($library, $params, $object_name);
-        }
-    }
-
-    /**
-     * Model Loader
-     *
-     * This function lets users load and instantiate models.
-     *
-     * @param	string	the name of the class
-     * @param	string	name for the model
-     * @param	bool	database connection
-     * @return	void
-     */
-    public function model($model, $name = '', $db_conn = FALSE) {
-        if (is_array($model)) {
-            foreach ($model as $babe) {
-                $this->model($babe);
-            }
-            return;
-        }
-
-        // Detect module
-        if (list($module, $class) = $this->detect_module($model)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return parent::model($class, $name, $db_conn);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Let parent do the heavy work
-            $void = parent::model($class, $name, $db_conn);
-
-            // Remove module
-            $this->remove_module();
-
-            return $void;
-        } else {
-            return parent::model($model, $name, $db_conn);
-        }
-    }
-
-    /**
-     * Load View
-     *
-     * This function is used to load a "view" file.  It has three parameters:
-     *
-     * 1. The name of the "view" file to be included.
-     * 2. An associative array of data to be extracted for use in the view.
-     * 3. TRUE/FALSE - whether to return the data or load it.  In
-     * some cases it's advantageous to be able to return data so that
-     * a developer can process it in some way.
-     *
-     * @param	string
-     * @param	array
-     * @param	bool
-     * @return	void
-     */
-    public function view($view, $vars = array(), $return = FALSE)
-    {
-        // Allow application/views/* to override any module
-        // views for easier app customization.
-        if (file_exists(APPPATH .'views/'. $view .'.php'))
-        {
-            return parent::view($view, $vars, $return);
-        }
-
-        // Detect module
-        if (list($module, $class) = $this->detect_module($view)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return parent::view($class, $vars, $return);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Let parent do the heavy work
-            $void = parent::view($class, $vars, $return);
-
-            // Remove module
-            $this->remove_module();
-
-            return $void;
-        } else {
-            return parent::view($view, $vars, $return);
-        }
-    }
-
-    /**
-     * Loads a config file
-     *
-     * @param	string
-     * @param	bool
-     * @param 	bool
-     * @return	void
-     */
-    public function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) {
-        // Detect module
-        if (list($module, $class) = $this->detect_module($file)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return parent::config($class, $use_sections, $fail_gracefully);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Let parent do the heavy work
-            $void = parent::config($class, $use_sections, $fail_gracefully);
-
-            // Remove module
-            $this->remove_module();
-
-            return $void;
-        } else {
-            parent::config($file, $use_sections, $fail_gracefully);
-        }
-    }
-
-    /**
-     * Load Helper
-     *
-     * This function loads the specified helper file.
-     *
-     * @param	mixed
-     * @return	void
-     */
-    public function helper($helper = array()) {
-        if (is_array($helper)) {
-            foreach ($helper as $help) {
-                $this->helper($help);
-            }
-            return;
-        }
-
-        // Detect module
-        if (list($module, $class) = $this->detect_module($helper)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return parent::helper($class);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Let parent do the heavy work
-            $void = parent::helper($class);
-
-            // Remove module
-            $this->remove_module();
-
-            return $void;
-        } else {
-            return parent::helper($helper);
-        }
-    }
-
-    /**
-     * Loads a language file
-     *
-     * @param	array
-     * @param	string
-     * @return	void
-     */
-    public function language($file = array(), $lang = '') {
-        if (is_array($file)) {
-            foreach ($file as $langfile) {
-                $this->language($langfile, $lang);
-            }
-            return;
-        }
-
-        // Detect module
-        if (list($module, $class) = $this->detect_module($file)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return parent::language($class, $lang);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Let parent do the heavy work
-            $void = parent::language($class, $lang);
-
-            // Remove module
-            $this->remove_module();
-
-            return $void;
-        } else {
-            return parent::language($file, $lang);
-        }
-    }
-
-    /**
-     * Load Widget
-     *
-     * This function provides support to Jens Segers Template Library for loading
-     * widget controllers within modules (place in module/widgets folder).
-     * @author  hArpanet - 23-Jun-2014
-     *
-     * @param   string $widget  Must contain Module name if widget within a module
-     *                          (eg. test/nav  where module name is 'test')
-     * @return  array|false
-     */
-    public function widget($widget) {
-
-        // Detect module
-        if (list($module, $widget) = $this->detect_module($widget)) {
-            // Module already loaded
-            if (in_array($module, $this->_ci_modules)) {
-                return array($module, $widget);
-            }
-
-            // Add module
-            $this->add_module($module);
-
-            // Look again now we've added new module path
-            $void = $this->widget($module.'/'.$widget);
-
-            // Remove module if widget not found within it
-            if (!$void) {
-                $this->remove_module();
-            }
-
-            return $void;
-
-        } else {
-            // widget not found in module
-            return FALSE;
-        }
-    }
-
-    /**
-     * Add Module
-     *
-     * Allow resources to be loaded from this module path
-     *
-     * @param	string
-     * @param 	boolean
-     */
-    public function add_module($module, $view_cascade = TRUE) {
-        if ($path = $this->find_module($module)) {
-            // Mark module as loaded
-            array_unshift($this->_ci_modules, $module);
-
-            // Add package path
-            parent::add_package_path($path, $view_cascade);
-        }
-    }
-
-    /**
-     * Remove Module
-     *
-     * Remove a module from the allowed module paths
-     *
-     * @param	type
-     * @param 	bool
-     */
-    public function remove_module($module = '', $remove_config = TRUE) {
-        if ($module == '') {
-            // Mark module as not loaded
-            array_shift($this->_ci_modules);
-
-            // Remove package path
-            parent::remove_package_path('', $remove_config);
-        } else if (($key = array_search($module, $this->_ci_modules)) !== FALSE) {
-            if ($path = $this->find_module($module)) {
-                // Mark module as not loaded
-                unset($this->_ci_modules[$key]);
-
-                // Remove package path
-                parent::remove_package_path($path, $remove_config);
-            }
-        }
-    }
-
-    /**
-     * Controller loader
-     *
-     * This function is used to load and instantiate controllers
-     *
-     * @param	string
-     * @param	array
-     * @param	boolean
-     * @return	object
-     */
-    private function _load_controller($uri = '', $params = array(), $return = FALSE) {
-        $router = & $this->_ci_get_component('router');
-
-        // Back up current router values (before loading new controller)
-        $backup = array();
-        foreach (array('directory', 'class', 'method', 'module') as $prop) {
-            $backup[$prop] = $router->{$prop};
-        }
-
-        // Locate the controller
-        $segments = $router->locate(explode('/', $uri));
-        $class = isset($segments[0]) ? $segments[0] : FALSE;
-        $method = isset($segments[1]) ? $segments[1] : "index";
-
-        // Controller not found
-        if (!$class) {
-            return;
-        }
-
-        if (!array_key_exists(strtolower($class), $this->_ci_controllers)) {
-            // Determine filepath
-            $filepath = APPPATH . 'controllers/' . $router->fetch_directory() . $class . '.php';
-
-            // Load the controller file
-            if (file_exists($filepath)) {
-                include_once ($filepath);
-            }
-
-            // Controller class not found, show 404
-            if (!class_exists($class)) {
-                show_404("{$class}/{$method}");
-            }
-
-            // Create a controller object
-            $this->_ci_controllers[strtolower($class)] = new $class();
-        }
-
-        $controller = $this->_ci_controllers[strtolower($class)];
-
-        // Method does not exists
-        if (!method_exists($controller, $method)) {
-            show_404("{$class}/{$method}");
-        }
-
-        // Restore router state
-        foreach ($backup as $prop => $value) {
-            $router->{$prop} = $value;
-        }
-
-        // Capture output and return
-        ob_start();
-        $result = call_user_func_array(array($controller, $method), $params);
-
-        // Return the buffered output
-        if ($return === TRUE) {
-            $buffer = ob_get_contents();
-            @ob_end_clean();
-            return $buffer;
-        }
-
-        // Close buffer and flush output to screen
-        ob_end_flush();
-
-        // Return controller return value
-        return $result;
-    }
-
-    /**
-     * Detects the module from a string. Returns the module name and class if found.
-     *
-     * @param	string
-     * @return	array|boolean
-     */
-    private function detect_module($class) {
-        $class = str_replace('.php', '', trim($class, '/'));
-        if (($first_slash = strpos($class, '/')) !== FALSE) {
-            $module = substr($class, 0, $first_slash);
-            $class = substr($class, $first_slash + 1);
-
-            // Check if module exists
-            if ($this->find_module($module)) {
-                return array($module, $class);
-            }
-        }
-
-        return FALSE;
-    }
-
-    /**
-     * Searches a given module name. Returns the path if found, FALSE otherwise
-     *
-     * @param string $module
-     * @return string|boolean
-     */
-    private function find_module($module) {
-        $config = & $this->_ci_get_component('config');
-
-        // Check all locations for this module
-        foreach ($config->item('modules_locations') as $location) {
-            $path = $location . rtrim($module, '/') . '/';
-            if (is_dir($path)) {
-                return $path;
-            }
-        }
-
-        return FALSE;
-    }
+	/**
+	 * List of loaded modules
+	 *
+	 * @var array
+	 * @access protected
+	 */
+	protected $_ci_modules = array();
+
+	/**
+	 * List of loaded controllers
+	 *
+	 * @var array
+	 * @access protected
+	 */
+	protected $_ci_controllers = array();
+
+	/**
+	 * Constructor
+	 *
+	 * Add the current module to all paths permanently
+	 */
+	public function __construct() {
+		parent::__construct();
+
+		// Get current module from the router
+		$router = & $this->_ci_get_component('router');
+		if ($router->module) {
+			$this->add_module($router->module);
+		}
+	}
+
+	/**
+	 * Controller Loader
+	 *
+	 * This function lets users load and hierarchical controllers to enable HMVC support
+	 *
+	 * @param	string	the uri to the controller
+	 * @param	array	parameters for the requested method
+	 * @param	boolean return the result instead of showing it
+	 * @return	void
+	 */
+	public function controller($uri, $params = array(), $return = FALSE) {
+		// No valid module detected, add current module to uri
+		list($module) = $this->detect_module($uri);
+		if (!isset($module)) {
+			$router = & $this->_ci_get_component('router');
+			if ($router->module) {
+				$module = $router->module;
+				$uri = $module . '/' . $uri;
+			}
+		}
+
+		// Add module
+		$this->add_module($module);
+
+		// Execute the controller method and capture output
+		$void = $this->_load_controller($uri, $params, $return);
+
+		// Remove module
+		$this->remove_module();
+
+		return $void;
+	}
+
+	/**
+	 * Class Loader
+	 *
+	 * This function lets users load and instantiate classes.
+	 * It is designed to be called from a user's app controllers.
+	 *
+	 * @param	string	the name of the class
+	 * @param	mixed	the optional parameters
+	 * @param	string	an optional object name
+	 * @return	void
+	 */
+	public function library($library = '', $params = NULL, $object_name = NULL) {
+		if (is_array($library)) {
+			foreach ($library as $class) {
+				$this->library($class, $params);
+			}
+			return;
+		}
+
+		// Detect module
+		if (list($module, $class) = $this->detect_module($library)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return parent::library($class, $params, $object_name);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Let parent do the heavy work
+			$void = parent::library($class, $params, $object_name);
+
+			// Remove module
+			$this->remove_module();
+
+			return $void;
+		} else {
+			return parent::library($library, $params, $object_name);
+		}
+	}
+
+	/**
+	 * Model Loader
+	 *
+	 * This function lets users load and instantiate models.
+	 *
+	 * @param	string	the name of the class
+	 * @param	string	name for the model
+	 * @param	bool	database connection
+	 * @return	void
+	 */
+	public function model($model, $name = '', $db_conn = FALSE) {
+		if (is_array($model)) {
+			foreach ($model as $babe) {
+				$this->model($babe);
+			}
+			return;
+		}
+
+		// Detect module
+		if (list($module, $class) = $this->detect_module($model)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return parent::model($class, $name, $db_conn);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Let parent do the heavy work
+			$void = parent::model($class, $name, $db_conn);
+
+			// Remove module
+			$this->remove_module();
+
+			return $void;
+		} else {
+			return parent::model($model, $name, $db_conn);
+		}
+	}
+
+	/**
+	 * Load View
+	 *
+	 * This function is used to load a "view" file.  It has three parameters:
+	 *
+	 * 1. The name of the "view" file to be included.
+	 * 2. An associative array of data to be extracted for use in the view.
+	 * 3. TRUE/FALSE - whether to return the data or load it.  In
+	 * some cases it's advantageous to be able to return data so that
+	 * a developer can process it in some way.
+	 *
+	 * @param	string
+	 * @param	array
+	 * @param	bool
+	 * @return	void
+	 */
+	public function view($view, $vars = array(), $return = FALSE)
+	{
+		// Allow application/views/* to override any module
+		// views for easier app customization.
+		if (file_exists(APPPATH .'views/'. $view .'.php'))
+		{
+			return parent::view($view, $vars, $return);
+		}
+
+		// Detect module
+		if (list($module, $class) = $this->detect_module($view)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return parent::view($class, $vars, $return);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Let parent do the heavy work
+			$void = parent::view($class, $vars, $return);
+
+			// Remove module
+			$this->remove_module();
+
+			return $void;
+		} else {
+			return parent::view($view, $vars, $return);
+		}
+	}
+
+	/**
+	 * Loads a config file
+	 *
+	 * @param	string
+	 * @param	bool
+	 * @param 	bool
+	 * @return	void
+	 */
+	public function config($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) {
+		// Detect module
+		if (list($module, $class) = $this->detect_module($file)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return parent::config($class, $use_sections, $fail_gracefully);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Let parent do the heavy work
+			$void = parent::config($class, $use_sections, $fail_gracefully);
+
+			// Remove module
+			$this->remove_module();
+
+			return $void;
+		} else {
+			parent::config($file, $use_sections, $fail_gracefully);
+		}
+	}
+
+	/**
+	 * Load Helper
+	 *
+	 * This function loads the specified helper file.
+	 *
+	 * @param	mixed
+	 * @return	void
+	 */
+	public function helper($helper = array()) {
+		if (is_array($helper)) {
+			foreach ($helper as $help) {
+				$this->helper($help);
+			}
+			return;
+		}
+
+		// Detect module
+		if (list($module, $class) = $this->detect_module($helper)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return parent::helper($class);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Let parent do the heavy work
+			$void = parent::helper($class);
+
+			// Remove module
+			$this->remove_module();
+
+			return $void;
+		} else {
+			return parent::helper($helper);
+		}
+	}
+
+	/**
+	 * Loads a language file
+	 *
+	 * @param	array
+	 * @param	string
+	 * @return	void
+	 */
+	public function language($file = array(), $lang = '') {
+		if (is_array($file)) {
+			foreach ($file as $langfile) {
+				$this->language($langfile, $lang);
+			}
+			return;
+		}
+
+		// Detect module
+		if (list($module, $class) = $this->detect_module($file)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return parent::language($class, $lang);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Let parent do the heavy work
+			$void = parent::language($class, $lang);
+
+			// Remove module
+			$this->remove_module();
+
+			return $void;
+		} else {
+			return parent::language($file, $lang);
+		}
+	}
+
+	/**
+	 * Load Widget
+	 *
+	 * This function provides support to Jens Segers Template Library for loading
+	 * widget controllers within modules (place in module/widgets folder).
+	 * @author  hArpanet - 23-Jun-2014
+	 *
+	 * @param   string $widget  Must contain Module name if widget within a module
+	 *                          (eg. test/nav  where module name is 'test')
+	 * @return  array|false
+	 */
+	public function widget($widget) {
+
+		// Detect module
+		if (list($module, $widget) = $this->detect_module($widget)) {
+			// Module already loaded
+			if (in_array($module, $this->_ci_modules)) {
+				return array($module, $widget);
+			}
+
+			// Add module
+			$this->add_module($module);
+
+			// Look again now we've added new module path
+			$void = $this->widget($module.'/'.$widget);
+
+			// Remove module if widget not found within it
+			if (!$void) {
+				$this->remove_module();
+			}
+
+			return $void;
+
+		} else {
+			// widget not found in module
+			return FALSE;
+		}
+	}
+
+	/**
+	 * Add Module
+	 *
+	 * Allow resources to be loaded from this module path
+	 *
+	 * @param	string
+	 * @param 	boolean
+	 */
+	public function add_module($module, $view_cascade = TRUE) {
+		if ($path = $this->find_module($module)) {
+			// Mark module as loaded
+			array_unshift($this->_ci_modules, $module);
+
+			// Add package path
+			parent::add_package_path($path, $view_cascade);
+		}
+	}
+
+	/**
+	 * Remove Module
+	 *
+	 * Remove a module from the allowed module paths
+	 *
+	 * @param	type
+	 * @param 	bool
+	 */
+	public function remove_module($module = '', $remove_config = TRUE) {
+		if ($module == '') {
+			// Mark module as not loaded
+			array_shift($this->_ci_modules);
+
+			// Remove package path
+			parent::remove_package_path('', $remove_config);
+		} else if (($key = array_search($module, $this->_ci_modules)) !== FALSE) {
+			if ($path = $this->find_module($module)) {
+				// Mark module as not loaded
+				unset($this->_ci_modules[$key]);
+
+				// Remove package path
+				parent::remove_package_path($path, $remove_config);
+			}
+		}
+	}
+
+	/**
+	 * Controller loader
+	 *
+	 * This function is used to load and instantiate controllers
+	 *
+	 * @param	string
+	 * @param	array
+	 * @param	boolean
+	 * @return	object
+	 */
+	private function _load_controller($uri = '', $params = array(), $return = FALSE) {
+		$router = & $this->_ci_get_component('router');
+
+		// Back up current router values (before loading new controller)
+		$backup = array();
+		foreach (array('directory', 'class', 'method', 'module') as $prop) {
+			$backup[$prop] = $router->{$prop};
+		}
+
+		// Locate the controller
+		$segments = $router->locate(explode('/', $uri));
+		$class = isset($segments[0]) ? $segments[0] : FALSE;
+		$method = isset($segments[1]) ? $segments[1] : "index";
+
+		// Controller not found
+		if (!$class) {
+			return;
+		}
+
+		if (!array_key_exists(strtolower($class), $this->_ci_controllers)) {
+			// Determine filepath
+			$filepath = APPPATH . 'controllers/' . $router->fetch_directory() . $class . '.php';
+
+			// Load the controller file
+			if (file_exists($filepath)) {
+				include_once ($filepath);
+			}
+
+			// Controller class not found, show 404
+			if (!class_exists($class)) {
+				show_404("{$class}/{$method}");
+			}
+
+			// Create a controller object
+			$this->_ci_controllers[strtolower($class)] = new $class();
+		}
+
+		$controller = $this->_ci_controllers[strtolower($class)];
+
+		// Method does not exists
+		if (!method_exists($controller, $method)) {
+			show_404("{$class}/{$method}");
+		}
+
+		// Restore router state
+		foreach ($backup as $prop => $value) {
+			$router->{$prop} = $value;
+		}
+
+		// Capture output and return
+		ob_start();
+		$result = call_user_func_array(array($controller, $method), $params);
+
+		// Return the buffered output
+		if ($return === TRUE) {
+			$buffer = ob_get_contents();
+			@ob_end_clean();
+			return $buffer;
+		}
+
+		// Close buffer and flush output to screen
+		ob_end_flush();
+
+		// Return controller return value
+		return $result;
+	}
+
+	/**
+	 * Detects the module from a string. Returns the module name and class if found.
+	 *
+	 * @param	string
+	 * @return	array|boolean
+	 */
+	private function detect_module($class) {
+		$class = str_replace('.php', '', trim($class, '/'));
+		if (($first_slash = strpos($class, '/')) !== FALSE) {
+			$module = substr($class, 0, $first_slash);
+			$class = substr($class, $first_slash + 1);
+
+			// Check if module exists
+			if ($this->find_module($module)) {
+				return array($module, $class);
+			}
+		}
+
+		return FALSE;
+	}
+
+	/**
+	 * Searches a given module name. Returns the path if found, FALSE otherwise
+	 *
+	 * @param string $module
+	 * @return string|boolean
+	 */
+	private function find_module($module) {
+		$config = & $this->_ci_get_component('config');
+
+		// Check all locations for this module
+		foreach ($config->item('modules_locations') as $location) {
+			$path = $location . rtrim($module, '/') . '/';
+			if (is_dir($path)) {
+				return $path;
+			}
+		}
+
+		return FALSE;
+	}
 }

build/lib/BaseBuilder.php

Doc Comments +8 added lines, -4 removed lines

@@ -21,8 +21,8 @@ 
 	 * Copies the entire contents of a single folder
 	 * into a source folder, recursively.
 	 *
-	 * @param $source
-	 * @param $destination
+	 * @param string $source
+	 * @param string $destination
 	 */
 	public function copyFolder($source, $destination)
 	{
@@ -71,8 +71,8 @@ 
 	 * Deletes all files and folders, recursively, within $path,
 	 * except for any files listed in the $leave_files array.
 	 *
-	 * @param $path
-	 * @param array $leave_files
+	 * @param string $path
+	 * @param string[] $leave_files
 	 */
 	public function cleanFolder($path, $leave_files=[])
 	{
@@ -97,6 +97,10 @@ 
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * @param string $source
+	 * @param string $destination
+	 */
 	public function compressFolder($source, $destination, $include_dir=false)
 	{
 		if (! extension_loaded('zip') ) {

Indentation +5 added lines, -5 removed lines

@@ -12,7 +12,7 @@ 
 
 	public function __construct($ci=null)
 	{
-	    $this->ci =& $ci;
+		$this->ci =& $ci;
 	}
 
 	//--------------------------------------------------------------------
@@ -57,10 +57,10 @@ 
 	 */
 	public function ensureFolder($path)
 	{
-	    if (is_dir($path))
-	    {
-		    return true;
-	    }
+		if (is_dir($path))
+		{
+			return true;
+		}
 
 		return mkdir($path, 0777, true);
 	}

myth/_generators/Api/ApiGenerator.php

Doc Comments +17 added lines, -10 removed lines

@@ -103,7 +103,7 @@ 
 	 * Quickly creates boilerplate code for a new API resource.
 	 *
 	 * @param $segments
-	 * @param $quiet
+	 * @param boolean $quiet
 	 */
 	private function scaffold( $segments, $quiet )
 	{
@@ -220,6 +220,9 @@ 
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * @param string $name
+	 */
 	private function detectModel($name)
 	{
 		$model_name = ucfirst($name) .'_model.php';
@@ -242,8 +245,8 @@ 
     /**
      * Creates the new APIController - based resource with basic CRUD.
      *
-     * @param $single
-     * @param $plural
+     * @param string $single
+     * @param string $plural
      * @param $version
      *
      * @return $this
@@ -271,8 +274,8 @@ 
     /**
      * Creates the language file to accompany the controller.
      *
-     * @param $single
-     * @param $plural
+     * @param string $single
+     * @param string $plural
      * @param $version
      *
      * @return $this
@@ -297,8 +300,8 @@ 
      * Creates the API Blueprint file for that resource in
      * APPPATH/docs/api
      *
-     * @param $single
-     * @param $plural
+     * @param string $single
+     * @param string $plural
      * @param $version
      * @param $model
      *
@@ -349,7 +352,7 @@ 
      * Modifies the _toc.ini file (or creates) for the specified Blueprint docs.
      *
      * @param $plural
-     * @param $version
+     * @param string $version
      *
      * @return $this|bool
      */
@@ -385,7 +388,7 @@ 
      * Creates a generic representation of the object from the database
      * table.
      *
-     * @param $model
+     * @param string $model
      *
      * @return string
      */
@@ -537,6 +540,10 @@ 
 	//--------------------------------------------------------------------
 
 
+	/**
+	 * @param string $tpl
+	 * @param string $name
+	 */
 	private function makeMigration( $tpl, $name )
 	{
 		// Create the migration
@@ -561,7 +568,7 @@ 
 	/**
 	 * Modifies the config/api.php file and sets the Auth type
 	 *
-	 * @param $type
+	 * @param string $type
 	 */
 	private function setAuthType( $type )
 	{

Indentation +160 added lines, -160 removed lines

@@ -239,17 +239,17 @@ 
 
 	//--------------------------------------------------------------------
 
-    /**
-     * Creates the new APIController - based resource with basic CRUD.
-     *
-     * @param $single
-     * @param $plural
-     * @param $version
-     *
-     * @return $this
-     * @internal param $name
-     *
-     */
+	/**
+	 * Creates the new APIController - based resource with basic CRUD.
+	 *
+	 * @param $single
+	 * @param $plural
+	 * @param $version
+	 *
+	 * @return $this
+	 * @internal param $name
+	 *
+	 */
 	private function createController( $single, $plural, $version )
 	{
 		$data = [
@@ -268,44 +268,44 @@ 
 
 	//--------------------------------------------------------------------
 
-    /**
-     * Creates the language file to accompany the controller.
-     *
-     * @param $single
-     * @param $plural
-     * @param $version
-     *
-     * @return $this
-     */
+	/**
+	 * Creates the language file to accompany the controller.
+	 *
+	 * @param $single
+	 * @param $plural
+	 * @param $version
+	 *
+	 * @return $this
+	 */
 	private function createLanguage( $single, $plural, $version )
 	{
-        $data = [
-            'plural'            => $plural,
-            'single'            => $single,
-            'uc_single'         => ucfirst($single),
-            'uc_plural'         => ucfirst($plural),
-        ];
+		$data = [
+			'plural'            => $plural,
+			'single'            => $single,
+			'uc_single'         => ucfirst($single),
+			'uc_plural'         => ucfirst($plural),
+		];
 
-        $destination = APPPATH ."language/english/api_{$plural}_lang.php";
+		$destination = APPPATH ."language/english/api_{$plural}_lang.php";
 
-        return $this->copyTemplate( 'lang', $destination, $data, $this->overwrite );
+		return $this->copyTemplate( 'lang', $destination, $data, $this->overwrite );
 	}
 
 	//--------------------------------------------------------------------
 
-    /**
-     * Creates the API Blueprint file for that resource in
-     * APPPATH/docs/api
-     *
-     * @param $single
-     * @param $plural
-     * @param $version
-     * @param $model
-     *
-     * @return $this
-     * @internal param $name
-     *
-     */
+	/**
+	 * Creates the API Blueprint file for that resource in
+	 * APPPATH/docs/api
+	 *
+	 * @param $single
+	 * @param $plural
+	 * @param $version
+	 * @param $model
+	 *
+	 * @return $this
+	 * @internal param $name
+	 *
+	 */
 	private function createBlueprint( $single, $plural, $version, $model )
 	{
 		$version = rtrim($version, '/');
@@ -315,10 +315,10 @@ 
 		}
 
 		// Load the model so we can use the correct table to use
-        $model = strtolower( str_replace('.php', '', $model) );
+		$model = strtolower( str_replace('.php', '', $model) );
 		$this->load->model( $model, $model, true );
 
-        $obj = $this->formatObject($model);
+		$obj = $this->formatObject($model);
 
 
 		$data = [
@@ -328,139 +328,139 @@ 
 			'uc_plural'         => ucfirst($plural),
 			'version'           => $version,
 			'site_url'          => site_url(),
-            'formatted'         => $obj
+			'formatted'         => $obj
 		];
 
 		$destination = APPPATH .'docs/api/'. $version . $plural .'.md';
 
 		$success = $this->copyTemplate( 'blueprint', $destination, $data, $this->overwrite );
 
-        if (! $this->updateTOC($plural, $version))
-        {
-            CLI::write("\tUnable to modify the toc file.", 'light_red');
-        }
+		if (! $this->updateTOC($plural, $version))
+		{
+			CLI::write("\tUnable to modify the toc file.", 'light_red');
+		}
+
+		return $success;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Modifies the _toc.ini file (or creates) for the specified Blueprint docs.
+	 *
+	 * @param $plural
+	 * @param $version
+	 *
+	 * @return $this|bool
+	 */
+	private function updateTOC( $plural, $version )
+	{
+		$path = APPPATH .'docs/_toc.ini';
+
+		// We need a TOC file to exist if we're going to modify it silly.
+		if (! file_exists($path))
+		{
+			if (! $this->copyTemplate('toc', $path))
+			{
+				return false;
+			}
+		}
+
+		$version = rtrim($version, '/ ');
+		if (! empty($version))
+		{
+			$version .= '/';
+		}
+
+		$ucname = ucfirst($plural);
+
+		$content = "api/{$version}{$plural}\t= {$ucname}\n";
+
+		return $this->injectIntoFile($path, $content);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a generic representation of the object from the database
+	 * table.
+	 *
+	 * @param $model
+	 *
+	 * @return string
+	 */
+	private function formatObject( $model )
+	{
+		$fields = $this->db->field_data($this->$model->table_name);
+
+		$obj = '';
+
+		foreach ($fields as $field)
+		{
+			$obj .= "\"$field->name\":  ";
 
-        return $success;
+			switch ($field->type)
+			{
+				case 'tinyint':
+					$obj .= "0,\n";
+					break;
+				case 'int':
+				case 'bigint':
+					$obj .= "1234,\n";
+					break;
+				case 'float':
+				case 'double':
+					$obj .= "123.45,\n";
+					break;
+				case 'date':
+					$obj .= date("\"Y-m-d\",\n");
+					break;
+				case 'datetime':
+					$obj .= date("\"Y-m-d H:i:s\",\n");
+					break;
+			}
+
+			if ($field->name == 'email')
+			{
+				$obj .= "\"someone@example.com\",\n";
+			}
+			else if (strpos('name', $field->name) !== false)
+			{
+				$obj .= "\"Lefty\",\n";
+			}
+			else if (in_array($field->type, ['char', 'varchar', 'text']))
+			{
+				$obj .= "\"Some default string\",\n";
+			}
+		}
+
+		return $obj;
 	}
 
 	//--------------------------------------------------------------------
 
-    /**
-     * Modifies the _toc.ini file (or creates) for the specified Blueprint docs.
-     *
-     * @param $plural
-     * @param $version
-     *
-     * @return $this|bool
-     */
-    private function updateTOC( $plural, $version )
-    {
-        $path = APPPATH .'docs/_toc.ini';
-
-        // We need a TOC file to exist if we're going to modify it silly.
-        if (! file_exists($path))
-        {
-            if (! $this->copyTemplate('toc', $path))
-            {
-                return false;
-            }
-        }
-
-        $version = rtrim($version, '/ ');
-        if (! empty($version))
-        {
-            $version .= '/';
-        }
-
-        $ucname = ucfirst($plural);
-
-        $content = "api/{$version}{$plural}\t= {$ucname}\n";
-
-        return $this->injectIntoFile($path, $content);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a generic representation of the object from the database
-     * table.
-     *
-     * @param $model
-     *
-     * @return string
-     */
-    private function formatObject( $model )
-    {
-        $fields = $this->db->field_data($this->$model->table_name);
-
-        $obj = '';
-
-        foreach ($fields as $field)
-        {
-            $obj .= "\"$field->name\":  ";
-
-            switch ($field->type)
-            {
-                case 'tinyint':
-                    $obj .= "0,\n";
-                    break;
-                case 'int':
-                case 'bigint':
-                    $obj .= "1234,\n";
-                    break;
-                case 'float':
-                case 'double':
-                    $obj .= "123.45,\n";
-                    break;
-                case 'date':
-                    $obj .= date("\"Y-m-d\",\n");
-                    break;
-                case 'datetime':
-                    $obj .= date("\"Y-m-d H:i:s\",\n");
-                    break;
-            }
-
-            if ($field->name == 'email')
-            {
-                $obj .= "\"someone@example.com\",\n";
-            }
-            else if (strpos('name', $field->name) !== false)
-            {
-                $obj .= "\"Lefty\",\n";
-            }
-            else if (in_array($field->type, ['char', 'varchar', 'text']))
-            {
-                $obj .= "\"Some default string\",\n";
-            }
-        }
-
-        return $obj;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Modifies the routes file to include a line for the API endpoints
-     * for this resource.
-     *
-     * @param string $plural
-     * @param string $version
-     *
-     * @return $this
-     */
+	/**
+	 * Modifies the routes file to include a line for the API endpoints
+	 * for this resource.
+	 *
+	 * @param string $plural
+	 * @param string $version
+	 *
+	 * @return $this
+	 */
 	private function addRoutes( $plural, $version )
 	{
-        $path = APPPATH .'config/routes.php';
+		$path = APPPATH .'config/routes.php';
 
-        $version = rtrim($version, ', ');
-        if (! empty($version))
-        {
-            $version .='/';
-        }
+		$version = rtrim($version, ', ');
+		if (! empty($version))
+		{
+			$version .='/';
+		}
 
-        $content = "\$routes->resources('{$version}{$plural}');\n";
+		$content = "\$routes->resources('{$version}{$plural}');\n";
 
-        return $this->injectIntoFile($path, $content, ['after' => "// Auto-generated routes go here\n"]);
+		return $this->injectIntoFile($path, $content, ['after' => "// Auto-generated routes go here\n"]);
 	}
 
 	//--------------------------------------------------------------------

myth/_generators/Controller/ControllerGenerator.php

Doc Comments +7 added lines

@@ -97,6 +97,9 @@ 
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * @param string $name
+	 */
 	protected function quietSetOptions( $name )
 	{
 		$options = CLI::getOptions();
@@ -120,6 +123,9 @@ 
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * @param string $name
+	 */
 	protected function collectOptions( $name )
 	{
 		$options = CLI::getOptions();
@@ -159,6 +165,7 @@ 
 
 	/**
 	 * Generates the standard views for our CRUD methods.
+	 * @param string $name
 	 */
 	protected function createViews( $name )
 	{

Indentation +37 added lines, -37 removed lines

@@ -203,20 +203,20 @@ 
 
 		if ( empty( $fields ) )
 		{
-            // If we have a model, we can get our fields from there
-            if (! empty($this->options['model']))
-            {
-                $fields = $this->getFieldsFromModel( $this->options['model'] );
-
-                if (empty($fields))
-                {
-                    return NULL;
-                }
-            }
-            else
-            {
-                return NULL;
-            }
+			// If we have a model, we can get our fields from there
+			if (! empty($this->options['model']))
+			{
+				$fields = $this->getFieldsFromModel( $this->options['model'] );
+
+				if (empty($fields))
+				{
+					return NULL;
+				}
+			}
+			else
+			{
+				return NULL;
+			}
 		}
 
 		$fields = explode( ' ', $fields );
@@ -277,36 +277,36 @@ 
 
 	//--------------------------------------------------------------------
 
-    private function getFieldsFromModel( $model )
-    {
-        $this->load->model($model);
+	private function getFieldsFromModel( $model )
+	{
+		$this->load->model($model);
 
-        if (! $this->db->table_exists( $this->$model->table() ))
-        {
-            return '';
-        }
+		if (! $this->db->table_exists( $this->$model->table() ))
+		{
+			return '';
+		}
 
-        $fields = $this->db->field_data( $this->$model->table() );
+		$fields = $this->db->field_data( $this->$model->table() );
 
-        $return = '';
+		$return = '';
 
-        // Prepare the fields in a string format like
-        // it would have been passed on the CLI
-        foreach ($fields as $field)
-        {
-            $temp = $field->name .':'. $field->type;
+		// Prepare the fields in a string format like
+		// it would have been passed on the CLI
+		foreach ($fields as $field)
+		{
+			$temp = $field->name .':'. $field->type;
 
-            if (! empty($field->max_length))
-            {
-                $temp .= ':'. $field->max_length;
-            }
+			if (! empty($field->max_length))
+			{
+				$temp .= ':'. $field->max_length;
+			}
 
-            $return .= ' '. $temp;
-        }
+			$return .= ' '. $temp;
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/_generators/Migration/MigrationGenerator.php

Doc Comments +5 added lines, -2 removed lines

@@ -159,7 +159,7 @@ 
 	 *  'create_user_table'         action = 'create', table = 'user'
 	 *  'add_name_to_user_table     action = 'add', table = 'user'
 	 *
-	 * @param $name
+	 * @param string $name
 	 */
 	public function detectAction($name)
 	{
@@ -199,6 +199,9 @@ 
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * @param string $name
+	 */
 	public function collectOptions($name, $quiet=false)
 	{
 		$options = CLI::getOptions();
@@ -308,7 +311,7 @@ 
 	 * Reads the fields from an existing table and fills out our
 	 * $fields array and $primary key information.
 	 *
-	 * @param $table
+	 * @param string $table
 	 */
 	protected function readTable($table)
 	{

Indentation +34 added lines, -34 removed lines

@@ -1,34 +1,34 @@ 
 <?php
 /**
- * Sprint
- *
- * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package     Sprint
- * @author      Lonnie Ezell
- * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
- * @license     http://opensource.org/licenses/MIT  (MIT)
- * @link        http://sprintphp.com
- * @since       Version 1.0
- */
+	 * Sprint
+	 *
+	 * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package     Sprint
+	 * @author      Lonnie Ezell
+	 * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
+	 * @license     http://opensource.org/licenses/MIT  (MIT)
+	 * @link        http://sprintphp.com
+	 * @since       Version 1.0
+	 */
 
 use Myth\CLI as CLI;
 
@@ -163,7 +163,7 @@ 
 	 */
 	public function detectAction($name)
 	{
-	    $segments = explode('_', $name);
+		$segments = explode('_', $name);
 
 		$action = trim(strtolower(array_shift($segments)));
 
@@ -236,10 +236,10 @@ 
 	 */
 	public function parseFields($str)
 	{
-        if (empty($str))
-        {
-	        return;
-        }
+		if (empty($str))
+		{
+			return;
+		}
 
 		$fields = [];
 		$segments = explode(' ', $str);

myth/_generators/Model/ModelGenerator.php

Doc Comments +7 added lines

@@ -107,6 +107,10 @@ 
 	/*
 	 * Customizes our settings
 	 */
+
+	/**
+	 * @param string $model_name
+	 */
 	protected function collectOptions( $model_name, $options=[] )
 	{
 		$this->load->helper( 'inflector' );
@@ -180,6 +184,9 @@ 
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * @param string $model_name
+	 */
 	protected function quietSetOptions( $model_name, $options=[] )
 	{
 		$this->load->helper( 'inflector' );

Indentation +92 added lines, -92 removed lines

@@ -60,7 +60,7 @@ 
 	{
 		$name = array_shift( $segments );
 
-        $options = CLI::getOptions();
+		$options = CLI::getOptions();
 
 		$this->options['table_name'] = array_shift( $segments );
 
@@ -213,17 +213,17 @@ 
 		// Check whether the table exists in this database
 		if ( ! $this->db->table_exists( $table_name ) )
 		{
-            if (empty($options['fields']))
-            {
-                return FALSE;
-            }
+			if (empty($options['fields']))
+			{
+				return FALSE;
+			}
 
-            $fields = $this->parseFieldString($options['fields']);
+			$fields = $this->parseFieldString($options['fields']);
+		}
+		else
+		{
+			$fields = $this->db->field_data( $table_name );
 		}
-        else
-        {
-            $fields = $this->db->field_data( $table_name );
-        }
 
 		// There may be something wrong or the database driver may not return
 		// field data
@@ -232,9 +232,9 @@ 
 			return FALSE;
 		}
 
-        $this->options['set_created']       = false;
-        $this->options['set_modified']      = false;
-        $this->options['use_soft_deletes']  = false;
+		$this->options['set_created']       = false;
+		$this->options['set_modified']      = false;
+		$this->options['use_soft_deletes']  = false;
 
 		// Use the primary key if the table has one already set.
 		foreach ( $fields as $field )
@@ -244,20 +244,20 @@ 
 				$this->options['primary_key'] = $field->name;
 			}
 
-            if ($field->name == $this->options['created_field'])
-            {
-                $this->options['set_created'] = true;
-            }
+			if ($field->name == $this->options['created_field'])
+			{
+				$this->options['set_created'] = true;
+			}
 
-            if ($field->name == $this->options['modified_field'])
-            {
-                $this->options['set_modified'] = true;
-            }
+			if ($field->name == $this->options['modified_field'])
+			{
+				$this->options['set_modified'] = true;
+			}
 
-            if ($field->name == $this->options['soft_delete_key'])
-            {
-                $this->options['use_soft_deletes'] = true;
-            }
+			if ($field->name == $this->options['soft_delete_key'])
+			{
+				$this->options['use_soft_deletes'] = true;
+			}
 		}
 
 		// Set our validation rules based on these fields
@@ -268,73 +268,73 @@ 
 
 	//--------------------------------------------------------------------
 
-    /**
-     * Grabs the fields from the CLI options and gets them ready for
-     * use within the views.
-     */
-    protected function parseFieldString($fields)
-    {
-        if ( empty( $fields ) )
-        {
-            return NULL;
-        }
-
-        $fields = explode( ' ', $fields );
-
-        $new_fields = [ ];
-
-        foreach ( $fields as $field )
-        {
-            $pop = [ NULL, NULL, NULL ];
-            list( $field, $type, $size ) = array_merge( explode( ':', $field ), $pop );
-            $type = strtolower( $type );
-
-            // Strings
-            if (in_array($type, ['char', 'varchar', 'string']))
-            {
-                $new_fields[] = [
-                    'name'  => $field,
-                    'type'  => 'text'
-                ];
-            }
-
-            // Textarea
-            else if ($type == 'text')
-            {
-                $new_fields[] = [
-                    'name'  => $field,
-                    'type'  => 'textarea'
-                ];
-            }
-
-            // Number
-            else if (in_array($type, ['tinyint', 'int', 'bigint', 'mediumint', 'float', 'double', 'number']))
-            {
-                $new_fields[] = [
-                    'name'  => $field,
-                    'type'  => 'number'
-                ];
-            }
-
-            // Date
-            else if (in_array($type, ['date', 'datetime', 'time']))
-            {
-                $new_fields[] = [
-                    'name'  => $field,
-                    'type'  => $type
-                ];
-            }
-        }
-
-        // Convert to objects
-        array_walk($new_fields, function(&$item, $key) {
-            $item = (object)$item;
-        });
-
-        return $new_fields;
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Grabs the fields from the CLI options and gets them ready for
+	 * use within the views.
+	 */
+	protected function parseFieldString($fields)
+	{
+		if ( empty( $fields ) )
+		{
+			return NULL;
+		}
+
+		$fields = explode( ' ', $fields );
+
+		$new_fields = [ ];
+
+		foreach ( $fields as $field )
+		{
+			$pop = [ NULL, NULL, NULL ];
+			list( $field, $type, $size ) = array_merge( explode( ':', $field ), $pop );
+			$type = strtolower( $type );
+
+			// Strings
+			if (in_array($type, ['char', 'varchar', 'string']))
+			{
+				$new_fields[] = [
+					'name'  => $field,
+					'type'  => 'text'
+				];
+			}
+
+			// Textarea
+			else if ($type == 'text')
+			{
+				$new_fields[] = [
+					'name'  => $field,
+					'type'  => 'textarea'
+				];
+			}
+
+			// Number
+			else if (in_array($type, ['tinyint', 'int', 'bigint', 'mediumint', 'float', 'double', 'number']))
+			{
+				$new_fields[] = [
+					'name'  => $field,
+					'type'  => 'number'
+				];
+			}
+
+			// Date
+			else if (in_array($type, ['date', 'datetime', 'time']))
+			{
+				$new_fields[] = [
+					'name'  => $field,
+					'type'  => $type
+				];
+			}
+		}
+
+		// Convert to objects
+		array_walk($new_fields, function(&$item, $key) {
+			$item = (object)$item;
+		});
+
+		return $new_fields;
+	}
+
+	//--------------------------------------------------------------------
 
 
 	/**