From 8dcbb993ec530ee09f0c2eb0d62517e8e959ca63 Mon Sep 17 00:00:00 2001
From: Michel Fortin <michel.fortin@michelf.com>
Date: Sat, 10 Oct 2009 08:50:41 -0400
Subject: [PATCH] Fixed some emphasis corner-cases.

---
 PHP Markdown Readme.text |  2 ++
 markdown.php             | 18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/PHP Markdown Readme.text b/PHP Markdown Readme.text
index 33f92237..db61f2be 100644
--- a/PHP Markdown Readme.text	
+++ b/PHP Markdown Readme.text	
@@ -245,6 +245,8 @@ Version History
 *	Fixed a bug where tags where the name contains an underscore aren't parsed 
 	correctly.
 
+*	Fixed some corner-cases mixing underscore-ephasis and asterisk-emphasis.
+
 
 1.0.1m (21 Jun 2008):
 
diff --git a/markdown.php b/markdown.php
index d710a7b6..dd1b9e56 100644
--- a/markdown.php
+++ b/markdown.php
@@ -1117,19 +1117,19 @@ function makeCodeSpan($code) {
 
 
 	var $em_relist = array(
-		''  => '(?:(?<!\*)\*(?!\*)|(?<!_)_(?!_))(?=\S)(?![.,:;]\s)',
-		'*' => '(?<=\S)(?<!\*)\*(?!\*)',
-		'_' => '(?<=\S)(?<!_)_(?!_)',
+		''  => '(?:(?<!\*)\*(?!\*)|(?<!_)_(?!_))(?=\S|$)(?![.,:;]\s)',
+		'*' => '(?<=\S|^)(?<!\*)\*(?!\*)',
+		'_' => '(?<=\S|^)(?<!_)_(?!_)',
 		);
 	var $strong_relist = array(
-		''   => '(?:(?<!\*)\*\*(?!\*)|(?<!_)__(?!_))(?=\S)(?![.,:;]\s)',
-		'**' => '(?<=\S)(?<!\*)\*\*(?!\*)',
-		'__' => '(?<=\S)(?<!_)__(?!_)',
+		''   => '(?:(?<!\*)\*\*(?!\*)|(?<!_)__(?!_))(?=\S|$)(?![.,:;]\s)',
+		'**' => '(?<=\S|^)(?<!\*)\*\*(?!\*)',
+		'__' => '(?<=\S|^)(?<!_)__(?!_)',
 		);
 	var $em_strong_relist = array(
-		''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<!_)___(?!_))(?=\S)(?![.,:;]\s)',
-		'***' => '(?<=\S)(?<!\*)\*\*\*(?!\*)',
-		'___' => '(?<=\S)(?<!_)___(?!_)',
+		''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<!_)___(?!_))(?=\S|$)(?![.,:;]\s)',
+		'***' => '(?<=\S|^)(?<!\*)\*\*\*(?!\*)',
+		'___' => '(?<=\S|^)(?<!_)___(?!_)',
 		);
 	var $em_strong_prepared_relist;