Merge branch 'master' into extra

This commit is contained in:
Michel Fortin 2008-05-05 07:36:48 -04:00
commit 6533be340c
2 changed files with 14 additions and 2 deletions

View file

@ -244,6 +244,18 @@ Current:
* A code blocks starting on the second line of a document wasn't seen
as a code block. This has been fixed.
* Added programatically-settable parser properties `predef_urls` and
`predef_titles` for predefined URLs and link titles. To use this,
your PHP code must call the parser this way:
$parser = new Markdwon_Parser;
$parser->predef_urls['my_url_ref'] = 'http://example.com';
$html = $parser->transform($text);
* Added `setup` and `teardown` methods which can be used by subclassers
as hook points to arrange the state of some parser variables before and
after parsing.
Extra 1.1.7 (26 Sep 2007):

View file

@ -262,8 +262,8 @@ class Markdown_Parser {
# states.
#
# Clear global hashes.
$this->urls = $predef_urls;
$this->titles = $predef_titles;
$this->urls = $this->predef_urls;
$this->titles = $this->predef_titles;
$this->html_hashes = array();
$in_anchor = false;