diff --git a/License.text b/License.text index 4d6bf8b..e0685e0 100644 --- a/License.text +++ b/License.text @@ -1,6 +1,6 @@ PHP Markdown & Extra -Copyright (c) 2004-2009 Michel Fortin - +Copyright (c) 2004-2013 Michel Fortin + All rights reserved. Based on Markdown diff --git a/PHP Markdown Extra Readme.text b/PHP Markdown Extra Readme.text index 90b21d2..76cb6c1 100644 --- a/PHP Markdown Extra Readme.text +++ b/PHP Markdown Extra Readme.text @@ -1,10 +1,10 @@ PHP Markdown Extra ================== -Version 1.2.5 - Sun 8 Jan 2012 +Version 1.2.6 - Sun 13 Jan 2013 -by Michel Fortin - +by Michel Fortin + based on Markdown by John Gruber @@ -25,9 +25,9 @@ tool, written in Perl, that converts the plain text markup to HTML. PHP Markdown is a port to PHP of the original Markdown program by John Gruber. -PHP Markdown can work as a plug-in for WordPress and bBlog, as a -modifier for the Smarty templating engine, or as a replacement for -Textile formatting in any software that supports Textile. +PHP Markdown can work as a plug-in for WordPress, as a modifier for +the Smarty templating engine, or as a replacement for Textile +formatting in any software that supports Textile. Full documentation of Markdown's syntax is available on John's Markdown page: @@ -74,23 +74,6 @@ are written in HTML (as opposed to another formatting syntax, like Textile), they'll probably stay fine after installing Markdown. -### bBlog ### - -PHP Markdown also works with [bBlog][bb]. - - [bb]: http://www.bblog.com/ - -To use PHP Markdown with bBlog, rename "markdown.php" to -"modifier.markdown.php" and place the file in the "bBlog_plugins" -folder. This folder is located inside the "bblog" directory of -your site, like this: - - (site home)/bblog/bBlog_plugins/modifier.markdown.php - -Select "Markdown" as the "Entry Modifier" when you post a new -entry. This setting will only apply to the entry you are editing. - - ### Replacing Textile in TextPattern ### [TextPattern][tp] use [Textile][tx] to format your text. You can @@ -117,7 +100,7 @@ can solve this problem by installing the "smartypants.php" file from Compatibility Mode function will use SmartyPants automatically without further modification. - [psp]: http://michelf.com/projects/php-smartypants/ + [psp]: http://michelf.ca/projects/php-smartypants/ ### In Your Own Programs ### @@ -199,7 +182,7 @@ Bugs ---- To file bug reports please send email to: - + Please include with your report: (1) the example input; (2) the output you expected; (3) the output PHP Markdown actually produced. @@ -212,7 +195,7 @@ See Installation and Requirement above for details. Version History --------------- -Current Extra: +Extra 1.2.6 (13 Jan 2013): * Headers can now have a class attribute. You can add a class inside the extra attribute block which can optionally be put after a header: @@ -261,7 +244,7 @@ Current Extra: * Fixed an issue where no_markup mode was ineffective. -Current: +1.0.1p (13 Jan 2013): * Fixed an issue where some XML-style empty tags (such as `
`) were not recognized correctly as such when inserted into Markdown-formatted text. @@ -831,8 +814,8 @@ Copyright and License --------------------- PHP Markdown & Extra -Copyright (c) 2004-2009 Michel Fortin - +Copyright (c) 2004-2013 Michel Fortin + All rights reserved. Based on Markdown diff --git a/markdown.php b/markdown.php index a0fe4d0..2e0ae85 100644 --- a/markdown.php +++ b/markdown.php @@ -2,18 +2,18 @@ # # Markdown Extra - A text-to-HTML conversion tool for web writers # -# PHP Markdown & Extra -# Copyright (c) 2004-2012 Michel Fortin -# +# PHP Markdown & Extra +# Copyright (c) 2004-2013 Michel Fortin +# # -# Original Markdown +# Original Markdown # Copyright (c) 2004-2006 John Gruber # # -define( 'MARKDOWN_VERSION', "1.0.1o" ); # Sun 8 Jan 2012 -define( 'MARKDOWNEXTRA_VERSION', "1.2.5" ); # Sun 8 Jan 2012 +define( 'MARKDOWN_VERSION', "1.0.1p" ); # Sun 13 Jan 2013 +define( 'MARKDOWNEXTRA_VERSION', "1.2.6" ); # Sun 13 Jan 2013 # @@ -76,16 +76,17 @@ function Markdown($text) { /* Plugin Name: Markdown Extra -Plugin URI: http://michelf.com/projects/php-markdown/ -Description: Markdown syntax allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by John Gruber. More... -Version: 1.2.5 +Plugin Name: Markdown +Plugin URI: http://michelf.ca/projects/php-markdown/ +Description: Markdown syntax allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by John Gruber. More... +Version: 1.2.6 Author: Michel Fortin -Author URI: http://michelf.com/ +Author URI: http://michelf.ca/ */ if (isset($wp_version)) { # More details about how it works here: - # + # # Post content and excerpts # - Remove WordPress paragraph generator. @@ -178,7 +179,7 @@ function identify_modifier_markdown() { 'authors' => 'Michel Fortin and John Gruber', 'licence' => 'GPL', 'version' => MARKDOWNEXTRA_VERSION, - 'help' => 'Markdown syntax allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by John Gruber. More...', + 'help' => 'Markdown syntax allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by John Gruber. More...', ); } @@ -2993,7 +2994,7 @@ Bugs To file bug reports please send email to: - + Please include with your report: (1) the example input; (2) the output you expected; (3) the output Markdown actually produced. @@ -3008,9 +3009,9 @@ See the readme file for detailed release notes for this version. Copyright and License --------------------- -PHP Markdown & Extra -Copyright (c) 2004-2009 Michel Fortin - +PHP Markdown & Extra +Copyright (c) 2004-2013 Michel Fortin + All rights reserved. Based on Markdown