Commit graph

162 commits

Author SHA1 Message Date
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
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
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
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
b0da121fab Allow repeated references to the same footnote. 2012-10-04 21:03:57 -04:00
Michel Fortin
fe89d35db0 One more typo in comments. 2012-10-04 20:40:12 -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
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
Michel Fortin
a3983eab43 Clarified what variables in the parser class are meant to be configurable and which are not. 2012-10-04 15:48:23 -04:00
Michel Fortin
96885ef5ca Merge branch 'master' into extra 2012-10-04 15:47:40 -04:00
Michel Fortin
d1c16bef1a Clarified what variables in the parser class are meant to be configurable and which are not. 2012-10-04 15:47:05 -04:00
Michel Fortin
4a3f34e77c Added HTML 5 elements and some other to the HTML block parser. 2012-10-04 10:13:42 -04:00
Michel Fortin
85df35a841 Merge branch 'master' into extra 2012-10-04 09:57:57 -04:00
Michel Fortin
a09e65c0e8 Added HTML 5 elements to the block parser. 2012-10-04 09:57:45 -04:00
Michael McClimon
ac294eceae Full support for header id & class attributes in the same set of curly braces. 2012-07-31 17:27:09 -04:00
Michael McClimon
0bd5682fba Forgot to get rid of an echo 2012-07-31 14:04:10 -04:00
Michael McClimon
a66aa9e30e Changes to allow both header id and classes in same curly brace set, but only in atx-style headers 2012-07-31 14:00:55 -04:00
Michael McClimon
7d85e4e686 First pass at combining id and class attributes in a single curly brace set 2012-07-31 09:28:26 -04:00
Michael McClimon
99dd2a3ecf Add support for header classes via {.class} 2012-07-30 19:54:04 -04:00
Jan Weiß
669a5fb4c9 Fixing typos in comments. 2012-07-06 11:20:41 +02:00
Corey Worrell
e90b9127ab Updating HTML hashing for fenced code blocks. 2012-02-20 13:49:34 -08:00
Corey Worrell
8d00ff92c1 Updating fenced code blocks as per discussion in issue #7. 2012-01-27 17:37:43 -08:00
Corey Worrell
c50fa5ff5c Adding ability to add attributes to code blocks. See function comment for syntax. 2012-01-16 11:15:05 -08:00
Corey Worrell
c7beca6a4f Restoring newline callback to correct original format. 2012-01-14 20:53:58 -08:00
Corey Worrell
9983ec342f Fixing CSS class regex. 2012-01-14 18:59:13 -08:00
Corey Worrell
4a48b4648c Fixing fenced code blocks to allow classes to be added. Also the newline callback regex seemed to not be working, so I removed the ^ character from before \n. 2012-01-13 15:51:49 -08:00
Michel Fortin
5e0be6adb4 Merge branch 'master' into extra, bumped version to 1.2.5.
Conflicts:
	PHP Markdown Extra Readme.text
	markdown.php
2012-01-08 10:21:24 -05:00
Michel Fortin
b1bc42eb99 Updated to version number 1.0.1o. 2012-01-08 10:19:59 -05:00
Michel Fortin
beb25bca80 Fixed issue with unencoded tags inside code blocks. 2012-01-08 10:00:25 -05:00
Michel Fortin
715b1fa381 Fixing fenced code blocks. 2012-01-02 11:38:34 -05:00
Michel Fortin
32a7c8b28b Revert "Fixed issue with <br/> tag with no space before the "/"." Breaks image/anchor syntax (which was already partially broken by the overlap).
This reverts commit 0ab5f63779.
2012-01-02 10:40:56 -05:00
Michel Fortin
0ab5f63779 Fixed issue with <br/> tag with no space before the "/". 2012-01-02 10:19:49 -05:00
Michel Fortin
61b1769bcf Escaping of character classes begining with "." to avoid new PHP warning about Posix classes. 2012-01-02 10:12:41 -05:00
Michel Fortin
242b483cbf Merge branch 'master' into extra 2012-01-02 10:11:56 -05:00
Michel Fortin
1faa8f2198 Escaping of character classes begining with "." to avoid new PHP warning about Posix classes. 2012-01-02 10:11:43 -05:00
Michel Fortin
9fb1f6336d Updated version number to 1.2.4. 2009-10-10 10:11:04 -04:00
Michel Fortin
8b6da4cea2 Corrected PHP Markdown Extra emphasis handling. 2009-10-10 09:01:44 -04:00
Michel Fortin
071cf4a536 Merge branch 'master' into extra 2009-10-10 08:51:08 -04:00
Michel Fortin
8dcbb993ec Fixed some emphasis corner-cases. 2009-10-10 08:50:41 -04:00
Michel Fortin
7e3c55edb7 Merge branch 'master' into extra
Conflicts:
	PHP Markdown Extra Readme.text
	markdown.php
2009-10-10 08:04:37 -04:00
Michel Fortin
221e41a280 Removed www from mcihelf.com domain name. 2009-10-10 08:00:38 -04:00
Michel Fortin
939c14a0b5 Merge branch 'master' into extra
Conflicts:
	License.text
	PHP Markdown Extra Readme.text
	markdown.php
2009-10-10 07:57:17 -04:00