Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
@chobie
chobie committed Apr 20, 2012
2 parents 73efb04 + 84fde86 commit 9eed5e5
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 14 deletions.
6 changes: 4 additions & 2 deletions package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion php_sundown.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions tests/002-basic-enabled-extensions.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/002-basic-enabled-render-flags.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions tests/003-advanced-enabled-extensions.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/003-advanced-enabled-render-flags.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions tests/003-advanced-get-extensions.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/003-advanced-set-extensions.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down

0 comments on commit 9eed5e5

Please sign in to comment.