From 152860ca6bf086f7659913fa1c8c4b6d08fe6140 Mon Sep 17 00:00:00 2001 From: Michel Fortin Date: Tue, 4 Sep 2007 07:28:31 -0400 Subject: [PATCH 1/3] Prepared version 1.0.1j Changed version number, release date and added version history. --- PHP Markdown Readme.text | 7 +++++++ markdown.php | 24 +----------------------- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/PHP Markdown Readme.text b/PHP Markdown Readme.text index d4349ca..840076c 100644 --- a/PHP Markdown Readme.text +++ b/PHP Markdown Readme.text @@ -203,6 +203,13 @@ expected; (3) the output PHP Markdown actually produced. Version History --------------- +1.0.1j (4 Sep 2007): + +* Fixed a problem introduced in 1.0.1i where the closing `code` and + `pre` tags at the end of a code block were appearing in the wrong + order. + + 1.0.1i (31 Aug 2007): * Fixed a problem where an escaped backslash before a code span diff --git a/markdown.php b/markdown.php index f357ddc..3fc674d 100644 --- a/markdown.php +++ b/markdown.php @@ -12,7 +12,7 @@ # -define( 'MARKDOWN_VERSION', "1.0.1i" ); # Fri 31 Aug 2007 +define( 'MARKDOWN_VERSION', "1.0.1j" ); # Tue 4 Sep 2007 # @@ -1496,28 +1496,6 @@ Version History See the readme file for detailed release notes for this version. -1.0.1i (31 Aug 2007) - -1.0.1h (3 Aug 2007) - -1.0.1g (3 Jul 2007) - -1.0.1f (7 Feb 2007) - -1.0.1e (28 Dec 2006) - -1.0.1d (1 Dec 2006) - -1.0.1c (9 Dec 2005) - -1.0.1b (6 Jun 2005) - -1.0.1a (15 Apr 2005) - -1.0.1 (16 Dec 2004) - -1.0 (21 Aug 2004) - Copyright and License --------------------- From a26e466472fca46c78a011cc52ca48dac5bfd4db Mon Sep 17 00:00:00 2001 From: Michel Fortin Date: Tue, 4 Sep 2007 07:32:19 -0400 Subject: [PATCH 2/3] Made settings overridable. Added error suppression operator to setting defines so they may be overriden from an external file without causing PHP warnings. --- PHP Markdown Readme.text | 4 ++++ markdown.php | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/PHP Markdown Readme.text b/PHP Markdown Readme.text index 840076c..ab4ce60 100644 --- a/PHP Markdown Readme.text +++ b/PHP Markdown Readme.text @@ -209,6 +209,10 @@ Version History `pre` tags at the end of a code block were appearing in the wrong order. +* Overriding configuration settings by defining constants from an + external before markdown.php is included is now possible without + producing a PHP warning. + 1.0.1i (31 Aug 2007): diff --git a/markdown.php b/markdown.php index 3fc674d..5551923 100644 --- a/markdown.php +++ b/markdown.php @@ -20,10 +20,10 @@ define( 'MARKDOWN_VERSION', "1.0.1j" ); # Tue 4 Sep 2007 # # Change to ">" for HTML output -define( 'MARKDOWN_EMPTY_ELEMENT_SUFFIX', " />"); +@define( 'MARKDOWN_EMPTY_ELEMENT_SUFFIX', " />"); # Define the width of a tab for code blocks. -define( 'MARKDOWN_TAB_WIDTH', 4 ); +@define( 'MARKDOWN_TAB_WIDTH', 4 ); # @@ -31,14 +31,14 @@ define( 'MARKDOWN_TAB_WIDTH', 4 ); # # Change to false to remove Markdown from posts and/or comments. -define( 'MARKDOWN_WP_POSTS', true ); -define( 'MARKDOWN_WP_COMMENTS', true ); +@define( 'MARKDOWN_WP_POSTS', true ); +@define( 'MARKDOWN_WP_COMMENTS', true ); ### Standard Function Interface ### -define( 'MARKDOWN_PARSER_CLASS', 'Markdown_Parser' ); +@define( 'MARKDOWN_PARSER_CLASS', 'Markdown_Parser' ); function Markdown($text) { # From 27da43e45a4e0378cd2d9c2c78b1e37d328c42c0 Mon Sep 17 00:00:00 2001 From: Michel Fortin Date: Tue, 4 Sep 2007 09:41:14 -0400 Subject: [PATCH 3/3] Updated version info --- PHP Markdown Readme.text | 2 +- markdown.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PHP Markdown Readme.text b/PHP Markdown Readme.text index ab4ce60..4490ba1 100644 --- a/PHP Markdown Readme.text +++ b/PHP Markdown Readme.text @@ -1,7 +1,7 @@ PHP Markdown ============ -Version 1.0.1i - Fri 31 Aug 2007 +Version 1.0.1j - Tue 4 Sep 2007 by Michel Fortin diff --git a/markdown.php b/markdown.php index 5551923..e5f8e55 100644 --- a/markdown.php +++ b/markdown.php @@ -62,7 +62,7 @@ function Markdown($text) { Plugin Name: Markdown Plugin URI: http://www.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.0.1i +Version: 1.0.1j Author: Michel Fortin Author URI: http://www.michelf.com/ */