From 3aeb166d555eae1dca09ab40c02790534ab06268 Mon Sep 17 00:00:00 2001
From: "Gun.io Whitespace Robot" <contact@gun.io>
Date: Fri, 21 Oct 2011 03:00:35 -0400
Subject: [PATCH] Remove whitespace [Gun.io WhitespaceBot]

---
 index-sample.php           |   4 +-
 markdown-wiki.php          | 112 +++++++++---------
 markdown.php               | 230 ++++++++++++++++++-------------------
 pages/markdown.markdown    |   6 +-
 tests/MarkdownTest.php     |   2 +-
 tests/MarkdownWikiTest.php |  22 ++--
 6 files changed, 188 insertions(+), 188 deletions(-)

diff --git a/index-sample.php b/index-sample.php
index 7f57394..e7e54c9 100644
--- a/index-sample.php
+++ b/index-sample.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 # The directory containing the php5-markdown wiki code
 $appRoot = '/home/user/projects/php5-markdown/';
@@ -6,7 +6,7 @@
 $config = array(
 	# Directory to store the markdown pages
 	'docDir'      => $appRoot . 'pages/',
-	
+
 	# Default page name
 	'defaultPage' => 'index'
 
diff --git a/markdown-wiki.php b/markdown-wiki.php
index b201003..fcf8bae 100644
--- a/markdown-wiki.php
+++ b/markdown-wiki.php
@@ -8,18 +8,18 @@ class MarkdownWiki {
 		'newPageText' => 'Start editing your new page',
 		'markdownExt' => 'markdown'
 	);
-	
+
 	// An instance of the Markdown parser
 	protected $parser;
 	protected $baseUrl;
-	
+
 	public function __construct($config=false) {
 		$this->initWiki();
 		if ($config) {
 			$this->setConfig($config);
 		}
 	}
-	
+
 	protected function initWiki() {
 		$baseDir = dirname(__FILE__) . '/';
 
@@ -27,13 +27,13 @@ protected function initWiki() {
 		//echo "BaseDir: {$baseDir}\n";
 		require_once $baseDir . 'markdown.php';
 	}
-	
+
 	public function wikiLink($link) {
 		global $docIndex;
-		
+
 		$isNew = false;
 		$wikiUrl = $link;
-		
+
 		if (preg_match('/^\/?([a-z0-9-]+(\/[a-z0-9-]+)*)$/i', $link, $matches)) {
 			$wikiUrl = "{$this->baseUrl}{$matches[1]}";
 			$isNew = !$this->isMarkdownFile($link);
@@ -41,7 +41,7 @@ public function wikiLink($link) {
 			$wikiUrl = "{$this->baseUrl}{$this->config['defaultPage']}";
 			$isNew = !$this->isMarkdownFile($this->config['defaultPage']);
 		}
-	
+
 		return array($isNew, $wikiUrl);
 	}
 
@@ -57,11 +57,11 @@ public function setConfig($config) {
 	public function handleRequest($request=false, $server=false) {
 		$action           = $this->parseRequest($request, $server);
 		$action->model    = $this->getModelData($action);
-		
+
 		// If this is a new file, switch to edit mode
 		if ($action->model->updated==0 && $action->action=='display') {
 			$action->action = 'edit';
-		}		
+		}
 
 		$action->response = $this->doAction($action);
 		$output           = $this->renderResponse($action->response);
@@ -72,9 +72,9 @@ public function handleRequest($request=false, $server=false) {
 	##
 	## Methods handling each action
 	##
-	
+
 	public function doAction($action) {
-		
+
 		switch($action->action) {
 			case 'UNKNOWN': # Default to display
 			case 'display':
@@ -93,7 +93,7 @@ public function doAction($action) {
 			case 'admin':
 			case 'browse':
 			default:
-				$response = array( 
+				$response = array(
 					'messages' => array(
 						"Action {$action->action} not implemented."
 					)
@@ -104,7 +104,7 @@ public function doAction($action) {
 
 		return $response;
 	}
-	
+
 	protected function doDisplay($action) {
 		$response = array(
 			'title'    => "Displaying: {$action->page}",
@@ -115,10 +115,10 @@ protected function doDisplay($action) {
 			),
 			'related'  => ''
 		);
-		
+
 		return $response;
 	}
-	
+
 	protected function doEdit($action) {
 		$response = array(
 			'title'    => "Editing: {$action->page}",
@@ -129,10 +129,10 @@ protected function doEdit($action) {
 			),
 			'related'  => ''
 		);
-		
+
 		return $response;
 	}
-	
+
 	protected function doPreview($action) {
 		$response = array(
 			'title'    => "Editing: {$action->page}",
@@ -143,7 +143,7 @@ protected function doPreview($action) {
 			),
 			'related'  => ''
 		);
-		
+
 		return $response;
 	}
 
@@ -159,7 +159,7 @@ protected function doSave($action) {
 		} else {
 			echo "WARN: Editing conflict!\n";
 		}
-		
+
 		return $this->doDisplay($action);
 	}
 
@@ -169,18 +169,18 @@ protected function doSave($action) {
 
 	protected function getModelData($action) {
 		$data = (object) NULL;
-		
+
 		$data->file    = $this->getFilename($action->page);
 		$data->content = $this->getContent($data->file);
 		$data->updated = $this->getLastUpdated($data->file);
-		
+
 		return $data;
 	}
-	
+
 	protected function setModelData($model) {
 		$directory = dirname($model->file);
 		if (!file_exists($directory)) {
-			mkdir($directory, 0777, true);		
+			mkdir($directory, 0777, true);
 		} elseif (!is_dir($directory)) {
 			echo "ERROR: Cannot create {$model->file}\n";
 		}
@@ -191,16 +191,16 @@ protected function setModelData($model) {
 	##
 	## Methods for parsing the incoming request
 	##
-	
+
 	public function parseRequest($request=false, $server=false) {
 		$action = (object) NULL;
 
 		if (!$request) { $request = $_REQUEST; }
 		if (!$server)  { $server  = $_SERVER;  }
-		
+
 		//echo "Request: "; print_r($request);
 		//echo "Server : "; print_r($server);
-		
+
 		$action->method = $this->getMethod($request, $server);
 		$action->page   = $this->getPage($request, $server);
 		$action->action = $this->getAction($request, $server);
@@ -209,50 +209,50 @@ public function parseRequest($request=false, $server=false) {
 		if ($action->method=='POST') {
 			$action->post = $this->getPostDetails($request, $server);
 		}
-		
+
 		// Take a copy of the action base for the wikiLink function
 		$this->baseUrl = $action->base;
 
 		return $action;
 	}
-	
+
 	protected function getFilename($page) {
 		return "{$this->config['docDir']}{$page}.{$this->config['markdownExt']}";
 	}
-	
+
 	protected function getContent($filename) {
 		if (file_exists($filename)) {
 			return file_get_contents($filename);
 		}
 		return $this->config['newPageText'];
 	}
-	
+
 	protected function getLastUpdated($filename) {
 		if (file_exists($filename)) {
 			return filectime($filename);
 		}
 		return 0;
 	}
-	
+
 	protected function getMethod($request, $server) {
 		if (!empty($server['REQUEST_METHOD'])) {
 			return $server['REQUEST_METHOD'];
 		}
 		return 'UNKNOWN';
 	}
-	
+
 	protected function getPage($request, $server) {
 		$page = '';
-		
+
 		// Determine the page name
 		if (!empty($server['PATH_INFO'])) {
 			//echo "Path info detected\n";
 			// If we are using PATH_INFO then that's the page name
 			$page = substr($server['PATH_INFO'], 1);
-			
+
 		} elseif (!empty($request['id'])) {
 			$page = $request['id'];
-			
+
 		} else {
 			// TODO: Keep checking
 			//echo "WARN: Could not find a pagename\n";
@@ -262,10 +262,10 @@ protected function getPage($request, $server) {
 		if ($page=='' || preg_match('/\/$/', $page)) {
 			$page .= $this->config['defaultPage'];
 		}
-		
+
 		return $page;
 	}
-	
+
 	protected function getAction($request, $server) {
 		if ($server['REQUEST_METHOD']=='POST') {
 			if (!empty($request['preview'])) {
@@ -278,12 +278,12 @@ protected function getAction($request, $server) {
 		} elseif (!empty($server['PATH_INFO'])) {
 			return 'display';
 		}
-		
+
 		// TODO: handle version history etc.
-		
+
 		return 'UNKNOWN';
 	}
-	
+
 	protected function getBaseUrl($request, $server) {
 		if (!empty($this->config['baseUrl'])) {
 			return $this->config['baseUrl'];
@@ -294,7 +294,7 @@ protected function getBaseUrl($request, $server) {
     [DOCUMENT_ROOT] => /home/user/sites/default/htdocs
     [SCRIPT_FILENAME] => /home/user/sites/default/htdocs/index-sample.php
     [REQUEST_METHOD] => GET
-    [QUERY_STRING] => 
+    [QUERY_STRING] =>
     [REQUEST_URI] => /index-sample.php
     [SCRIPT_NAME] => /index-sample.php
     [PHP_SELF] => /index-sample.php
@@ -303,7 +303,7 @@ protected function getBaseUrl($request, $server) {
 		$scriptName = $server['SCRIPT_NAME'];
 		$requestUrl = $server['REQUEST_URI'];
 		$phpSelf    = $server['PHP_SELF'];
-		
+
 		if ($requestUrl==$scriptName) {
 			// PATH_INFO based
 		} elseif(strpos($requestUrl, $scriptName)===0) {
@@ -312,10 +312,10 @@ protected function getBaseUrl($request, $server) {
 			// Maybe mod_rewrite based?
 			// Perhaps we need a config entry here
 		}
-	
+
 		return '/index-sample.php/'; // PATH-INFO base
 	}
-	
+
 	protected function getPostDetails($request, $server) {
 		$post = (object) NULL;
 		$post->text    = stripslashes($request['text']);
@@ -324,9 +324,9 @@ protected function getPostDetails($request, $server) {
 	}
 
 	/*********
-	
-		RESPONSE RENDERERS	
-	
+
+		RESPONSE RENDERERS
+
 	*********/
 
 	public function renderResponse($response) {
@@ -334,7 +334,7 @@ public function renderResponse($response) {
 			// TODO: Use a custom template
 		} else {
 			$footer = array();
-			
+
 			if (!empty($response['options'])) {
 				$footer[] = '<ul>';
 				foreach($response['options'] as $label=>$link) {
@@ -357,13 +357,13 @@ public function renderResponse($response) {
 		<div id="content">
 {$response['content']}
 {$response['editForm']}
-		</div>	
+		</div>
 		<div id="related">
-{$response['related']}		
-		</div>	
+{$response['related']}
+		</div>
 		<div id="foot">
 {$response['footer']}
-		</div>	
+		</div>
 	</div>
 </body>
 </html>
@@ -374,14 +374,14 @@ public function renderResponse($response) {
 
 	protected function renderDocument($action) {
 		return Markdown(
-			$action->model->content, 
+			$action->model->content,
 			array($this, 'wikiLink')
 		);
 	}
 
 	protected function renderPreviewDocument($action) {
 		return Markdown(
-			$action->post->text, 
+			$action->post->text,
 			array($this, 'wikiLink')
 		);
 	}
@@ -391,7 +391,7 @@ protected function renderEditForm($action) {
 			$form = array(
 				'raw'     => $action->post->text,
 				'updated' => $action->post->updated
-			);		
+			);
 		} else {
 			$form = array(
 				'raw'     => $action->model->content,
@@ -403,7 +403,7 @@ protected function renderEditForm($action) {
 <form action="{$action->base}{$action->page}" method="post">
 	<fieldset>
 		<legend>Editing</legend>
-		<label for="text">Content:</label><br>	
+		<label for="text">Content:</label><br>
 		<textarea cols="78" rows="20" name="text" id="text">{$form['raw']}</textarea>
 		<br>
 
diff --git a/markdown.php b/markdown.php
index 9c70f38..c90ff62 100644
--- a/markdown.php
+++ b/markdown.php
@@ -3,11 +3,11 @@
 # Markdown  -  A text-to-HTML conversion tool for web writers
 #
 # PHP Markdown
-# Copyright (c) 2004-2008 Michel Fortin  
+# Copyright (c) 2004-2008 Michel Fortin
 # <http://www.michelf.com/projects/php-markdown/>
 #
 # Original Markdown
-# Copyright (c) 2004-2006 John Gruber  
+# Copyright (c) 2004-2006 John Gruber
 # <http://daringfireball.net/projects/markdown/>
 #
 
@@ -69,7 +69,7 @@ class Markdown_Parser {
 	# Needed to insert a maximum bracked depth while converting to PHP.
 	var $nested_brackets_depth = 6;
 	var $nested_brackets_re;
-	
+
 	var $nested_url_parenthesis_depth = 4;
 	var $nested_url_parenthesis_re;
 
@@ -80,11 +80,11 @@ class Markdown_Parser {
 	# Change to ">" for HTML output.
 	var $empty_element_suffix = MARKDOWN_EMPTY_ELEMENT_SUFFIX;
 	var $tab_width = MARKDOWN_TAB_WIDTH;
-	
+
 	# Change to `true` to disallow markup or entities.
 	var $no_markup = false;
 	var $no_entities = false;
-	
+
 	# Predefined urls and titles for reference links and images.
 	var $predef_urls = array();
 	var $predef_titles = array();
@@ -98,17 +98,17 @@ function Markdown_Parser() {
 	#
 		$this->_initDetab();
 		$this->prepareItalicsAndBold();
-	
-		$this->nested_brackets_re = 
+
+		$this->nested_brackets_re =
 			str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth).
 			str_repeat('\])*', $this->nested_brackets_depth);
-	
-		$this->nested_url_parenthesis_re = 
+
+		$this->nested_url_parenthesis_re =
 			str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth).
 			str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth);
-		
+
 		$this->escape_chars_re = '['.preg_quote($this->escape_chars).']';
-		
+
 		# Sort document, block, and span gamut in ascendent priority order.
 		asort($this->document_gamut);
 		asort($this->block_gamut);
@@ -128,27 +128,27 @@ function setLinkCallback($callback) {
 	var $urls = array();
 	var $titles = array();
 	var $html_hashes = array();
-	
+
 	# Status flag to avoid invalid nesting.
 	var $in_anchor = false;
-	
-	
+
+
 	function setup() {
 	#
-	# Called before the transformation process starts to setup parser 
+	# 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();
-		
+
 		$in_anchor = false;
 	}
-	
+
 	function teardown() {
 	#
-	# Called after the transformation process to clear any variable 
+	# Called after the transformation process to clear any variable
 	# which may be taking up memory unnecessarly.
 	#
 		$this->urls = array();
@@ -163,7 +163,7 @@ function transform($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);
 
@@ -190,16 +190,16 @@ function transform($text) {
 		foreach ($this->document_gamut as $method => $priority) {
 			$text = $this->$method($text);
 		}
-		
+
 		$this->teardown();
 
 		return $text . "\n";
 	}
-	
+
 	var $document_gamut = array(
 		# Strip link definitions, store in hashes.
 		"stripLinkDefinitions" => 20,
-		
+
 		"runBasicBlockGamut"   => 30,
 		);
 
@@ -255,8 +255,8 @@ function hashHTMLBlocks($text) {
 		# 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 
+		#    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;
 		#
@@ -278,7 +278,7 @@ function hashHTMLBlocks($text) {
 			  |
 				\'[^\']*\'	# text inside single quotes (tolerate ">")
 			  )*
-			)?	
+			)?
 			';
 		$content =
 			str_repeat('
@@ -295,7 +295,7 @@ function hashHTMLBlocks($text) {
 			str_repeat('
 					  </\2\s*>	# closing nested tag
 					)
-				  |				
+				  |
 					<(?!/\2\s*>	# other tags with a different name
 				  )
 				)*',
@@ -321,9 +321,9 @@ function hashHTMLBlocks($text) {
 			)
 			(						# save in $1
 
-			  # Match from `\n<tag>` to `</tag>\n`, handling nested tags 
+			  # Match from `\n<tag>` to `</tag>\n`, handling nested tags
 			  # in between.
-					
+
 						[ ]{0,'.$less_than_tab.'}
 						<('.$block_tags_b_re.')# start tag = $2
 						'.$attr.'>			# attributes followed by > and \n
@@ -341,28 +341,28 @@ function hashHTMLBlocks($text) {
 						</\3>				# the matching end tag
 						[ ]*				# trailing spaces/tabs
 						(?=\n+|\Z)	# followed by a newline or end of document
-					
-			| # Special case just for <hr />. It was easier to make a special 
+
+			| # Special case just for <hr />. It was easier to make a special
 			  # case than to make the other regex more complicated.
-			
+
 						[ ]{0,'.$less_than_tab.'}
 						<(hr)				# start tag = $2
 						'.$attr.'			# attributes
 						/?>					# the matching end tag
 						[ ]*
 						(?=\n{2,}|\Z)		# followed by a blank line or end of document
-			
+
 			| # Special case for standalone HTML comments:
-			
+
 					[ ]{0,'.$less_than_tab.'}
 					(?s:
 						<!-- .*? -->
 					)
 					[ ]*
 					(?=\n{2,}|\Z)		# followed by a blank line or end of document
-			
+
 			| # PHP and ASP-style processor instructions (<? and <%)
-			
+
 					[ ]{0,'.$less_than_tab.'}
 					(?s:
 						<([?%])			# $2
@@ -371,7 +371,7 @@ function hashHTMLBlocks($text) {
 					)
 					[ ]*
 					(?=\n{2,}|\Z)		# followed by a blank line or end of document
-					
+
 			)
 			)}Sxmi',
 			array(&$this, '_hashHTMLBlocks_callback'),
@@ -384,11 +384,11 @@ function _hashHTMLBlocks_callback($matches) {
 		$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 
+	# 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.
 	#
@@ -400,7 +400,7 @@ function hashPart($text, $boundary = 'X') {
 		# 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;
@@ -424,7 +424,7 @@ function hashBlock($text) {
 	#
 		"doHeaders"         => 10,
 		"doHorizontalRules" => 20,
-		
+
 		"doLists"           => 40,
 		"doCodeBlocks"      => 50,
 		"doBlockQuotes"     => 60,
@@ -434,33 +434,33 @@ 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 
+		# We need to escape raw HTML in Markdown source before doing anything
+		# else. This need to be done for each block, and not only at the
 		# begining in the Markdown function since hashed blocks can be part of
-		# list items and could have been indented. Indented blocks would have 
+		# list items and could have been indented. Indented blocks would have
 		# been seen as a code block in a previous pass of hashHTMLBlocks.
 		$text = $this->hashHTMLBlocks($text);
-		
+
 		return $this->runBasicBlockGamut($text);
 	}
-	
+
 	function runBasicBlockGamut($text) {
 	#
-	# Run block gamut tranformations, without hashing HTML blocks. This is 
+	# 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(
@@ -474,7 +474,7 @@ function doHorizontalRules($text) {
 				[ ]*		# Tailing spaces
 				$			# End of line.
 			}mx',
-			"\n".$this->hashBlock("<hr$this->empty_element_suffix")."\n", 
+			"\n".$this->hashBlock("<hr$this->empty_element_suffix")."\n",
 			$text);
 	}
 
@@ -492,7 +492,7 @@ function doHorizontalRules($text) {
 		# 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>).
@@ -513,11 +513,11 @@ function runSpanGamut($text) {
 
 		return $text;
 	}
-	
-	
+
+
 	function doHardBreaks($text) {
 		# Do hard breaks:
-		return preg_replace_callback('/ {2,}\n/', 
+		return preg_replace_callback('/ {2,}\n/',
 			array(&$this, '_doHardBreaks_callback'), $text);
 	}
 	function _doHardBreaks_callback($matches) {
@@ -531,7 +531,7 @@ function doAnchors($text) {
 	#
 		if ($this->in_anchor) return $text;
 		$this->in_anchor = true;
-		
+
 		#
 		# First, handle reference-style links: [link text] [id]
 		#
@@ -604,7 +604,7 @@ function _doAnchors_reference_callback($matches) {
 			# 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);
@@ -612,10 +612,10 @@ function _doAnchors_reference_callback($matches) {
 		if (isset($this->urls[$link_id])) {
 			$url = $this->urls[$link_id];
 			$url = $this->encodeAttribute($url);
-			
+
 			$link_text  = $this->runSpanGamut($link_text);
 			$title = '';
-			
+
 			if ( isset( $this->titles[$link_id] ) ) {
 				$title = $this->titles[$link_id];
 				$title = $this->encodeAttribute($title);
@@ -624,7 +624,7 @@ function _doAnchors_reference_callback($matches) {
 
 			// TODO: Replace with a callback facility
 			$isNewPage  = false;
-			
+
 			if ($isNewPage) {
 				$result = "[{$link_text}]<a href=\"{$url}\"{$title}>?</a>";
 			} else {
@@ -650,7 +650,7 @@ function _doAnchors_inline_callback($matches) {
 			$title = $this->encodeAttribute($title);
 			$title = " title=\"{$title}\"";
 		}
-		
+
 		// TODO: Callback to determine whether URL is new page
 		$isNewPage = false;
 		if ($this->linkCallback) {
@@ -690,7 +690,7 @@ function doImages($text) {
 			  \]
 
 			)
-			}xs', 
+			}xs',
 			array(&$this, '_doImages_reference_callback'), $text);
 
 		#
@@ -775,7 +775,7 @@ function doHeaders($text) {
 		# Setext-style headers:
 		#	  Header 1
 		#	  ========
-		#  
+		#
 		#	  Header 2
 		#	  --------
 		#
@@ -805,7 +805,7 @@ 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";
@@ -852,10 +852,10 @@ function doLists($text) {
 				  )
 				)
 			'; // mx
-			
+
 			# We use a different prefix before nested lists than top-level lists.
 			# See extended comment in _ProcessListItems().
-		
+
 			if ($this->list_level) {
 				$text = preg_replace_callback('{
 						^
@@ -879,15 +879,15 @@ function _doLists_callback($matches) {
 		$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[3]) ? "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";
 	}
@@ -919,7 +919,7 @@ function processListItems($list_str, $marker_any_re) {
 		# 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:
@@ -947,7 +947,7 @@ function _processListItems_callback($matches) {
 		$marker_space = $matches[3];
 		$tailing_blank_line =& $matches[5];
 
-		if ($leading_line || $tailing_blank_line || 
+		if ($leading_line || $tailing_blank_line ||
 			preg_match('/\n{2,}/', $item))
 		{
 			# Replace marker with the appropriate whitespace indentation
@@ -1022,7 +1022,7 @@ function makeCodeSpan($code) {
 		'___' => '(?<=\S)(?<!_)___(?!_)',
 		);
 	var $em_strong_prepared_relist;
-	
+
 	function prepareItalicsAndBold() {
 	#
 	# Prepare regular expressions for seraching emphasis tokens in any
@@ -1037,37 +1037,37 @@ function prepareItalicsAndBold() {
 				}
 				$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 seach for the next emphasis token. 
+			# Each loop iteration seach 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.
@@ -1077,7 +1077,7 @@ function doItalicsAndBold($text) {
 				}
 				break;
 			}
-			
+
 			$token_len = strlen($token);
 			if ($tree_char_em) {
 				# Reached closing marker while inside a three-char emphasis.
@@ -1116,7 +1116,7 @@ function doItalicsAndBold($text) {
 						$$tag = ''; # $$tag stands for $em or $strong
 					}
 				} else {
-					# Reached opening three-char emphasis marker. Push on token 
+					# Reached opening three-char emphasis marker. Push on token
 					# stack; will be handled by the special condition above.
 					$em = $token{0};
 					$strong = "$em$em";
@@ -1190,9 +1190,9 @@ function _doBlockQuotes_callback($matches) {
 		$bq = $this->runBlockGamut($bq);		# recurse
 
 		$bq = preg_replace('/^/m', "  ", $bq);
-		# These leading spaces cause problem with <pre> content, 
+		# These leading spaces cause problem with <pre> content,
 		# so we need to fix that:
-		$bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx', 
+		$bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx',
 			array(&$this, '_DoBlockQuotes_callback2'), $bq);
 
 		return "\n". $this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
@@ -1255,7 +1255,7 @@ function formParagraphs($text) {
 //					# We can't call Markdown(), because that resets the hash;
 //					# that initialization code should be pulled into its own sub, though.
 //					$div_content = $this->hashHTMLBlocks($div_content);
-//					
+//
 //					# Run document gamut methods on the content.
 //					foreach ($this->document_gamut as $method => $priority) {
 //						$div_content = $this->$method($div_content);
@@ -1283,11 +1283,11 @@ function encodeAttribute($text) {
 		$text = str_replace('"', '&quot;', $text);
 		return $text;
 	}
-	
-	
+
+
 	function encodeAmpsAndAngles($text) {
 	#
-	# Smart processing for ampersands and angle brackets that need to 
+	# 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.
 	#
@@ -1296,7 +1296,7 @@ function encodeAmpsAndAngles($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+);)/', 
+			$text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/',
 								'&amp;', $text);;
 		}
 		# Encode remaining <'s
@@ -1307,7 +1307,7 @@ function encodeAmpsAndAngles($text) {
 
 
 	function doAutoLinks($text) {
-		$text = preg_replace_callback('{<((https?|ftp|dict):[^\'">\s]+)>}i', 
+		$text = preg_replace_callback('{<((https?|ftp|dict):[^\'">\s]+)>}i',
 			array(&$this, '_doAutoLinks_url_callback'), $text);
 
 		# Email addresses: <address@domain.foo>
@@ -1356,7 +1356,7 @@ function encodeEmailAddress($addr) {
 		$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.
@@ -1369,7 +1369,7 @@ function encodeEmailAddress($addr) {
 				else              $chars[$key] = '&#'.$ord.';';
 			}
 		}
-		
+
 		$addr = implode('', $chars);
 		$text = implode('', array_slice($chars, 7)); # text without `mailto:`
 		$addr = "<a href=\"$addr\">$text</a>";
@@ -1384,7 +1384,7 @@ function parseSpan($str) {
 	# escaped characters and handling code spans.
 	#
 		$output = '';
-		
+
 		$span_re = '{
 				(
 					\\\\'.$this->escape_chars_re.'
@@ -1409,17 +1409,17 @@ function parseSpan($str) {
 
 		while (1) {
 			#
-			# Each loop iteration seach for either the next tag, the next 
-			# openning code span marker, or the next escaped character. 
+			# Each loop iteration seach for either the next tag, the next
+			# openning code span marker, or the next escaped character.
 			# Each token is then passed to handleSpanToken.
 			#
 			$parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
-			
+
 			# 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]);
@@ -1429,14 +1429,14 @@ function parseSpan($str) {
 				break;
 			}
 		}
-		
+
 		return $output;
 	}
-	
-	
+
+
 	function handleSpanToken($token, &$str) {
 	#
-	# Handle $token provided by parseSpan by determining its nature and 
+	# Handle $token provided by parseSpan by determining its nature and
 	# returning the corresponding value that should replace it.
 	#
 		switch ($token{0}) {
@@ -1444,7 +1444,7 @@ function handleSpanToken($token, &$str) {
 				return $this->hashPart("&#". ord($token{1}). ";");
 			case "`":
 				# Search for end marker in remaining text.
-				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm', 
+				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm',
 					$str, $matches))
 				{
 					$str = $matches[2];
@@ -1466,18 +1466,18 @@ function outdent($text) {
 	}
 
 
-	# String length function for detab. `_initDetab` will create a function to 
+	# 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 
+		# 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);
 
@@ -1486,7 +1486,7 @@ function detab($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.
@@ -1494,7 +1494,7 @@ function _detab_callback($matches) {
 		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 - 
+			$amount = $this->tab_width -
 				$strlen($line, 'UTF-8') % $this->tab_width;
 			$line .= str_repeat(" ", $amount) . $block;
 		}
@@ -1503,13 +1503,13 @@ function _detab_callback($matches) {
 	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 
+	# (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]*/", 
+			"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/",
 			$text, $m);');
 	}
 
@@ -1518,7 +1518,7 @@ function unhash($text) {
 	#
 	# Swap back in all the tags hashed by _HashHTMLBlocks.
 	#
-		return preg_replace_callback('/(.)\x1A[0-9]+\1/', 
+		return preg_replace_callback('/(.)\x1A[0-9]+\1/',
 			array(&$this, '_unhash_callback'), $text);
 	}
 	function _unhash_callback($matches) {
@@ -1565,7 +1565,7 @@ function _unhash_callback($matches) {
 
 
 Version History
---------------- 
+---------------
 
 See the readme file for detailed release notes for this version.
 
@@ -1574,13 +1574,13 @@ function _unhash_callback($matches) {
 ---------------------
 
 PHP Markdown
-Copyright (c) 2004-2008 Michel Fortin  
-<http://www.michelf.com/>  
+Copyright (c) 2004-2008 Michel Fortin
+<http://www.michelf.com/>
 All rights reserved.
 
 Based on Markdown
-Copyright (c) 2003-2006 John Gruber   
-<http://daringfireball.net/>   
+Copyright (c) 2003-2006 John Gruber
+<http://daringfireball.net/>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/pages/markdown.markdown b/pages/markdown.markdown
index 0ddb33a..6048dc9 100755
--- a/pages/markdown.markdown
+++ b/pages/markdown.markdown
@@ -88,9 +88,9 @@ Movable Type 3.0).
 
 2.  Once installed, Markdown will appear as an option in Movable Type's
 	Text Formatting pop-up menu. This is selectable on a per-post basis:
-	
+
 	![Screenshot of Movable Type 'Text Formatting' Menu][tfmenu]
-	
+
 	Markdown translates your posts to HTML when you publish; the posts
 	themselves are stored in your MT database in Markdown format.
 
@@ -229,5 +229,5 @@ also deserve thanks for their feedback.
   [Jason Perkins]:		http://pressedpants.com/
   [Michel Fortin]:		http://www.michelf.com/projects/php-markdown/
   [html2text]:          http://www.aaronsw.com/2002/html2text/
- 
+
   [tfmenu]: /graphics/markdown/mt_textformat_menu.png
diff --git a/tests/MarkdownTest.php b/tests/MarkdownTest.php
index 52660d2..d262924 100644
--- a/tests/MarkdownTest.php
+++ b/tests/MarkdownTest.php
@@ -3,7 +3,7 @@
 class MarkdownTest extends PHPUnit_Framework_TestCase {
 
 
-	
+
 
 }
 
diff --git a/tests/MarkdownWikiTest.php b/tests/MarkdownWikiTest.php
index ad62770..222aaac 100644
--- a/tests/MarkdownWikiTest.php
+++ b/tests/MarkdownWikiTest.php
@@ -9,12 +9,12 @@ class MarkdownWikiTest extends PHPUnit_Framework_TestCase {
 		'defaultPage' => 'TestDefaultPage',
 		'newPageText' => 'This is a new test page'
 	);
-	
+
 	public function setUp() {
 		$this->wiki = new MarkdownWiki($this->config);
 	}
-	
-	
+
+
 
 	public function testRequestReturnsAction() {
 		$request = array();
@@ -22,7 +22,7 @@ public function testRequestReturnsAction() {
 			'REQUEST_METHOD' => 'GET',
 			'PATH_INFO'      => '/TestPageName'
 		);
-		
+
 		$action = $this->wiki->parseRequest($request, $server);
 		$this->assertNotNull($action);
 		$this->assertType('stdClass', $action);
@@ -40,14 +40,14 @@ public function testPathInfoGetRequestAction() {
 		$this->assertEquals('GET', $action->method);
 
 	}
-	
+
 	public function testDefaultPathInfoPageRequestAction() {
 		$request = array();
 		$server  = array(
 			'REQUEST_METHOD' => 'GET',
 			'PATH_INFO'      => '/'
 		);
-		
+
 		$action = $this->wiki->parseRequest($request, $server);
 		$this->assertEquals('TestDefaultPage', $action->page);
 		$this->assertEquals('GET', $action->method);
@@ -62,14 +62,14 @@ public function testDefaultPathInfoDirPageRequestAction() {
 			'REQUEST_METHOD' => 'GET',
 			'PATH_INFO'      => '/Directory/'
 		);
-		
+
 		$action = $this->wiki->parseRequest($request, $server);
 		$this->assertEquals('Directory/TestDefaultPage', $action->page);
 		$this->assertEquals('GET', $action->method);
 		$this->assertEquals('display', $action->action);
 
 	}
-	
+
 	public function testSavePostRequestAction() {
 		$request = array(
 			'save'    => 'Save this page',
@@ -107,18 +107,18 @@ public function testPreviewPostRequestAction() {
 	public function testModelReturnsDataObject() {
 		$action = (object) NULL;
 		$action->page = 'index';
-		
+
 		$model = $this->wiki->getModelData($action);
 		$this->assertNotNull($model);
 		$this->assertEquals($this->config['docDir'].'index.text', $model->file);
 		$this->assertEquals($this->config['newPageText'], $model->content);
 		//print_r($model);
 	}
-	
+
 	public function testDoUnknownAction() {
 		$action         = (object) NULL;
 		$action->page   = 'index';
-		$action->action = 'UNKNOWN';		
+		$action->action = 'UNKNOWN';
 
 		$response = $this->wiki->doAction($action);
 		$this->assertNotNull($response);