From d7895ee81092b796a6d7a19ab1d3571f91fb2e25 Mon Sep 17 00:00:00 2001
From: Shuhei Tanuma <shuhei.tanuma@gmail.com>
Date: Fri, 20 Apr 2012 12:12:44 +0900
Subject: [PATCH 1/2] use no_intra_emphasis instead of no_intraemphasis

---
 php_sundown.h                                | 2 +-
 tests/002-basic-enabled-extensions.phpt      | 4 ++--
 tests/002-basic-enabled-render-flags.phpt    | 2 +-
 tests/003-advanced-enabled-extensions.phpt   | 4 ++--
 tests/003-advanced-enabled-render-flags.phpt | 2 +-
 tests/003-advanced-get-extensions.phpt       | 6 +++---
 tests/003-advanced-set-extensions.phpt       | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/php_sundown.h b/php_sundown.h
index 2ec6b5d..f0362d4 100644
--- a/php_sundown.h
+++ b/php_sundown.h
@@ -258,7 +258,7 @@ static void php_sundown__get_extensions(HashTable *table, unsigned int *enabled_
 	/**
 	 * Markdown extensions -- all disabled by default 
 	 */
-	if (SUNDOWN_HAS_EXTENSION("no_intraemphasis")) {
+	if (SUNDOWN_HAS_EXTENSION("no_intra_emphasis")) {
 		extensions |= MKDEXT_NO_INTRA_EMPHASIS;
 	}
 
diff --git a/tests/002-basic-enabled-extensions.phpt b/tests/002-basic-enabled-extensions.phpt
index f84040c..63d9dcb 100755
--- a/tests/002-basic-enabled-extensions.phpt
+++ b/tests/002-basic-enabled-extensions.phpt
@@ -5,7 +5,7 @@ Check for determine enabled extensions.
 --FILE--
 <?php
 $markdown = new Sundown("hello world",array());
-$extensions = array("no_intraemphasis","tables","fenced_code_blocks","autolink","strikethrough","lax_html_blocks","space_after_header","superscript");
+$extensions = array("no_intra_emphasis","tables","fenced_code_blocks","autolink","strikethrough","lax_html_blocks","space_after_header","superscript");
 
 $enabled = array();
 foreach ($extensions as $ext) {
@@ -50,7 +50,7 @@ bool(true)
 bool(true)
 bool(true)
 bool(true)
-only no_intraemphasis:
+only no_intra_emphasis:
 bool(true)
 bool(false)
 bool(false)
diff --git a/tests/002-basic-enabled-render-flags.phpt b/tests/002-basic-enabled-render-flags.phpt
index 857e53a..2a486fa 100755
--- a/tests/002-basic-enabled-render-flags.phpt
+++ b/tests/002-basic-enabled-render-flags.phpt
@@ -19,7 +19,7 @@ foreach ($flags as $flag) {
     }
 }
 
-$extensions = array("no_intraemphasis","tables","fenced_code_blocks","autolink","strikethrough","lax_html_blocks","space_after_header","superscript");
+$extensions = array("no_intra_emphasis","tables","fenced_code_blocks","autolink","strikethrough","lax_html_blocks","space_after_header","superscript");
 $exts = array();
 foreach ($extensions as $ext) {
     $exts[$ext] = true;
diff --git a/tests/003-advanced-enabled-extensions.phpt b/tests/003-advanced-enabled-extensions.phpt
index 4e58626..2ae74ba 100755
--- a/tests/003-advanced-enabled-extensions.phpt
+++ b/tests/003-advanced-enabled-extensions.phpt
@@ -7,7 +7,7 @@ Check for determine enabled extensions.
 $render = new Sundown\Render\HTML();
 
 $markdown = new Sundown\Markdown($render, array());
-$extensions = array("no_intraemphasis","tables","fenced_code_blocks","autolink","strikethrough","lax_html_blocks","space_after_header","superscript");
+$extensions = array("no_intra_emphasis","tables","fenced_code_blocks","autolink","strikethrough","lax_html_blocks","space_after_header","superscript");
 
 $enabled = array();
 foreach ($extensions as $ext) {
@@ -52,7 +52,7 @@ bool(true)
 bool(true)
 bool(true)
 bool(true)
-only no_intraemphasis:
+only no_intra_emphasis:
 bool(true)
 bool(false)
 bool(false)
diff --git a/tests/003-advanced-enabled-render-flags.phpt b/tests/003-advanced-enabled-render-flags.phpt
index b61d851..0b6ddf2 100755
--- a/tests/003-advanced-enabled-render-flags.phpt
+++ b/tests/003-advanced-enabled-render-flags.phpt
@@ -21,7 +21,7 @@ foreach ($flags as $flag) {
     }
 }
 
-$extensions = array("no_intraemphasis","tables","fenced_code_blocks","autolink","strikethrough","lax_html_blocks","space_after_header","superscript");
+$extensions = array("no_intra_emphasis","tables","fenced_code_blocks","autolink","strikethrough","lax_html_blocks","space_after_header","superscript");
 $exts = array();
 foreach ($extensions as $ext) {
     $exts[$ext] = true;
diff --git a/tests/003-advanced-get-extensions.phpt b/tests/003-advanced-get-extensions.phpt
index 178cc83..a821601 100755
--- a/tests/003-advanced-get-extensions.phpt
+++ b/tests/003-advanced-get-extensions.phpt
@@ -6,7 +6,7 @@ Check for determine enabled extensions.
 <?php
 $render = new Sundown\Render\HTML();
 
-$extensions = array("no_intraemphasis","tables","fenced_code_blocks","autolink","strikethrough","lax_html_blocks","space_after_header","superscript");
+$extensions = array("no_intra_emphasis","tables","fenced_code_blocks","autolink","strikethrough","lax_html_blocks","space_after_header","superscript");
 $enabled = array();
 foreach ($extensions as $ext) {
   $enabled[$ext] = true;
@@ -24,7 +24,7 @@ foreach ($markdown->getExtensions() as $ext_name => $ext_value) {
 }
 
 --EXPECT--
-no_intraemphasis => 1
+no_intra_emphasis => 1
 tables => 1
 fenced_code_blocks => 1
 autolink => 1
@@ -33,7 +33,7 @@ lax_html_blocks => 1
 space_after_header => 1
 superscript => 1
 # reference count check
-no_intraemphasis => 1
+no_intra_emphasis => 1
 tables => 1
 fenced_code_blocks => 1
 autolink => 1
diff --git a/tests/003-advanced-set-extensions.phpt b/tests/003-advanced-set-extensions.phpt
index 4e31dd6..e768429 100755
--- a/tests/003-advanced-set-extensions.phpt
+++ b/tests/003-advanced-set-extensions.phpt
@@ -6,7 +6,7 @@ Check for determine enabled extensions.
 <?php
 $render = new Sundown\Render\HTML();
 
-$extensions = array("no_intraemphasis","tables","fenced_code_blocks","autolink","strikethrough","lax_html_blocks","space_after_header","superscript");
+$extensions = array("no_intra_emphasis","tables","fenced_code_blocks","autolink","strikethrough","lax_html_blocks","space_after_header","superscript");
 $enabled = array();
 foreach ($extensions as $ext) {
   $enabled[$ext] = true;
@@ -25,7 +25,7 @@ foreach ($markdown->getExtensions() as $ext_name => $ext_value) {
 --EXPECT--
 ext count: 0
 # do set extensions
-no_intraemphasis => 1
+no_intra_emphasis => 1
 tables => 1
 fenced_code_blocks => 1
 autolink => 1

From 84fde865046136b509c046bd65a49ed8a4b2189f Mon Sep 17 00:00:00 2001
From: Shuhei Tanuma <shuhei.tanuma@gmail.com>
Date: Fri, 20 Apr 2012 12:14:20 +0900
Subject: [PATCH 2/2] fix package xml

---
 package.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package.xml b/package.xml
index c1e7b9a..83a66e6 100644
--- a/package.xml
+++ b/package.xml
@@ -105,8 +105,10 @@ bumped up 0.3.1
     <release>beta</release>
     <api>beta</api>
    </stability>
-   <version>0.3.0</version>
-   <version>0.3.0</version>
+   <version>
+    <release>0.3.1</release>
+    <api>0.3.0</api>
+   </version>
    <date>2012-03-04</date>
    <notes>
 bumped up 0.3.0