Commit graph

228 commits

Author SHA1 Message Date
Michel Fortin
f35f0c0806 Fix for default PHP autoloading not working with Readme.php on case-sensitive file-system. 2013-01-24 13:52:00 -05:00
Michel Fortin
4e091d4105 Bumped version number for lib branch; updated Readme. 2013-01-21 09:45:46 -05:00
Michel Fortin
f682fc129a Merge branch 'extra' into lib 2013-01-21 07:53:17 -05:00
Michel Fortin
8e34fc990f Added Readme.php as sample code. 2013-01-21 07:52:18 -05:00
Michel Fortin
5511f94645 Changed namespace to Michelf (capitalized). 2013-01-21 07:51:51 -05:00
Michel Fortin
39642727fc Removed things that are sometime confused as POSIX collating elements by PCRE (depends on PCRE version used). 2013-01-21 07:41:43 -05:00
Michel Fortin
03fe190545 Merge pull request #55 from simensen/fix-composer
Define autoload for Composer.
2013-01-13 20:28:57 -08:00
Beau Simensen
52284ca1d0 Define autoload. 2013-01-13 19:00:28 -08:00
Michel Fortin
c98218dfb0 Adding trailing dashes to URLs in composer.json file. 2013-01-12 17:24:01 -05:00
Michel Fortin
e2a9b88fa1 Changed Lib branch version to 1.3-beta1. 2013-01-12 15:14:24 -05:00
Michel Fortin
368a0bcdd1 Updated composer file. 2013-01-12 15:10:18 -05:00
Michel Fortin
e5dcef91c8 Merge remote-tracking branch 'baldurrensc/composer' into lib 2013-01-12 14:53:05 -05:00
Michel Fortin
0b6ce2ee10 Merge branch 'extra' into lib; added version number 0.1 for lib branch.
Conflicts:
	Readme.md
	michelf/Markdown.php
2013-01-12 14:45:07 -05:00
Michel Fortin
f5c689253d Merge branch 'master' into extra and bumped version of PHP Markdown Extra to 1.2.6.
Conflicts:
	License.text
	PHP Markdown Extra Readme.text
	markdown.php
2013-01-12 14:38:06 -05:00
Michel Fortin
14f771ae37 Bumped version to 1.0.1p. 2013-01-12 14:31:21 -05:00
Michel Fortin
c634db3619 Changted michelf.com to michelf.ca, as mty website has changed domain. 2013-01-12 14:26:58 -05:00
Michel Fortin
dda20c60f3 Removed reference to bBlog installation process. The website is gone and bBlog seems to be dead. 2013-01-12 14:24:12 -05:00
Michel Fortin
4ded9bd97f Merge branch 'extra' into lib
Conflicts:
	michelf/Markdown.php
2013-01-12 14:12:53 -05:00
Michel Fortin
5acfd2fd37 Better fix for code block detector in HTML block parser. 2013-01-06 18:17:38 -05:00
Michel Fortin
47368a7a1d Updated readme for last commit. 2013-01-06 18:06:16 -05:00
Michel Fortin
f37e62baad Fix for more fenced code block issues.
Fixes #18.
2013-01-06 18:03:55 -05:00
Michel Fortin
6ebb841e7d Updated HTML block parser to correctly find the end of a fenced code block. 2013-01-06 16:56:42 -05:00
Michel Fortin
2b19a639a3 Fix for fenced code block re in HTML block parser. 2013-01-06 16:55:58 -05:00
Michel Fortin
adbc597a9a Adjustments to fenced code block configuration variable names; added parser-object variables too. 2013-01-05 21:32:55 -05:00
Michel Fortin
b658e6a0fd Typo. 2013-01-05 21:19:12 -05:00
Michel Fortin
f2abf82157 Updated readme to talk about attributes on fenced code blocks. 2013-01-05 21:18:58 -05:00
Michel Fortin
139dee0ade Added support for fenced code block (refactored while merging).
Merge remote-tracking branch 'coreyworrell/extra' into extra
2013-01-05 21:09:22 -05:00
Michel Fortin
8dc1da4cd3 Refactoring of the header attribute parser in a more generic "Extra Attribute Parser". 2013-01-05 20:41:20 -05:00
Michel Fortin
01d9808b0c Adding support for class attribute in headers.
Merge remote-tracking branch 'mmcclimon/extra' into extra

is necessary,
2013-01-04 23:01:00 -05:00
Michel Fortin
89aaf52c2e Merge branch 'extra' into lib
Conflicts:
	Readme.md
2012-12-08 14:24:54 -05:00
Michel Fortin
d7153dcf11 Added multiple footnote backlinks when footnotes have multiple references. 2012-12-03 07:49:53 -05:00
Michel Fortin
98ada9c4b5 Merge branch 'master' into extra
Conflicts:
	PHP Markdown Extra Readme.text
2012-12-02 23:32:43 -05:00
Michel Fortin
fdd003e0d9 XML-style empty tags were not recognized correctly when the / was not preceded by whitespace. Also made the regex a little more strict, so that </br/> wouldn't be seen as a valid tag. 2012-12-02 23:30:27 -05:00
Michel Fortin
4add01e080 Renamed default_transform function to defaultTransform. 2012-10-04 22:39:54 -04:00
Michel Fortin
90d305e67b Merge branch 'extra' into lib 2012-10-04 22:03:01 -04:00
Michel Fortin
a4ae021387 Updated changelog for no_markup issue. 2012-10-04 22:02:40 -04:00
Michel Fortin
181ab2f1ec Fixing issue #13 where no_markup / no_entities was ineffective on PHP Markdown Extra. 2012-10-04 22:01:52 -04:00
Michel Fortin
c8e00b8bab Fixing issue #13 where no_markup / no_entities was ineffective on PHP Markdown Extra. 2012-10-04 22:01:02 -04:00
Michel Fortin
2cec5887d1 Merge branch 'extra' into lib
Conflicts:
	Readme.md
	michelf/Markdown.php
2012-10-04 21:07:23 -04:00
Michel Fortin
b0da121fab Allow repeated references to the same footnote. 2012-10-04 21:03:57 -04:00
Michel Fortin
cb0beaca35 Merge branch 'master' into extra 2012-10-04 20:56:33 -04:00
Michel Fortin
a74017d897 Clarified issues around backtrack limits. 2012-10-04 20:55:45 -04:00
Michel Fortin
ce80df104f Merge commit 'd2d1acd' 2012-10-04 20:42:00 -04:00
Michel Fortin
fe89d35db0 One more typo in comments. 2012-10-04 20:40:12 -04:00
Michel Fortin
2d03fac6f6 Merge branch 'master' into extra 2012-10-04 20:40:00 -04:00
Jan Weiß
5d7cbd91ee Fixing typos in comments.
Conflicts:

	markdown.php
2012-10-04 20:38:59 -04:00
Michel Fortin
893e50b62e Merge commit '669a5fb' into extra 2012-10-04 20:34:36 -04:00
Michel Fortin
21eefb24d2 Merge branch 'master' into lib 2012-10-04 20:09:19 -04:00
Michel Fortin
20791b5799 Merge branch 'master' into extra 2012-10-04 20:09:14 -04:00
Michel Fortin
696c435eeb Missing concat dot. 2012-10-04 20:09:05 -04:00