Zander/zanders-php-markdown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
339 commits 1 branch 0 tags 951 KiB
Commit graph

339 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michel Fortin
ec8a9efb24 Moving the MarkdownExtra class where it belongs. 2015-02-28 22:52:19 -05:00
Michel Fortin
edd288cdc8 Updated version number, copyright year. 2015-02-28 22:48:32 -05:00
Michel Fortin
089b0ca37b Added enhanced ordered lists to Readme. 2015-02-28 22:41:24 -05:00
Michel Fortin
1e17706669 Merge branch 'lib' of git://github.com/mattgorle/php-markdown into lib 
Conflicts:
	Michelf/Markdown.php
 2015-02-28 22:17:31 -05:00
Michel Fortin
8b1d05ff83 Updated version history. 2015-02-28 21:23:34 -05:00
Michel Fortin
2506a6b657 Merge branch 'lib' of git://github.com/evert/php-markdown into lib 2015-02-28 20:52:43 -05:00
Evert Pot
9545615b3a Fixed header generation. Silly mistake. 2015-02-28 17:22:57 -05:00
Evert Pot
6ceb7ceb8c Oops. Needs an extra space here. 2015-02-26 16:28:15 -05:00
Evert Pot
ce512533dc Moved some common functionality in a method. Encoding changes. 2015-02-26 16:27:05 -05:00
Evert Pot
5b576b2c24 Tabs, not spaces. 2015-02-26 15:05:41 -05:00
Evert Pot
49c9cfe063 Correct escaping for html attributes. 2015-02-26 15:00:25 -05:00
Evert Pot
c7f15db5f0 Automatic id="" attribute generation. 2015-02-26 14:58:43 -05:00
Michel Fortin
1b5a30e139 Added custom HTML attributes to version history. 2014-12-07 21:09:55 -05:00
Michel Fortin
d3ef823223 Merge branch 'add-attribute-support' of git://github.com/attiks/php-markdown into lib 2014-12-07 21:06:30 -05:00
Michel Fortin
184fdd3cf1 Added latest change to version history. 2014-12-07 21:05:23 -05:00
Peter Droogmans
abb587aa86 only explode in 2 parts 2014-12-07 19:29:38 +01:00
Peter Droogmans
7ff3e59845 do nut use : as a prefix 2014-12-07 17:55:15 +01:00
Peter Droogmans
08b16661f3 check for no_markup flag 2014-12-07 17:16:32 +01:00
Peter Droogmans
bda98d1c33 Add support for any attribute 2014-12-07 16:46:09 +01:00
Michel Fortin
a8c56ecd5e Adding url_filter_func configuration variable. 
All URLs are now passed through the `encodeURLAttribute` function, which applies the filter as necessary. If the filter function changes the URL of an automatic link, this is reflected in the text of the link too.
Inline- and reference-style email links now benefit from the entity obfuscation since `mailto:` is now detected in `encodeURLAttribute` and it triggers the entity obfuscation.

Fixes #85.
 2014-08-10 15:25:52 -04:00
Michel Fortin
123c43a65c Merge pull request #165 from donatj/patch-1 
Remove trailing ?>
 2014-05-15 15:49:30 -04:00
Jesse Donat
15b78173a9 Remove trailing ?> 2014-05-14 16:57:13 -05:00
Michel Fortin
de9a19c7bf Added donation section in Readme. 2014-05-04 22:43:50 -04:00
Michel Fortin
0fc413a1f9 Bumped version to 1.4.1, updated version history and copyright year. 2014-05-04 21:52:07 -04:00
Michel Fortin
b39fb9b4bc Hack to fix [link](<s p a c e s>). 
Fixes #80.
 2014-05-04 21:30:14 -04:00
Michel Fortin
c0a3a825d4 HTML block parser now aware of the style tag. 
Fixes #103.
 2014-05-04 21:12:28 -04:00
Michel Fortin
ef94eba90a Removing unused variable $marker_any_re in doLists. 
Fixes #121.
 2014-05-04 21:08:33 -04:00
Michel Fortin
92c726ac67 Link reference following a footnote definition without a separating blank line gets swallowed as text in the footnote. 
Fixes #123.
 2014-05-04 21:07:24 -04:00
Michel Fortin
de989d7c21 Case <"A"@example.com>. Quotes not properly escaped inside the href attribute. 
Fixes #139.
 2014-05-04 21:06:26 -04:00
Michel Fortin
97e594d329 Merge branch 'lib' of git://github.com/s9e/php-markdown into lib 2014-05-04 20:20:26 -04:00
Michel Fortin
de359a30d5 HTML blocks don’t need to be separated by a blank line to with Markdown.pl, PHP Markdown should work the same. 2014-05-04 19:15:28 -04:00
Michel Fortin
fa9d0bce17 Merge branch 'useless_ref_this' of git://github.com/olvlvl/php-markdown into lib 
Conflicts:
	Michelf/Markdown.php
 2014-05-04 17:56:50 -04:00
Fred LeBlanc
7b5870007b Add 'figure' to list of block-level elements in _MarkdownExtra_TmpImpl 2014-02-16 16:20:08 -05:00
s9e
c44cf320c1 Simplified strong/emphasis regexps 
(?<=\S|^) becomes (?<!\s)
(?=\S|$)  becomes (?!\s)
(?<!\s)(?<!\*) becomes (?<![\s*])
(?<!\s)(?<!_)  becomes (?<![\s_])
(?!\s)(?![\.,:;]\s) becomes (?![\.,:;]?\s)
 2014-01-17 03:48:17 +01:00
Michel Fortin
6f952ee180 Fixed redundant redundancy error in Readme. 2013-11-29 16:49:31 -05:00
Michel Fortin
96d8150406 Fixed reference to how to do things without autoloading to point to the new section. 2013-11-29 12:09:24 -05:00
Michel Fortin
ea0f066378 Reworked intro in Readme. 2013-11-29 12:08:48 -05:00
Michel Fortin
efcf20752d Bumped version to 1.4.0, updated Readme. 2013-11-29 11:21:23 -05:00
Michel Fortin
1027677aa6 Removing leftover from bad merge. 2013-11-29 08:05:54 -05:00
Michel Fortin
2aa776f445 Removed notice about undefined variable. 2013-11-28 21:59:22 -05:00
Michel Fortin
466d523895 Made _MarkdownExtra_TmpImpl abstract, because you shouldn’t create instances of it. 
The whole class is a temporary implementation detail and will disappear in a future version. Do yourself a favor and use `\Michelf\MarkdownExtra`.
 2013-11-28 21:42:38 -05:00
Michel Fortin
353704d882 Removed repeated semicolon. 
Fixes #124.
 2013-11-28 21:22:44 -05:00
Michel Fortin
b3e016bd2a Merge branch 'extra' into lib 
Conflicts:
	Michelf/Markdown.php
	PHP Markdown Extra Readme.text
 2013-11-28 21:18:56 -05:00
Michel Fortin
0ed3a967ef Updated version history. 2013-11-28 21:16:12 -05:00
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
eed120d39a Added ".inc.php" files in the Michelf directory. 
Fixes #135.
 2013-11-28 20:49:23 -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