From 8e89d53084a6acc2de2e36a1ea47d0551aa1d09f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BA=A6=E5=BD=93=E8=8B=97=E5=84=BF?= <zuojiazi@vip.qq.com>
Date: Mon, 8 Apr 2013 14:04:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9Fparse=20=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E4=B8=BA=20transform=20=E6=96=B9=E6=B3=95=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=86parse=E6=96=B9=E6=B3=95=E4=BE=9BThinkPHP?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Think/Parser/Driver/Markdown.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/Think/Parser/Driver/Markdown.php b/Think/Parser/Driver/Markdown.php
index b0bfb92e..d743b78e 100644
--- a/Think/Parser/Driver/Markdown.php
+++ b/Think/Parser/Driver/Markdown.php
@@ -11,6 +11,10 @@
 # <http://daringfireball.net/projects/markdown/>
 #
 
+/**
+ * 应用到ThinkPHP中，因而修改为ThinkPHP规范的命名空间
+ */
+# namespace Michelf;
 namespace Think\Parser\Driver;
 
 #
@@ -32,7 +36,7 @@ class Markdown {
 
 	### Version ###
 
-	const MARKDOWNLIB_VERSION  =  "1.3-beta4";
+	public const MARKDOWNLIB_VERSION  =  "1.3-beta4";
 
 	### Simple Function Interface ###
 
@@ -53,7 +57,7 @@ class Markdown {
 			$parser = new $parser_class;
 
 		# Transform text using parser.
-		return $parser->parse($text);
+		return $parser->transform($text);
 	}
 
 	### Configuration Variables ###
@@ -142,8 +146,17 @@ class Markdown {
 		$this->html_hashes = array();
 	}
 
+	/**
+	 * 提供给ThinkPHP外部调用的方法，麦当苗儿为ThinkPHP添加
+	 * @author <zuojiazi.cn@gmail.com>
+	 * @param  string $content 需要解析的Markdown字符串
+	 * @return string          解析后的HTML字符串
+	 */
+	public function parse($content){
+		return $this->transform($content);
+	}
 
-	public function parse($text) {
+	protected function transform($text) {
 	#
 	# Main function. Performs some preprocessing on the input text
 	# and pass it through the document gamut.