Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into extra; updated version numbers.

Conflicts:

	PHP Markdown Extra Readme.text
	markdown.php
  • Loading branch information...
commit 445f334ac94b213aaa1225c8fb0559df35d399e6 2 parents fc4d819 + af5af62
@michelf authored
Showing with 22 additions and 14 deletions.
  1. +16 −8 PHP Markdown Extra Readme.text
  2. +6 −6 markdown.php
View
24 PHP Markdown Extra Readme.text
@@ -1,7 +1,7 @@
PHP Markdown Extra
==================
-Version 1.1.7 - Wed 26 Sep 2007
+Version 1.2 - Sun 11 May 2008
by Michel Fortin
<http://www.michelf.com/>
@@ -204,10 +204,10 @@ expected; (3) the output PHP Markdown actually produced.
Version History
---------------
-Extra Current:
+Extra 1.2:
* Added flat code block syntax which don't require indentation
- and can start and end with blank lines. A flat code blocks are
+ and can start and end with blank lines. A flat code block
starts with a line of consecutive tilde (~) and ends on the
next line with the same number of consecutive tilde. Here's an
example:
@@ -230,7 +230,7 @@ Extra Current:
been code.
-Current:
+1.0.1l:
* Now removing the UTF-8 BOM at the start of a document, if present.
@@ -250,16 +250,24 @@ Current:
* Item 2 (code block)
-* A code blocks starting on the second line of a document wasn't seen
+* A code block 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:
+ `predef_titles` for predefined URLs and titles for reference-style
+ links. 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';
+ $parser->predef_urls = array('linkref' => 'http://example.com');
$html = $parser->transform($text);
+
+ You can then use the URL as a normal link reference:
+
+ [my link][linkref]
+ [my link][linkRef]
+
+ Reference names in the parser properties *must* be lowercase.
+ Reference names in the Markdown source may have any case.
* Added `setup` and `teardown` methods which can be used by subclassers
as hook points to arrange the state of some parser variables before and
View
12 markdown.php
@@ -3,7 +3,7 @@
# Markdown Extra - A text-to-HTML conversion tool for web writers
#
# PHP Markdown & Extra
-# Copyright (c) 2004-2007 Michel Fortin
+# Copyright (c) 2004-2008 Michel Fortin
# <http://www.michelf.com/projects/php-markdown/>
#
# Original Markdown
@@ -12,8 +12,8 @@
#
-define( 'MARKDOWN_VERSION', "1.0.1k" ); # Wed 26 Sep 2007
-define( 'MARKDOWNEXTRA_VERSION', "1.1.7" ); # Wed 26 Sep 2007
+define( 'MARKDOWN_VERSION', "1.0.1l" ); # Sun 11 May 2008
+define( 'MARKDOWNEXTRA_VERSION', "1.2" ); # Sun 11 May 2008
#
@@ -71,7 +71,7 @@ function Markdown($text) {
Plugin Name: Markdown Extra
Plugin URI: http://www.michelf.com/projects/php-markdown/
Description: <a href="http://daringfireball.net/projects/markdown/syntax">Markdown syntax</a> allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by <a href="http://daringfireball.net/">John Gruber</a>. <a href="http://www.michelf.com/projects/php-markdown/">More...</a>
-Version: 1.1.7
+Version: 1.2
Author: Michel Fortin
Author URI: http://www.michelf.com/
*/
@@ -519,7 +519,7 @@ function hashPart($text, $boundary = 'X') {
# The $boundary argument specify what character should be used to surround
# the token. By convension, "B" is used for block elements that needs not
# to be wrapped into paragraph tags at the end, ":" is used for elements
- # that are word separators and "S" is used for general span-level elements.
+ # that are word separators and "X" is used in the general case.
#
# Swap back any tag hash found in $text so we do not have to `unhash`
# multiple times at the end.
@@ -2749,7 +2749,7 @@ function _doAbbreviations_callback($matches) {
---------------------
PHP Markdown & Extra
-Copyright (c) 2004-2007 Michel Fortin
+Copyright (c) 2004-2008 Michel Fortin
<http://www.michelf.com/>
All rights reserved.
Please sign in to comment.
Something went wrong with that request. Please try again.