Permalink
Browse files

Merge branch 'master' into extra

  • Loading branch information...
2 parents 6415572 + 452117f commit 6533be340c41b1d0992240268a6351d23e30524e @michelf committed May 5, 2008
Showing with 14 additions and 2 deletions.
  1. +12 −0 PHP Markdown Extra Readme.text
  2. +2 −2 markdown.php
@@ -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
@@ -262,8 +262,8 @@ function setup() {
# 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;

0 comments on commit 6533be3

Please sign in to comment.