Skip to content

Commit

Permalink
Merge branch 'release/0.3.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
chobie committed Apr 22, 2012
2 parents 0ded914 + fa1a6cd commit aae4fbf
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 8 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ Overview

php-sudown has two styles: basic and advance.

*basic*: less exntensiblity, fast rendering.
*advance*: custmize your own markdown render, little bit slower than basic.
*basic*: simple, fast rendering.
*advance*: customize your own markdown render, little bit slower than basic.


### \Sundown::__construct(string $str [, array $config])
Expand Down Expand Up @@ -239,7 +239,6 @@ documented at [Render.md](https://github.com/chobie/php-sundown/blob/development
documented at [ExtensionsAndRenderFlags.md](https://github.com/chobie/php-sundown/blob/development/docs/ExtensionsAndRenderFlags.md)



Contributors
------------
* Dominic Scheirlinck
Expand Down
26 changes: 22 additions & 4 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ PECL Sundown provides straight forward object oriented Markdown API and customiz
<email>[email protected]</email>
<active>yes</active>
</lead>
<date>2012-04-20</date>
<date>2012-04-22</date>
<version>
<release>0.3.2</release>
<release>0.3.3</release>
<api>0.3.0</api>
</version>
<stability>
Expand All @@ -26,10 +26,10 @@ PECL Sundown provides straight forward object oriented Markdown API and customiz
</stability>
<license uri="http://www.php.net/license">PHP</license>
<notes>
bumped up 0.3.2
bumped up 0.3.3

[summary]
* use no_intra_emphasis instead of no_intraemphasis
* fix #16 missing space_after_headers extension
</notes>
<contents>
<dir name="/">
Expand Down Expand Up @@ -98,6 +98,24 @@ bumped up 0.3.2
<providesextension>sundown</providesextension>
<extsrcrelease/>
<changelog>
<release>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<version>
<release>0.3.2</release>
<api>0.3.0</api>
</version>
<date>2012-04-20</date>
<notes>
bumped up 0.3.2

[summary]
* use no_intra_emphasis instead of no_intraemphasis
</notes>
</release>

<release>
<stability>
<release>beta</release>
Expand Down
2 changes: 1 addition & 1 deletion php_sundown.h
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ static void php_sundown__get_extensions(HashTable *table, unsigned int *enabled_
extensions |= MKDEXT_LAX_HTML_BLOCKS;
}

if (SUNDOWN_HAS_EXTENSION("space_after_header")) {
if (SUNDOWN_HAS_EXTENSION("space_after_headers")) {
extensions |= MKDEXT_SPACE_HEADERS;
}

Expand Down
23 changes: 23 additions & 0 deletions tests/004-render-extensions-space_after_headers.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--TEST--
check for space_after_headers behavior
--SKIPIF--
<?php if (!extension_loaded("sundown")) print "skip"; ?>
--FILE--
<?php
$data = <<<EOF
#Level1
EOF;

echo "space_after_headers disabled:\n";
$a = new Sundown\Markdown(new Sundown\Render\HTML(), array("space_after_headers"=>false));
echo $a->render($data);
echo PHP_EOL;
echo "space_after_headers enabled:\n";
$a = new Sundown\Markdown(new Sundown\Render\HTML(), array("space_after_headers"=>true));
echo $a->render($data);
--EXPECT--
space_after_headers disabled:
<h1>Level1</h1>

space_after_headers enabled:
<p>#Level1</p>

0 comments on commit aae4fbf

Please sign in to comment.