Skip to content
This repository
Browse code

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
Michel Fortin authored

Showing 2 changed files with 22 additions and 14 deletions. Show diff stats Hide diff stats

  1. +16 8 PHP Markdown Extra Readme.text
  2. +6 6 markdown.php
24 PHP Markdown Extra Readme.text
... ... @@ -1,7 +1,7 @@
1 1 PHP Markdown Extra
2 2 ==================
3 3
4   -Version 1.1.7 - Wed 26 Sep 2007
  4 +Version 1.2 - Sun 11 May 2008
5 5
6 6 by Michel Fortin
7 7 <http://www.michelf.com/>
@@ -204,10 +204,10 @@ expected; (3) the output PHP Markdown actually produced.
204 204 Version History
205 205 ---------------
206 206
207   -Extra Current:
  207 +Extra 1.2:
208 208
209 209 * Added flat code block syntax which don't require indentation
210   - and can start and end with blank lines. A flat code blocks are
  210 + and can start and end with blank lines. A flat code block
211 211 starts with a line of consecutive tilde (~) and ends on the
212 212 next line with the same number of consecutive tilde. Here's an
213 213 example:
@@ -230,7 +230,7 @@ Extra Current:
230 230 been code.
231 231
232 232
233   -Current:
  233 +1.0.1l:
234 234
235 235 * Now removing the UTF-8 BOM at the start of a document, if present.
236 236
@@ -250,16 +250,24 @@ Current:
250 250
251 251 * Item 2 (code block)
252 252
253   -* A code blocks starting on the second line of a document wasn't seen
  253 +* A code block starting on the second line of a document wasn't seen
254 254 as a code block. This has been fixed.
255 255
256 256 * Added programatically-settable parser properties `predef_urls` and
257   - `predef_titles` for predefined URLs and link titles. To use this,
258   - your PHP code must call the parser this way:
  257 + `predef_titles` for predefined URLs and titles for reference-style
  258 + links. To use this, your PHP code must call the parser this way:
259 259
260 260 $parser = new Markdwon_Parser;
261   - $parser->predef_urls['my_url_ref'] = 'http://example.com';
  261 + $parser->predef_urls = array('linkref' => 'http://example.com');
262 262 $html = $parser->transform($text);
  263 +
  264 + You can then use the URL as a normal link reference:
  265 +
  266 + [my link][linkref]
  267 + [my link][linkRef]
  268 +
  269 + Reference names in the parser properties *must* be lowercase.
  270 + Reference names in the Markdown source may have any case.
263 271
264 272 * Added `setup` and `teardown` methods which can be used by subclassers
265 273 as hook points to arrange the state of some parser variables before and
12 markdown.php
@@ -3,7 +3,7 @@
3 3 # Markdown Extra - A text-to-HTML conversion tool for web writers
4 4 #
5 5 # PHP Markdown & Extra
6   -# Copyright (c) 2004-2007 Michel Fortin
  6 +# Copyright (c) 2004-2008 Michel Fortin
7 7 # <http://www.michelf.com/projects/php-markdown/>
8 8 #
9 9 # Original Markdown
@@ -12,8 +12,8 @@
12 12 #
13 13
14 14
15   -define( 'MARKDOWN_VERSION', "1.0.1k" ); # Wed 26 Sep 2007
16   -define( 'MARKDOWNEXTRA_VERSION', "1.1.7" ); # Wed 26 Sep 2007
  15 +define( 'MARKDOWN_VERSION', "1.0.1l" ); # Sun 11 May 2008
  16 +define( 'MARKDOWNEXTRA_VERSION', "1.2" ); # Sun 11 May 2008
17 17
18 18
19 19 #
@@ -71,7 +71,7 @@ function Markdown($text) {
71 71 Plugin Name: Markdown Extra
72 72 Plugin URI: http://www.michelf.com/projects/php-markdown/
73 73 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>
74   -Version: 1.1.7
  74 +Version: 1.2
75 75 Author: Michel Fortin
76 76 Author URI: http://www.michelf.com/
77 77 */
@@ -519,7 +519,7 @@ function hashPart($text, $boundary = 'X') {
519 519 # The $boundary argument specify what character should be used to surround
520 520 # the token. By convension, "B" is used for block elements that needs not
521 521 # to be wrapped into paragraph tags at the end, ":" is used for elements
522   - # that are word separators and "S" is used for general span-level elements.
  522 + # that are word separators and "X" is used in the general case.
523 523 #
524 524 # Swap back any tag hash found in $text so we do not have to `unhash`
525 525 # multiple times at the end.
@@ -2749,7 +2749,7 @@ function _doAbbreviations_callback($matches) {
2749 2749 ---------------------
2750 2750
2751 2751 PHP Markdown & Extra
2752   -Copyright (c) 2004-2007 Michel Fortin
  2752 +Copyright (c) 2004-2008 Michel Fortin
2753 2753 <http://www.michelf.com/>
2754 2754 All rights reserved.
2755 2755

0 comments on commit 445f334

Please sign in to comment.
Something went wrong with that request. Please try again.