Commit graph

91 commits

Author SHA1 Message Date
Thomas Hochstein
5078cf7782 Treat <details> and <summary> as block level.
<details> and <summary> elements should never
be wrapped in "<p></p>".

Signed-off-by: Thomas Hochstein <thh@inter.net>
2020-04-22 17:24:00 +02:00
Michel Fortin
c83178d49e Bumping version to 1.9.0. 2019-12-01 21:32:27 -05:00
Michel Fortin
5e2c895aaa Updating copyright dates. 2019-12-01 21:29:53 -05:00
Remi Collet
a35858f040 curly braces is deprecated 2019-07-26 14:51:37 +02:00
Nicolas CARPi
abcafda9b6 Various little fixes
* Check if property is callable with is_callable everywhere needed
* Remove the & from the docblock declaration of variable passed by
reference
* Make default value of $footnotes_assembled an empty string instead of
null because it is concatenated afterwards with a string
* Use $mode instead of $this->mode (undeclared property anyway, and not
used anywhere else afaik)
* Correct the docblock types for some variables
2018-08-08 18:16:24 +02:00
Michael Butler
29b66556c7 Cleanup code, del unused variables 2018-04-05 22:28:10 -04:00
Michel Fortin
01ab082b35 Preparing 1.8.0 release. 2018-01-14 19:49:33 -05:00
Michel Fortin
f7bc32eefb Fix for issue 285: need to reset the state for regular emphasis when unwinding in toItalicsAndBold. 2017-10-10 20:04:05 -04:00
Michel Fortin
64045149fa Avoid unnecessary reentrency in doItalicsAndBold. 2017-10-10 20:03:06 -04:00
Jon Dufresne
a1595371cf Clean up trailing white space across all files 2017-04-22 14:04:08 -07:00
Casper Langemeijer
251ffcce75 Add semicolon 2017-04-20 13:50:08 +02:00
Casper Langemeijer
0c1337a4d4 Refactor create_function into anonymous function 2017-04-17 15:21:13 +02:00
Michel Fortin
1f51cc5209 Bumped version number to 1.7.0. 2016-10-29 14:58:20 -04:00
Michel Fortin
8623708448 Fixing handling of list items with span-level content so that nested lists aren't passed through the span gamut.
This more principled approach should have no effect on the output other than prevent line breaks from appearing between the text of a list item and its nested list. It has become somewhat necessary after adding `hard_wrap`.
2016-08-29 16:25:25 -04:00
Michel Fortin
6517f33f31 Eat spaces before the \n when hard-wrapping. 2016-08-29 16:25:12 -04:00
Michel Fortin
c6b869e28f Fixing Fixing space->tab indentation. 2016-08-29 16:24:35 -04:00
Jonathan Cohlmeyer
a0012c0590 [#169] Adding hard wrap option to enable line breaks without two trailing spaces 2016-08-27 13:31:01 -04:00
Viktor Szakats
0bec870817 Restore https after f5cd0dbcf4 2016-07-13 22:57:33 +02:00
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