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

73 commits

Author SHA1 Message Date
Michel Fortin
6b4f89fd19 Merge branch 'issue/98-phpdoc-comments' of git://github.com/robbieaverill/php-markdown into lib 
Reverted some changes to Readme.php and the .inc files and corrected a syntax error in MarkdownExtra.php.
 2016-03-13 20:44:48 -04:00
Robbie Averill
aee1b20499 Fixed author references 2016-03-04 08:28:21 +13:00
Robbie Averill
f5cd0dbcf4 [#98] Changing to PHPDoc comments 2016-03-03 13:39:53 +13:00
Floris
9fa8f87f20 Allow custom content function for code span 
Just like the option `$code_block_content_func`, but now for code-span.
Can be used to prevent the default `htmlspecialchars` or do some kind
of other logic to convert the code to html.
 2016-02-04 11:42:43 +01:00
Michel Fortin
156e56ee03 Reversionned 1.5.1 as 1.6.0 to respect the versioning policy. 2015-12-23 20:37:31 -05:00
Michel Fortin
155287e422 Bumped version to 1.5.1. 2015-12-22 13:18:12 -05:00
Michel Fortin
37a75bfac8 Merge branch 'code_block_content_func' into lib 2015-08-04 17:30:50 -04:00
Michel Fortin
c9220d1bb3 Finalization of fenced code block improvements by Mario Konrad: 
- Moving `code_block_content_func` configuration variable to regular Markdown parser, now using it to convert the content of indented code blocks to HTML too.
- Fix for code block class name and special attribute blocks together.
- Updated the fenced code block syntax in the HTML block parser (so it correctly skips those code blocks).
- Updated Readme.md to explain the changes.
 2015-08-04 17:29:59 -04:00
Viktor Szakats
2eaa375f52 use https in URLs where possible 2015-07-01 21:40:16 +02:00
Michel Fortin
e1aabe1817 Set version number to 1.5.0 (as it should have been), updated URLs to website. 2015-03-01 07:03:08 -05:00
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
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
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
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
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
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
cee0b029c8 Merge branch 'interface' of git://github.com/itafroma/php-markdown into lib 2013-11-28 16:34:54 -05:00
Michel Fortin
d6ed0d0803 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 16:19:35 -05:00
Michel Fortin
05d1f999ec Removed rev="footnote" from HTML output. 
The `rel` attribute was removed a while ago, but for some reason `rev` stayed. It shouldn’t.
 2013-11-28 15:20:57 -05:00
Jason Caldwell
ab786ae1d5 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.
 2013-10-13 00:14:12 -07:00
Jason Caldwell
149e0dccc1 Improving GFM-Style Fenced Code Blocks; and Updating to data-lang="". 2013-09-30 22:58:34 -07:00
Jason Caldwell
2383db7cd6 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
 2013-09-23 03:59:54 -07:00
Jesse Donat
63921893d0 Excluded trailing ?>'s on class code per PSR-2 Subheading 2.2 
"The closing ?> tag MUST be omitted from files containing only PHP"
 2013-07-31 12:16:32 -05:00
Olivier Laviale
27387d3fe4 Removed useless object referencing 2013-07-24 11:14:13 +02:00
Matt Gorle matt@gorle.co.uk
e984fa0a4b Moved enhanced ordered list behaviour back into Markdown class. 
Moved enhanced_ordered_list field into Markdown class, default value
is false.
Made MarkdownExtra enable enhanced ordered list by default.
 2013-07-16 22:31:12 +01:00