Zander/zanders-php-markdown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into extra

Browse source 
Conflicts:
	License.text
	PHP Markdown Extra Readme.text
	markdown.php
This commit is contained in:
Michel Fortin 2009-10-10 07:57:17 -04:00
commit 939c14a0b5
3 changed files with 34 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
License.text
View file

@ -1,5 +1,5 @@
PHP Markdown & Extra
Copyright (c) 2004-2008 Michel Fortin
PHP Markdown & Extra
Copyright (c) 2004-2009 Michel Fortin
<http://www.michelf.com/>
All rights reserved.

23
PHP Markdown Extra Readme.text
View file

@ -204,10 +204,21 @@ expected; (3) the output PHP Markdown actually produced.
Version History
---------------
Current:
1.0.1n (10 Oct 2009):
* Fix for adjacent list of different kind where the second list could
end as a sublist of the first when not separated by an empty line.
* Enabled reference-style shortcut links. Now you can write reference-style
links with less brakets:
This is [my website].
[my website]: http://example.com/
This was added in the 1.0.2 betas, but commented out in the 1.0.1 branch,
waiting for the feature to be officialized. [But half of the other Markdown
implementations are supporting this syntax][half], so it makes sense for
compatibility's sake to allow it in PHP Markdown too.
[half]: http://babelmark.bobtfish.net/?markdown=This+is+%5Bmy+website%5D.%0D%0A%09%09%0D%0A%5Bmy+website%5D%3A+http%3A%2F%2Fexample.com%2F%0D%0A&src=1&dest=2
* Now accepting many valid email addresses in autolinks that were
previously rejected, such as:
@ -229,6 +240,9 @@ Current:
There is still a quirk which may prevent this from working correctly with
relative URLs in inline-style links however.
* Fix for adjacent list of different kind where the second list could
end as a sublist of the first when not separated by an empty line.
* Fixed a bug where inline-style links wouldn't be recognized when the link
definition contains a line break between the url and the title.
@ -731,7 +745,8 @@ Extra 1.0b1 (25 Jun 2005)
Copyright and License
---------------------
Copyright (c) 2004-2005 Michel Fortin
PHP Markdown & Extra
Copyright (c) 2004-2009 Michel Fortin
<http://www.michelf.com/>
All rights reserved.

26
markdown.php
View file

@ -3,7 +3,7 @@
# Markdown Extra - A text-to-HTML conversion tool for web writers
#
# PHP Markdown & Extra
# Copyright (c) 2004-2008 Michel Fortin
# Copyright (c) 2004-2009 Michel Fortin
# <http://www.michelf.com/projects/php-markdown/>
#
# Original Markdown
@ -12,7 +12,7 @@
#
define( 'MARKDOWN_VERSION', "1.0.1m" ); # Sat 21 Jun 2008
define( 'MARKDOWN_VERSION', "1.0.1n" ); # Sat 10 Oct 2009
define( 'MARKDOWNEXTRA_VERSION', "1.2.3" ); # Wed 31 Dec 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.2.2
Version: 1.2.3
Author: Michel Fortin
Author URI: http://www.michelf.com/
*/
@ -727,14 +727,14 @@ class Markdown_Parser {
# These must come last in case you've also got [link text][1]
# or [link text](/foo)
#
// $text = preg_replace_callback('{
// ( # wrap whole match in $1
// \[
// ([^\[\]]+) # link text = $2; can\'t contain [ or ]
// \]
// )
// }xs',
// array(&$this, '_doAnchors_reference_callback'), $text);
$text = preg_replace_callback('{
( # wrap whole match in $1
\[
([^\[\]]+) # link text = $2; can\'t contain [ or ]
\]
)
}xs',
array(&$this, '_doAnchors_reference_callback'), $text);
$this->in_anchor = false;
return $text;
@ -2891,8 +2891,8 @@ See the readme file for detailed release notes for this version.
Copyright and License
---------------------
PHP Markdown & Extra
Copyright (c) 2004-2008 Michel Fortin
PHP Markdown & Extra
Copyright (c) 2004-2009 Michel Fortin
<http://www.michelf.com/>
All rights reserved.