Michel Fortin
4742d28fab
Merge branch 'master' of git://github.com/derflocki/php-markdown into extra
2013-11-28 21:08:04 -05:00
Michel Fortin
79fd7728f2
Fixed some issues with fenced code blocks.
...
HTML block parser was confusing backtick fenced code blocks with
code spans, which has no consequence most of the time but could
be problematic if you're writing code spans inside of the code block.
Code span markers are now matched only when backtick fence matching
has failed.
Fixed an issue were two consecutive fenced code blocks with no
blank line between them which was causing the next paragraph to
become a code block (with both tilde and backtick fences).
2013-11-28 19:53:06 -05:00
Jason Caldwell
85ead87f4a
GFM-Style Fenced Code Blocks Only (no lang attribute)
...
Removing the additional code that I applied previously to implement the `data-lang` attribute. In retrospect, this was a bad idea; as the existing implementation does a good job with this already when used properly.
Many thanks to Michel Fortin for his help in accomplishing these changes :-) I hope this might be merged into the official copy at some point in the future.
Conflicts:
markdown.php
2013-11-28 19:52:51 -05:00
Jason Caldwell
db9ef53240
Improving GFM-Style Fenced Code Blocks; and Updating to data-lang="".
2013-11-28 19:51:43 -05:00
Jason Caldwell
b2c76a3804
GFM Enhancements (Backticks)
...
- Adding support for GFM backticks ``` (for fenced code blocks); in additional to ~~~ already supported in Markdown Extra.
- Adding support for GFM language marker; e.g. ```php
Conflicts:
markdown.php
2013-11-28 19:51:20 -05:00
Florian Dorn
b16addc663
added support for the tel: url-scheme
2013-09-12 17:16:10 +02:00
Michel Fortin
b503c58756
Typo in version number.
2013-04-11 14:21:44 -04:00
Michel Fortin
2838fb7dd8
Bumped version of Extra to 1.2.7.
2013-04-11 14:10:33 -04:00
Michel Fortin
e54ac83f6b
Merge branch 'master' into extra
...
Conflicts:
PHP Markdown Extra Readme.text
markdown.php
2013-04-11 14:09:11 -04:00
Michel Fortin
91e8734e79
Bumped version number to 1.0.1q and added some version history.
2013-04-11 14:06:48 -04:00
Michel Fortin
7a00f238c3
Merge branch 'master' into extra
2013-04-07 15:11:00 -04:00
Michel Fortin
1d33f217f8
Wrong initialization of the in_anchor member variable.
2013-04-07 15:07:40 -04:00
Michel Fortin
7cb355c91e
Fix for issue 72.
2013-04-07 14:00:03 -04:00
Michel Fortin
18974a53b9
Added extra attribute block for links and images.
2013-02-08 08:34:46 -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
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
5acfd2fd37
Better fix for code block detector in HTML block parser.
2013-01-06 18:17:38 -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
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
