1
0
mirror of https://github.com/erusev/parsedown.git synced 2023-08-10 21:13:06 +03:00

Compare commits

..

268 Commits

Author SHA1 Message Date
1bf24f7334 add kbd to text-level elements 2017-03-29 19:04:15 +03:00
0a09d5ad45 update tests to reflect changes in phpunit 6.0 2017-03-23 20:21:18 +02:00
3fc442b078 Merge pull request #484 from hkdobrev/patch-1
Add Symfony demo to "Who uses it?"
2017-03-10 09:41:24 +02:00
bd0e31a7dd Add Symfony demo to "Who uses it?"
409a65b373/composer.json (L24)
2017-03-10 01:04:53 +02:00
dfaf03639a Merge pull request #480 from pjona/patch-1
Removed double semicolon
2017-03-08 23:21:03 +02:00
7081afe8cb Removed double semicolon 2017-03-02 12:43:51 +01:00
4b6493999a Merge pull request #465 from aidantwoods/patch-8
Trim surrounding whitespace from URL in inlineLink
2017-01-23 09:45:19 +02:00
0172d779d7 Trim surrounding whitespace from URL in inlineLink
Fixes https://github.com/erusev/parsedown-extra/issues/103
2017-01-21 11:06:41 +00:00
cc5b38ca39 Merge pull request #459 from gene-sis/fix_inlineLink_regex
fix_inlineLink_regex
2017-01-07 16:51:03 +02:00
48351504de adjust two regex pattern within inlineLink() to reduce backtracking
add test with base64 image
2017-01-07 00:45:38 +01:00
20ff8bbb57 Merge pull request #447 from greut/phpunit-from-extra
Fix include from ParsedownTest
2016-11-02 17:56:58 +02:00
bc21988fe5 Fix include from ParsedownTest
I wasn't able to run all the tests from ParsedownExtra because of it.
2016-11-02 09:27:35 +01:00
e3c3e28554 Merge pull request #446 from jamesevickery/master
Grammar update
2016-10-25 17:39:55 +03:00
f053740132 Merge pull request #1 from erusev/master
Merge pull request #445 from jamesevickery/master
2016-10-25 15:24:11 +01:00
7a92a31739 Grammar update 2016-10-25 15:22:17 +01:00
6eca8796fb Merge pull request #445 from jamesevickery/master
Tiny grammar correction
2016-10-25 17:21:57 +03:00
8876c0984e Tiny grammar correction 2016-10-25 15:10:22 +01:00
cbc4b3f612 Merge pull request #436 from grogy/php71
Added PHP version 7.1 for tests
2016-10-09 13:04:16 +03:00
0080ef218e Added PHP version 7.1 for tests 2016-10-09 01:58:47 +02:00
f4e0234af0 Merge pull request #431 from aidantwoods/patch-2
Allow parsedown to specify list start attribute
2016-10-05 22:55:34 +03:00
5c22531e4d Allow parsedown to specify list start attribute
Syntax preferences
2016-10-05 18:27:54 +01:00
3978e33fd0 Allow parsedown to specify list start attribute
Remove github added tabs on blank lines
2016-10-05 18:17:12 +01:00
a37797ef34 Allow parsedown to specify list start attribute
Syntax preferences to match surrounding code
2016-10-05 18:15:47 +01:00
e3cd271f16 Allow parsedown to specify list start attribute
Performance: Swap preg_replace for stristr to obtain list start
2016-10-05 15:44:34 +01:00
f0b7b61c16 Allow parsedown to specify list start attribute
Should fix compatibility for PHP 5.3
2016-10-05 11:36:27 +01:00
ed41fcf3d6 Allow parsedown to specify list start attribute
oops
2016-10-05 10:06:40 +01:00
1fa8fae301 Allow parsedown to specify list start attribute
Readability improvements
2016-10-05 10:03:21 +01:00
932bafe0f0 update test for new feature 2016-10-04 17:43:37 +01:00
ac857809ab update test for new feature 2016-10-04 17:41:57 +01:00
846274996a Update ordered_list.html 2016-10-04 17:28:43 +01:00
c145a75848 update test for new feature 2016-10-04 15:44:50 +01:00
f17aa0438a Update Parsedown.php 2016-09-27 02:15:35 +01:00
38f4027d5e Update Parsedown.php
Okay, so maybe I should have looked 20 lines or so above where I made the edit in the element function – looks like it already supports adding attributes ;p
Have amended the change to blocklist to use the already existing functionality, and have reverted the change that I made to the element function.
2016-09-27 02:15:09 +01:00
2cee8d8a2d Update Parsedown.php
Looks like I might need to return the pattern which was used previously
Reverting last change as build still failed

This build will still fail, but I'm hoping it will only fair where the list start value has been inserted
2016-09-27 01:23:22 +01:00
cceefafd55 test
Attempting to determine which function change is causing test jobs to fail (in unexpected ways)
2016-09-27 01:16:00 +01:00
1c58e9d8d5 oops
oops
2016-09-27 00:57:57 +01:00
2772b034c6 Update Parsedown.php
(I think this should work)
Allow parsedown to specify list start attribute (see: https://github.com/erusev/parsedown/issues/100#issuecomment-249729602)
2016-09-27 00:53:51 +01:00
a2ed1592bd Merge pull request #424 from hkdobrev/patch-1
Update URL to dependants
2016-09-05 16:55:29 +03:00
3d7a473aa9 Update URL to dependants
As Packagist has now implemented the feature of listing packages
depending on another package, VersionEye is no longer needed for that.

As VersionEye scrapes the Packagist API to do the same, the original
source of information should be preferred.
2016-09-05 16:38:38 +03:00
f671ae7364 improve readme 2016-07-27 11:05:24 +03:00
490a8f35a4 remove incompatible comment 2016-03-09 19:02:39 +02:00
94688f21cc improve readme 2016-01-07 19:36:51 +02:00
693f2c4842 Merge pull request #377 from PhrozenByte/patch-1
Update composer.json requirements
2016-01-07 19:14:25 +02:00
9545a295cf README.md: Add PHP 5.3+ requirement 2016-01-07 16:48:43 +01:00
3d649081e5 Update composer.json requirements
Fixes #374
2016-01-06 19:44:53 +01:00
32de2cedcc Merge pull request #373 from getgrav/master
Simple changes to make Parsedown more pluggable
2015-12-19 16:39:29 +02:00
e7443a2bd8 Fixed really sorry spelling errors 2015-12-18 20:45:14 -07:00
10a7ff776c Left as-is 2015-12-17 10:48:21 -07:00
5ad15b87fa Break out method_exists checks into extendable methods to allow for better pluggability 2015-12-17 10:46:44 -07:00
b166cab9a2 Make lines protected to allow for extendability 2015-12-17 10:46:04 -07:00
0f974bf34f improve readme 2015-11-26 15:08:28 +02:00
3d7cdeec5f remove duplicate item in: who uses it 2015-11-14 09:54:17 +02:00
97953b193e add Grav CMS to: who uses it 2015-11-14 09:52:07 +02:00
c046a6b646 Merge pull request #361 from grogy/php7-readme
remove PHP 7.0 from allow failures in tests + improve readme
2015-10-31 20:08:48 +02:00
f1fefc257c improve readme 2015-10-31 16:13:42 +02:00
6f23ec8203 improve readme 2015-10-31 15:52:07 +02:00
23d4544986 improve readme 2015-10-31 15:51:14 +02:00
5a4ff5d189 improve readme 2015-10-31 15:49:56 +02:00
50ac4a06e8 remove PHP 7.0 from allow failures in tests + improve readme 2015-10-31 01:55:49 +01:00
003af26499 improve readme 2015-10-31 00:45:21 +02:00
aa63058a88 improve readme 2015-10-31 00:38:24 +02:00
15d56cdd27 improve readme 2015-10-31 00:37:38 +02:00
93d77b0b47 improve readme 2015-10-31 00:35:04 +02:00
c8072a1987 add link to caret.io in readme 2015-10-31 00:33:11 +02:00
b008290917 Merge pull request #359 from tbreuss/master
Add Herbie CMS to "Who uses it?"
2015-10-25 16:42:45 +02:00
9928c933d8 Add Herbie CMS to "Who uses it?" 2015-10-25 13:33:13 +01:00
ddb3bd2107 Merge pull request #357 from donatj/master
Parsedown library shouldn't be executable
2015-10-21 01:43:13 +03:00
e603c2378d Parsedown library shouldn't be executable 2015-10-20 15:16:36 -05:00
3ebbd730b5 1.6.0 2015-10-04 19:44:32 +03:00
1f02626ed6 add link to caret.io 2015-10-01 18:47:31 +03:00
fa005fdb95 Merge pull request #336 from hkdobrev/late-static-binding
Use late static binding for Parsedown::instance()
2015-08-13 15:16:23 +03:00
5f40cab3e7 Use late static binding for Parsedown::instance()
Fixes erusev/parsedown-extra#67.

This introduces PHP 5.3+ late static binding to the Singleton pattern in Parsedown.
It will return an instance of Parsedown which inherits the class which
called the `instance()` method rather than always returning instance of just `Parsedown`.

Tests are testing this feature with a test class which inherits from Parsedown.
Notice that calling `instance()` with the default arguments after an instance of
`Parsedown` was already created, it will return it even though it is from just
an instance of `Parsedown`. So this is fixing the problem just partially.
2015-08-13 13:29:33 +03:00
0e89e3714b 1.5.4 2015-08-03 12:24:05 +03:00
6b24125f06 clean up 2015-07-31 17:01:14 +03:00
a589bcac79 resolve #342 2015-07-31 01:33:21 +03:00
a9dfc97ddc opening code fence doesn't need 2 regex groups 2015-07-16 16:57:13 +03:00
28774a4359 improve readme 2015-07-15 11:59:59 +03:00
b8b5711ee5 improve readme 2015-07-15 11:59:40 +03:00
9579e5f5e5 improve readme 2015-07-15 11:57:45 +03:00
7f7f6418a3 improve readme 2015-07-15 09:21:38 +03:00
ee81967749 improve readme 2015-07-03 17:11:23 +03:00
96e0810188 improve readme 2015-07-03 17:11:08 +03:00
99bd1bd678 improve readme 2015-07-03 17:06:52 +03:00
e7a6a06166 improve readme 2015-07-03 16:46:25 +03:00
eca5bb8262 improve readme 2015-07-03 16:45:22 +03:00
1312908056 improve readme 2015-07-03 16:42:47 +03:00
76b7d7babd improve readme 2015-07-03 16:39:51 +03:00
ba802c1c8d replace the term "incomplete" 2015-07-02 01:01:14 +03:00
438874e9a8 improve line 2015-06-25 01:05:05 +03:00
8e26f45dee improve readme 2015-06-15 17:38:15 +03:00
e2bb3eaaf8 clean up 2015-06-15 12:28:35 +03:00
0de61e7b3a improve readme 2015-06-15 12:09:57 +03:00
5b72dceb26 improve readme 2015-06-15 00:10:09 +03:00
95699c9ba6 improve readme 2015-06-14 22:55:21 +03:00
790066e9a7 improve readme 2015-05-26 13:37:45 +03:00
b9e5228e92 version 1.5.3 2015-04-29 23:22:24 +03:00
31c8856f53 Merge pull request #312 from garoevans/patch-1
Fix check against $matches
2015-04-24 08:24:06 +03:00
d5823ad622 Merge pull request #295 from hkdobrev/nightly
Test on nightly releases of PHP (7.0) and HHVM
2015-04-24 01:44:07 +03:00
6736ba9a04 Fix check against $matches
Fixes inline reference links with int 0 as reference

The link [link][0] where [0] is set at the bottom of the md file current breaks and it's truthy value is false.
2015-04-20 16:24:11 +01:00
468d1e3da8 improve readme 2015-03-18 20:44:57 +02:00
7aa1d97bba improve readme 2015-03-18 20:43:30 +02:00
f768f9c63f improve readme 2015-03-18 20:42:44 +02:00
aa83968534 improve readme 2015-03-18 20:41:23 +02:00
85eadccc05 Merge pull request #297 from hkdobrev/patch-1
Remove "tested in PHP 5.2"
2015-03-18 20:39:40 +02:00
c94fa12d67 Remove "tested on PHP 5.2"
It is no longer tested on PHP 5.2 in Travis CI.

See https://github.com/erusev/parsedown/pull/286
2015-03-18 17:15:00 +02:00
11e02d45fa improve readme 2015-03-18 16:20:28 +02:00
ecd53f9add improve readme 2015-03-18 16:16:51 +02:00
844b2f49ea Merge pull request #249 from HelpingHand1/patch-1
Updated readme to display travis-ci.org build test
2015-03-18 16:08:13 +02:00
b2ad712644 Test on nightly releases of PHP (7.0) and HHVM
See https://github.com/erusev/parsedown/issues/294

See 12bf1c6d05 (commitcomment-10090016)

Nightly releases are allowed to fail since they are not stable and
could fail in unpredictable ways.

New versions of PHP could be added as they are released.
I think they should not be in the allowed to fail part of the matrix then.
2015-03-09 10:14:57 +02:00
65116c3cb0 Merge pull request #286 from henriquemoody/travis
Remove PHP version 5.2 from Travis builds
2015-02-09 01:04:08 +02:00
147003107a Remove PHP version 5.2 from Travis builds 2015-02-08 21:00:50 -02:00
618b26056c Merge pull request #284 from jstanden/master
Fixes #283
2015-02-04 00:39:05 +02:00
b828fe7c8d Fixes #283 2015-02-03 13:58:47 -08:00
6c9df528aa Merge pull request #280 from kelunik/master
Fixes PHP 7 compatibility
2015-02-02 02:33:38 +02:00
cb8cc57742 Fixes #279 2015-02-02 00:58:24 +01:00
9da19c1108 version 1.5.1 2015-01-24 15:01:47 +02:00
ffd9d3b407 improve tests 2015-01-24 14:37:40 +02:00
e94ecf4adc resolve #277 2015-01-24 14:21:55 +02:00
4d3079b908 resolve #274 2015-01-24 14:03:05 +02:00
70e7a17380 update readme 2015-01-24 04:54:01 +02:00
9518c8e384 improve readme 2015-01-24 04:51:13 +02:00
c581284231 improve readme 2015-01-24 02:33:41 +02:00
cb1940255a improve readme 2015-01-24 01:31:49 +02:00
93d0ec9397 improve readme 2015-01-24 01:27:48 +02:00
9c6e7e880a improve readme 2015-01-24 01:26:59 +02:00
2d62e29625 improve readme 2015-01-24 01:21:16 +02:00
595f33871e improve readme 2015-01-24 01:18:49 +02:00
97e1e0efaa improve readme 2015-01-24 01:15:08 +02:00
648419467a clean up 2015-01-21 01:32:20 +02:00
6ddb6b2b33 resolve #90 2015-01-19 17:11:13 +02:00
0008e69a83 clean up 2015-01-19 17:09:51 +02:00
c664785485 inline methods should be able to handle unmarked inline elements 2015-01-19 17:05:10 +02:00
bdf0ef024e setter variables should not be private 2015-01-18 19:38:57 +02:00
21a3e8790a no need for a separate method for every special character 2015-01-16 03:57:47 +02:00
e5e8d02934 improve order of methods 2015-01-16 03:18:07 +02:00
7ff0f97811 improve performance 2015-01-16 02:59:51 +02:00
596350d1f5 improve names of elements 2015-01-16 02:49:55 +02:00
2cbd3010e4 url elements should not be restricted to http 2015-01-16 02:31:58 +02:00
3b4aa6bff7 change the parsing order of tag elements to improve performance 2015-01-16 01:46:43 +02:00
05a8f16e95 improve CommonMark compliance 2015-01-16 01:44:35 +02:00
79d924040a improve CommonMark compliance 2015-01-16 01:24:02 +02:00
b4a8eb3315 resolve #156 2015-01-16 00:04:18 +02:00
4383cce85b resolve #143 2015-01-15 22:31:31 +02:00
ada39109e4 resolve #189 2015-01-15 22:04:02 +02:00
a06cdfb814 improve fix for #184 2015-01-15 21:32:18 +02:00
6bee326c92 resolve #184 2015-01-15 21:10:09 +02:00
3fe867d294 update readme 2015-01-15 18:28:11 +02:00
f08d017bcb resolve #196 2015-01-15 02:45:45 +02:00
e61a6114b0 resolve #175 2015-01-15 02:37:20 +02:00
9ed72ccd09 resolve #126 2015-01-15 02:24:39 +02:00
09e1184d9f resolve #265 2015-01-15 00:56:12 +02:00
2de60a9a8b improve readme 2015-01-13 15:28:18 +02:00
73a75299f5 improve readme 2015-01-13 15:18:35 +02:00
0d28808392 void markup blocks be marked 2015-01-12 23:24:13 +02:00
78960cf792 improve formatting 2015-01-12 18:53:24 +02:00
8f2e9c7cf6 definitions are blocks
in the old implementation it wasn’t possible to have multiline
definitions
2015-01-12 18:52:17 +02:00
3eb6d349f0 "src" and "alt" attributes should come first 2015-01-12 02:58:08 +02:00
859b1b10c1 update tests 2015-01-12 02:57:20 +02:00
08b01a1a29 blocks should be able to return markup 2015-01-12 02:55:00 +02:00
1686b2fbff we no longer call inline elements spans 2015-01-12 02:55:00 +02:00
15a32fcd0e no need to know the structure of markup blocks 2015-01-12 02:55:00 +02:00
4aca208f96 update readme 2015-01-11 16:23:43 +02:00
cedf96a64e update readme 2015-01-11 16:04:19 +02:00
9f58363e4b Merge pull request #260 from rhukster/master
Fix for Parsedown stripping classes on images supported by ParsedownExtra
2015-01-11 14:50:08 +02:00
6b4a459f97 Merge pull request #261 from naNuke/master
breaksEnabled fix
2015-01-11 14:08:17 +02:00
05bf198d26 breaksEnabled fix 2015-01-11 06:12:01 +01:00
30234a58fa No longer needed in this solution 2015-01-10 19:44:30 -07:00
03ff22c7df Attempted fix for stripped classes on images with ParsedownExtra - re: https://github.com/erusev/parsedown-extra/issues/32 2015-01-10 19:40:39 -07:00
098f188552 update readme 2015-01-10 14:53:08 +02:00
e68a458105 improve consistency 2015-01-10 14:22:54 +02:00
86a27b48bc update readme 2015-01-10 03:43:48 +02:00
c45dee6850 update readme 2015-01-10 03:41:29 +02:00
06135cd75a improve CommonMark compliance 2015-01-10 02:45:51 +02:00
7d3af6bf83 update commonmark test 2015-01-09 00:08:14 +02:00
dfacf7a71a add urlsLinked setter 2015-01-08 16:13:55 +02:00
fd0d8125e7 introduce more structure to parsing of unmarked inlines 2015-01-08 15:19:43 +02:00
b1be886d65 improve names of protected members 2015-01-05 15:05:18 +02:00
19bc6a7083 update variable names to match updated member names 2015-01-05 14:22:06 +02:00
b5efe98e2f improve names of protected members 2015-01-05 14:22:06 +02:00
5639ef7d69 fix PHPDoc 2015-01-05 14:22:06 +02:00
d42fcdc423 improve readme 2015-01-05 14:18:36 +02:00
d29d879ec6 separate parsing of inlines that don't have markers to improve simplicity 2015-01-04 18:37:24 +02:00
c9b4de3c9d resolve #253 2014-12-21 13:51:16 +02:00
38cc1ca7e0 resolve #251 2014-12-16 13:58:33 +02:00
23c4097fde restore support for PHP 5.2 2014-12-15 13:59:37 +02:00
05e87566a9 Merge branch 'master' of https://github.com/erusev/parsedown 2014-12-15 01:08:15 +02:00
ac68800717 improve extensibility 2014-12-15 01:07:29 +02:00
1aade35c5e update test 2014-12-15 00:56:22 +02:00
361febf7c6 improve CommonMark compliance 2014-12-15 00:52:03 +02:00
4b7d7cdef2 updated readme.md per comment by cebe 2014-12-13 13:01:40 -05:00
715f7572ad improve readme 2014-12-12 02:30:45 +02:00
907bd11613 improve readme 2014-12-11 15:30:40 +02:00
56c6169822 improve readme 2014-12-11 14:34:58 +02:00
97e667ab30 Updated readme to display travis-ci.org build test 2014-12-10 18:13:48 -05:00
6d54fda73a improve readme 2014-12-10 20:37:33 +02:00
3b5e4e23ec improve readme 2014-12-10 20:36:15 +02:00
85ee06898b resolve #182 2014-12-10 17:19:05 +02:00
4c24e68b42 Merge remote-tracking branch 'origin/commonmark'
Conflicts:
	Parsedown.php
	phpunit.xml.dist
	test/ParsedownTest.php
2014-12-06 02:50:54 +02:00
094cb88dac update test 2014-12-02 23:53:19 +02:00
7ab3c60a77 improve CommonMark compliance 2014-12-02 22:23:43 +02:00
2438c1a43d improve output readability 2014-11-29 23:53:38 +02:00
46196c1ac3 markup formatting shouldn't impact results 2014-11-29 22:58:42 +02:00
aa3d4d6eb7 simplify 2014-11-29 21:39:42 +02:00
6fb534bc34 improve consistency 2014-11-29 21:34:46 +02:00
28a202ee9e simplify 2014-11-29 20:18:23 +02:00
e46be110fb Merge branch 'master' into commonmark 2014-11-29 16:42:04 +02:00
495e7ac73b resolve #247 2014-11-29 04:29:14 +02:00
5bc6d90f8b resolve #248 2014-11-28 14:03:12 +02:00
9816507a75 markup should preserve empty lines 2014-11-19 20:18:56 +02:00
7000cbc2d2 improve readme 2014-11-12 22:27:29 +02:00
6df242bc97 improve readme 2014-11-12 03:37:36 +02:00
f4453fd729 improve readme 2014-11-12 03:36:17 +02:00
d8011c00ab improve readme 2014-11-09 13:40:39 +02:00
da5d75e97e resolve #209 2014-10-29 22:29:46 +02:00
2adb87ef41 Merge pull request #236 from naNuke/escapeComment
Ignore html comments as well with markupEscape option.
2014-10-10 21:11:23 +03:00
74926c9831 Add test of escaped html comment. 2014-10-10 20:07:41 +02:00
68f3aea036 Ignore html comments as well with markupEscape option. 2014-10-10 19:07:25 +02:00
f91e4dece3 improve consistency 2014-09-26 13:06:40 +03:00
c62365adc4 improve extensibility of test case 2014-09-26 02:06:16 +03:00
bb7a3f41e3 improve readme 2014-09-22 12:01:39 +03:00
f64c1387f8 fix indents 2014-09-22 02:52:45 +03:00
59c77e706b improve consistency 2014-09-22 02:36:42 +03:00
e0965ce09b Merge pull request #224 from hkdobrev/no-markup-option
Add `noMarkup` option to escape user HTML
2014-09-21 23:19:23 +03:00
0a3fde3774 Add noMarkup option to escape user HTML
Resolves #106.

This change introduces a new option - `noMarkup`. You could set it the
`setNoMarkup()` method similar to the `setBreaksEnabled()` one.

Example usage:

``` php
<?php

$parsedown = new Parsedown();
$parsedown->setNoMarkup(true);
$parsedown->text('<div><strong>*Some text*</strong></div>');

// Outputs:
// <p>&lt;div>&lt;strong><em>Some text</em>&lts;/strong>&lt;/div></p>
```
2014-09-20 14:53:19 +03:00
93f7b26427 imp 2014-09-14 01:14:40 +03:00
d53c7dbcd9 Merge pull request #221 from hkdobrev/commonmark-renaming
Rename everything to CommonMark
2014-09-14 00:29:04 +03:00
42222e6b01 Rename everything to CommonMark 2014-09-14 00:11:18 +03:00
e1cb3b7b23 improve readme 2014-09-13 00:11:56 +03:00
5bf56ea041 improve readme 2014-09-12 23:52:06 +03:00
9e98ed04de improve readme 2014-09-11 15:47:59 +03:00
1c89e6f771 improve readme 2014-09-09 14:30:17 +03:00
e7d160049e Merge pull request #218 from hkdobrev/common-mark
Rename Standard Markdown to CommonMark
2014-09-06 01:17:15 +03:00
ce4a29aec5 Rename Standard Markdown to CommonMark
http://blog.codinghorror.com/standard-markdown-is-now-common-markdown/

2d37920c39
2014-09-06 01:12:35 +03:00
8ecf828777 Merge pull request #217 from hkdobrev/standard-markdown
Standard markdown
2014-09-05 23:38:01 +03:00
c18ff7f370 Add Docblock and attribution to JS test runner 2014-09-05 23:28:07 +03:00
6f1fac9823 Add Standard Markdown testsuite.
You could run the Parsedown testsuite only with:
    phpunit --testsuite ParsedownTests

And you could run the Standard Markdown one with:
    phpunit --testsuite StandardMarkdown

See more at http://standardmarkdown.com/
2014-09-05 23:12:33 +03:00
0220a93010 Merge pull request #208 from apfelbox/max-h6
Limit generated headlines to h6
2014-08-26 09:31:52 +03:00
512cc1f065 Limit generated headlines to h6 2014-08-25 21:06:03 +02:00
9437766539 Merge pull request #200 from hkdobrev/html-attributes-slashes
Allow slashes in HTML attributes
2014-08-14 01:27:48 +03:00
1127681d56 Allow slashes in HTML attributes 2014-08-13 23:54:52 +03:00
e33ac1c56e improve readme 2014-06-18 12:27:25 +03:00
d24439ada0 improve test suite 2014-05-21 23:20:46 +03:00
1ae100beab improve comment 2014-05-17 17:37:17 +03:00
82a5a78a36 improve readme 2014-05-17 17:13:00 +03:00
4ede4340ab improve readme 2014-05-16 03:34:43 +03:00
170a6bf770 improve readme 2014-05-16 01:27:54 +03:00
21db821324 improve readme 2014-05-16 01:15:21 +03:00
b384839d15 update readme 2014-05-14 20:07:52 +03:00
2da10d277b resolve #105 2014-05-14 13:14:49 +03:00
532b5ede35 resolve #129 2014-05-14 01:11:05 +03:00
2bd2f81f4f methods should not have more than one optional parameters 2014-05-12 16:18:00 +03:00
e318e66de5 improve consistency 2014-05-12 00:41:00 +03:00
0820d0a607 paragraph doesn't have to use a type 2014-05-12 00:34:47 +03:00
b8d1cfe91a improve extensibility 2014-05-11 22:31:02 +03:00
d85a233611 Merge pull request #171 from scarwu/master
identifyEscapeSequence() needs Array check
2014-05-11 20:57:05 +03:00
973d4a866d add array check 2014-05-11 23:36:01 +08:00
d19c2b6942 improve names 2014-05-10 16:28:00 +03:00
4dde57451d fix consecutive reference links 2014-05-06 17:05:49 +03:00
44686c4f1e improve extensibility 2014-05-06 01:12:27 +03:00
db02ecf259 "reference" is a definition 2014-05-05 14:43:31 +03:00
aa004d4595 improve code organisation 2014-05-05 14:39:40 +03:00
1bb65457ed remove unnecessary comments 2014-05-05 13:46:26 +03:00
0c9a4af8ab improve naming consistency 2014-05-03 18:02:06 +03:00
cc94c1b584 resolve #167 2014-05-02 18:21:10 +03:00
e8d8801db4 resolve #135 2014-05-01 02:44:35 +03:00
521803cdcd resolve #136 2014-05-01 02:42:01 +03:00
0eb480324c resolve #145 2014-05-01 02:02:14 +03:00
7c78aff578 resolve #163 2014-05-01 01:47:14 +03:00
46 changed files with 1260 additions and 792 deletions

View File

@ -1,10 +1,16 @@
language: php
php:
- 7.1
- 7.0
- 5.6
- 5.5
- 5.4
- 5.3
- 5.2
- hhvm
- hhvm-nightly
matrix:
fast_finish: true
allow_failures:
- php: hhvm-nightly

1404
Parsedown.php Executable file → Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,17 +1,25 @@
> You might also like [Caret](http://caret.io?ref=parsedown) - our Markdown editor for Mac / Windows / Linux.
## Parsedown
Better [Markdown](http://en.wikipedia.org/wiki/Markdown) parser for PHP.
[![Build Status](https://img.shields.io/travis/erusev/parsedown/master.svg?style=flat-square)](https://travis-ci.org/erusev/parsedown)
<!--[![Total Downloads](http://img.shields.io/packagist/dt/erusev/parsedown.svg?style=flat-square)](https://packagist.org/packages/erusev/parsedown)-->
- [Demo](http://parsedown.org/demo)
- [Tests](http://parsedown.org/tests/)
Better Markdown Parser in PHP
[Demo](http://parsedown.org/demo) |
[Benchmarks](http://parsedown.org/speed) |
[Tests](http://parsedown.org/tests/) |
[Documentation](https://github.com/erusev/parsedown/wiki/)
### Features
* [Fast](http://parsedown.org/speed)
* [Consistent](http://parsedown.org/consistency)
* [GitHub Flavored](https://help.github.com/articles/github-flavored-markdown)
* [Tested](https://travis-ci.org/erusev/parsedown) in PHP 5.2, 5.3, 5.4, 5.5, 5.6 and [hhvm](http://www.hhvm.com/)
* One File
* Super Fast
* Extensible
* [GitHub flavored](https://help.github.com/articles/github-flavored-markdown)
* Tested in 5.3 to 7.1 and in HHVM
* [Markdown Extra extension](https://github.com/erusev/parsedown-extra)
### Installation
@ -24,3 +32,25 @@ $Parsedown = new Parsedown();
echo $Parsedown->text('Hello _Parsedown_!'); # prints: <p>Hello <em>Parsedown</em>!</p>
```
More examples in [the wiki](https://github.com/erusev/parsedown/wiki/) and in [this video tutorial](http://youtu.be/wYZBY8DEikI).
### Questions
**How does Parsedown work?**
It tries to read Markdown like a human. First, it looks at the lines. Its interested in how the lines start. This helps it recognise blocks. It knows, for example, that if a line starts with a `-` then perhaps it belongs to a list. Once it recognises the blocks, it continues to the content. As it reads, it watches out for special characters. This helps it recognise inline elements (or inlines).
We call this approach "line based". We believe that Parsedown is the first Markdown parser to use it. Since the release of Parsedown, other developers have used the same approach to develop other Markdown parsers in PHP and in other languages.
**Is it compliant with CommonMark?**
It passes most of the CommonMark tests. Most of the tests that don't pass deal with cases that are quite uncommon. Still, as CommonMark matures, compliance should improve.
**Who uses it?**
[phpDocumentor](http://www.phpdoc.org/), [October CMS](http://octobercms.com/), [Bolt CMS](http://bolt.cm/), [Kirby CMS](http://getkirby.com/), [Grav CMS](http://getgrav.org/), [Statamic CMS](http://www.statamic.com/), [Herbie CMS](http://www.getherbie.org/), [RaspberryPi.org](http://www.raspberrypi.org/), [Symfony demo](https://github.com/symfony/symfony-demo) and [more](https://packagist.org/packages/erusev/parsedown/dependents).
**How can I help?**
Use it, star it, share it and if you feel generous, [donate](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=528P3NZQMP8N2).

View File

@ -12,7 +12,10 @@
"homepage": "http://erusev.com"
}
],
"require": {
"php": ">=5.3.0"
},
"autoload": {
"psr-0": {"Parsedown": ""}
}
}
}

View File

@ -2,7 +2,7 @@
<phpunit bootstrap="test/bootstrap.php" colors="true">
<testsuites>
<testsuite>
<file>test/Test.php</file>
<file>test/ParsedownTest.php</file>
</testsuite>
</testsuites>
</phpunit>

74
test/CommonMarkTest.php Normal file
View File

@ -0,0 +1,74 @@
<?php
/**
* Test Parsedown against the CommonMark spec.
*
* Some code based on the original JavaScript test runner by jgm.
*
* @link http://commonmark.org/ CommonMark
* @link http://git.io/8WtRvQ JavaScript test runner
*/
class CommonMarkTest extends \PHPUnit\Framework\TestCase
{
const SPEC_URL = 'https://raw.githubusercontent.com/jgm/stmd/master/spec.txt';
/**
* @dataProvider data
* @param $section
* @param $markdown
* @param $expectedHtml
*/
function test_($section, $markdown, $expectedHtml)
{
$Parsedown = new Parsedown();
$Parsedown->setUrlsLinked(false);
$actualHtml = $Parsedown->text($markdown);
$actualHtml = $this->normalizeMarkup($actualHtml);
$this->assertEquals($expectedHtml, $actualHtml);
}
function data()
{
$spec = file_get_contents(self::SPEC_URL);
$spec = strstr($spec, '<!-- END TESTS -->', true);
$tests = array();
$currentSection = '';
preg_replace_callback(
'/^\.\n([\s\S]*?)^\.\n([\s\S]*?)^\.$|^#{1,6} *(.*)$/m',
function($matches) use ( & $tests, & $currentSection, & $testCount) {
if (isset($matches[3]) and $matches[3]) {
$currentSection = $matches[3];
} else {
$testCount++;
$markdown = $matches[1];
$markdown = preg_replace('/→/', "\t", $markdown);
$expectedHtml = $matches[2];
$expectedHtml = $this->normalizeMarkup($expectedHtml);
$tests []= array(
$currentSection, # section
$markdown, # markdown
$expectedHtml, # html
);
}
},
$spec
);
return $tests;
}
private function normalizeMarkup($markup)
{
$markup = preg_replace("/\n+/", "\n", $markup);
$markup = preg_replace('/^\s+/m', '', $markup);
$markup = preg_replace('/^((?:<[\w]+>)+)\n/m', '$1', $markup);
$markup = preg_replace('/\n((?:<\/[\w]+>)+)$/m', '$1', $markup);
$markup = trim($markup);
return $markup;
}
}

159
test/ParsedownTest.php Normal file
View File

@ -0,0 +1,159 @@
<?php
class ParsedownTest extends \PHPUnit\Framework\TestCase
{
final function __construct($name = null, array $data = array(), $dataName = '')
{
$this->dirs = $this->initDirs();
$this->Parsedown = $this->initParsedown();
parent::__construct($name, $data, $dataName);
}
private $dirs, $Parsedown;
/**
* @return array
*/
protected function initDirs()
{
$dirs []= dirname(__FILE__).'/data/';
return $dirs;
}
/**
* @return Parsedown
*/
protected function initParsedown()
{
$Parsedown = new Parsedown();
return $Parsedown;
}
/**
* @dataProvider data
* @param $test
* @param $dir
*/
function test_($test, $dir)
{
$markdown = file_get_contents($dir . $test . '.md');
$expectedMarkup = file_get_contents($dir . $test . '.html');
$expectedMarkup = str_replace("\r\n", "\n", $expectedMarkup);
$expectedMarkup = str_replace("\r", "\n", $expectedMarkup);
$actualMarkup = $this->Parsedown->text($markdown);
$this->assertEquals($expectedMarkup, $actualMarkup);
}
function data()
{
$data = array();
foreach ($this->dirs as $dir)
{
$Folder = new DirectoryIterator($dir);
foreach ($Folder as $File)
{
/** @var $File DirectoryIterator */
if ( ! $File->isFile())
{
continue;
}
$filename = $File->getFilename();
$extension = pathinfo($filename, PATHINFO_EXTENSION);
if ($extension !== 'md')
{
continue;
}
$basename = $File->getBasename('.md');
if (file_exists($dir . $basename . '.html'))
{
$data []= array($basename, $dir);
}
}
}
return $data;
}
public function test_no_markup()
{
$markdownWithHtml = <<<MARKDOWN_WITH_MARKUP
<div>_content_</div>
sparse:
<div>
<div class="inner">
_content_
</div>
</div>
paragraph
<style type="text/css">
p {
color: red;
}
</style>
comment
<!-- html comment -->
MARKDOWN_WITH_MARKUP;
$expectedHtml = <<<EXPECTED_HTML
<p>&lt;div&gt;<em>content</em>&lt;/div&gt;</p>
<p>sparse:</p>
<p>&lt;div&gt;
&lt;div class=&quot;inner&quot;&gt;
<em>content</em>
&lt;/div&gt;
&lt;/div&gt;</p>
<p>paragraph</p>
<p>&lt;style type=&quot;text/css&quot;&gt;
p {
color: red;
}
&lt;/style&gt;</p>
<p>comment</p>
<p>&lt;!-- html comment --&gt;</p>
EXPECTED_HTML;
$parsedownWithNoMarkup = new Parsedown();
$parsedownWithNoMarkup->setMarkupEscaped(true);
$this->assertEquals($expectedHtml, $parsedownWithNoMarkup->text($markdownWithHtml));
}
public function testLateStaticBinding()
{
include __DIR__ . '/TestParsedown.php';
$parsedown = Parsedown::instance();
$this->assertInstanceOf('Parsedown', $parsedown);
// After instance is already called on Parsedown
// subsequent calls with the same arguments return the same instance
$sameParsedown = TestParsedown::instance();
$this->assertInstanceOf('Parsedown', $sameParsedown);
$this->assertSame($parsedown, $sameParsedown);
$testParsedown = TestParsedown::instance('test late static binding');
$this->assertInstanceOf('TestParsedown', $testParsedown);
$sameInstanceAgain = TestParsedown::instance('test late static binding');
$this->assertSame($testParsedown, $sameInstanceAgain);
}
}

View File

@ -1,65 +0,0 @@
<?php
class Test extends PHPUnit_Framework_TestCase
{
public function __construct($name = null, array $data = array(), $dataName = '')
{
$this->dataDir = dirname(__FILE__).'/data/';
parent::__construct($name, $data, $dataName);
}
private $dataDir;
/**
* @dataProvider data
*/
function test_($filename)
{
$markdown = file_get_contents($this->dataDir . $filename . '.md');
$expectedMarkup = file_get_contents($this->dataDir . $filename . '.html');
$expectedMarkup = str_replace("\r\n", "\n", $expectedMarkup);
$expectedMarkup = str_replace("\r", "\n", $expectedMarkup);
$actualMarkup = Parsedown::instance()->text($markdown);
$this->assertEquals($expectedMarkup, $actualMarkup);
}
function data()
{
$data = array();
$Folder = new DirectoryIterator($this->dataDir);
foreach ($Folder as $File)
{
/** @var $File DirectoryIterator */
if ( ! $File->isFile())
{
continue;
}
$filename = $File->getFilename();
$extension = pathinfo($filename, PATHINFO_EXTENSION);
if ($extension !== 'md')
{
continue;
}
$basename = $File->getBasename('.md');
if (file_exists($this->dataDir . $basename . '.html'))
{
$data []= array($basename);
}
}
return $data;
}
}

5
test/TestParsedown.php Normal file
View File

@ -0,0 +1,5 @@
<?php
class TestParsedown extends Parsedown
{
}

View File

@ -1,3 +1,7 @@
<?php
include 'Parsedown.php';
include 'Parsedown.php';
if ( ! class_exists('\PHPUnit\Framework\TestCase') && class_exists('\PHPUnit_Framework_TestCase')) {
class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
}

View File

@ -1,21 +1,21 @@
<table>
<thead>
<tr>
<th align="left">header 1</th>
<th align="center">header 2</th>
<th align="right">header 2</th>
<th style="text-align: left;">header 1</th>
<th style="text-align: center;">header 2</th>
<th style="text-align: right;">header 2</th>
</tr>
</thead>
<tbody>
<tr>
<td align="left">cell 1.1</td>
<td align="center">cell 1.2</td>
<td align="right">cell 1.3</td>
<td style="text-align: left;">cell 1.1</td>
<td style="text-align: center;">cell 1.2</td>
<td style="text-align: right;">cell 1.3</td>
</tr>
<tr>
<td align="left">cell 2.1</td>
<td align="center">cell 2.2</td>
<td align="right">cell 2.3</td>
<td style="text-align: left;">cell 2.1</td>
<td style="text-align: center;">cell 2.2</td>
<td style="text-align: right;">cell 2.3</td>
</tr>
</tbody>
</table>

View File

@ -4,5 +4,6 @@
<h4>h4</h4>
<h5>h5</h5>
<h6>h6</h6>
<p>####### not a heading</p>
<h1>closed h1</h1>
<p>#</p>

View File

@ -10,6 +10,8 @@
###### h6
####### not a heading
# closed h1 #
#

View File

@ -1,5 +1,12 @@
<div>_content_</div>
<p>sparse:</p>
<p>paragraph</p>
<div>
_content_
</div>
<div class="inner">
_content_
</div>
</div>
<style type="text/css">
p {color: #789;}
</style>
<div>
<a href="/">home</a></div>

View File

@ -1,7 +1,16 @@
<div>_content_</div>
sparse:
paragraph
<div>
_content_
</div>
<div class="inner">
_content_
</div>
</div>
<style type="text/css">
p {color: #789;}
</style>
<div>
<a href="/">home</a></div>

View File

@ -1,4 +1,6 @@
<p>escaped *emphasis*.</p>
<p><code>escaped \*emphasis\* in a code span</code></p>
<pre><code>escaped \*emphasis\* in a code block</code></pre>
<p>\ ` * _ { } [ ] ( ) > # + - . !</p>
<p>\ ` * _ { } [ ] ( ) > # + - . !</p>
<p><em>one_two</em> <strong>one_two</strong></p>
<p><em>one*two</em> <strong>one*two</strong></p>

View File

@ -4,4 +4,8 @@ escaped \*emphasis\*.
escaped \*emphasis\* in a code block
\\ \` \* \_ \{ \} \[ \] \( \) \> \# \+ \- \. \!
\\ \` \* \_ \{ \} \[ \] \( \) \> \# \+ \- \. \!
_one\_two_ __one\_two__
*one\*two* **one\*two**

View File

@ -0,0 +1,5 @@
<!-- single line -->
<p>paragraph</p>
<!--
multiline -->
<p>paragraph</p>

View File

@ -0,0 +1,8 @@
<!-- single line -->
paragraph
<!--
multiline -->
paragraph

View File

@ -1,28 +0,0 @@
<p>Headings:</p>
<h2 id="overview">Overview</h2>
<p>blah</p>
<H2 id="block">Block Elements</H2>
<p>blah</p>
<h3 id="span">
Span Elements
</h3>
<p>blah</p>
<p>Hr's:</p>
<hr>
<p>blah</p>
<hr/>
<p>blah</p>
<hr />
<p>blah</p>
<hr>
<p>blah</p>
<hr/>
<p>blah</p>
<hr />
<p>blah</p>
<hr class="foo" id="bar" />
<p>blah</p>
<hr class="foo" id="bar"/>
<p>blah</p>
<hr class="foo" id="bar" >
<p>blah</p>

View File

@ -1,39 +0,0 @@
Headings:
<h2 id="overview">Overview</h2>
blah
<H2 id="block">Block Elements</H2>
blah
<h3 id="span">
Span Elements
</h3>
blah
Hr's:
<hr>
blah
<hr/>
blah
<hr />
blah
<hr>
blah
<hr/>
blah
<hr />
blah
<hr class="foo" id="bar" />
blah
<hr class="foo" id="bar"/>
blah
<hr class="foo" id="bar" >
blah

View File

@ -1 +1,2 @@
<p><img alt="Markdown Logo" src="/md.png" /></p>
<p><img src="/md.png" alt="Markdown Logo" /></p>
<p>![missing reference]</p>

View File

@ -1,3 +1,5 @@
![Markdown Logo][image]
[image]: /md.png
![missing reference]

View File

@ -1 +1,2 @@
<p><img alt="alt" src="/md.png" title="title" /></p>
<p><img src="/md.png" alt="alt" title="title" /></p>
<p><img src="/md.png" alt="blank title" title="" /></p>

View File

@ -1 +1,3 @@
![alt](/md.png "title")
![alt](/md.png "title")
![blank title](/md.png "")

View File

@ -1,3 +1,4 @@
<p>an <a href="http://example.com">implicit</a> reference link</p>
<p>an <a href="http://example.com">implicit</a> reference link with an empty link definition</p>
<p>an <a href="http://example.com">implicit</a> reference link followed by <a href="http://cnn.com">another</a></p>
<p>an <a href="http://example.com" title="Example">explicit</a> reference link with a title</p>

View File

@ -4,6 +4,10 @@ an [implicit] reference link
an [implicit][] reference link with an empty link definition
an [implicit][] reference link followed by [another][]
[another]: http://cnn.com
an [explicit][example] reference link with a title
[example]: http://example.com "Example"

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +1,6 @@
<p><a href="http://example.com" title="Title">single quotes</a> and <a href="http://example.com" title="Title">double quotes</a></p>
<p><a href="http://example.com" title="Title">single quotes</a></p>
<p><a href="http://example.com" title="Title">double quotes</a></p>
<p><a href="http://example.com" title="">single quotes blank</a></p>
<p><a href="http://example.com" title="">double quotes blank</a></p>
<p><a href="http://example.com" title="2 Words">space</a></p>
<p><a href="http://example.com/url-(parentheses)" title="Title">parentheses</a></p>

View File

@ -1 +1,11 @@
[single quotes](http://example.com 'Title') and [double quotes](http://example.com "Title")
[single quotes](http://example.com 'Title')
[double quotes](http://example.com "Title")
[single quotes blank](http://example.com '')
[double quotes blank](http://example.com "")
[space](http://example.com "2 Words")
[parentheses](http://example.com/url-(parentheses) "Title")

View File

@ -1,4 +1,6 @@
<blockquote>
<p>quote
the rest of it</p>
<p>another paragraph
the rest of it</p>
</blockquote>

View File

@ -1,2 +1,5 @@
> quote
the rest of it
> another paragraph
the rest of it

View File

@ -8,6 +8,6 @@
<li>two</li>
</ol>
<p>large numbers:</p>
<ol>
<ol start="123">
<li>one</li>
</ol>

View File

@ -1,4 +0,0 @@
<hr />
<p>attributes:</p>
<hr style="background: #9bd;" />
<p>...</p>

View File

@ -1,7 +0,0 @@
<hr />
attributes:
<hr style="background: #9bd;" />
...

View File

@ -0,0 +1,12 @@
<hr>
<p>paragraph</p>
<hr/>
<p>paragraph</p>
<hr />
<p>paragraph</p>
<hr class="foo" id="bar" />
<p>paragraph</p>
<hr class="foo" id="bar"/>
<p>paragraph</p>
<hr class="foo" id="bar" >
<p>paragraph</p>

View File

@ -0,0 +1,12 @@
<hr>
paragraph
<hr/>
paragraph
<hr />
paragraph
<hr class="foo" id="bar" />
paragraph
<hr class="foo" id="bar"/>
paragraph
<hr class="foo" id="bar" >
paragraph

View File

@ -20,17 +20,17 @@
<table>
<thead>
<tr>
<th align="left">header 1</th>
<th style="text-align: left;">header 1</th>
<th>header 2</th>
</tr>
</thead>
<tbody>
<tr>
<td align="left">cell 1.1</td>
<td style="text-align: left;">cell 1.1</td>
<td>cell 1.2</td>
</tr>
<tr>
<td align="left">cell 2.1</td>
<td style="text-align: left;">cell 2.1</td>
<td>cell 2.2</td>
</tr>
</tbody>

View File

@ -1,4 +1,5 @@
<p>an <b>important</b> <a href=''>link</a></p>
<p>broken<br/>
line</p>
<p><b>inline tag</b> at the beginning</p>
<p><b>inline tag</b> at the beginning</p>
<p><span><a href="http://example.com">http://example.com</a></span></p>

View File

@ -3,4 +3,6 @@ an <b>important</b> <a href=''>link</a>
broken<br/>
line
<b>inline tag</b> at the beginning
<b>inline tag</b> at the beginning
<span>http://example.com</span>

View File

@ -0,0 +1,8 @@
<div>
line 1
line 2
line 3
line 4
</div>

8
test/data/sparse_html.md Normal file
View File

@ -0,0 +1,8 @@
<div>
line 1
line 2
line 3
line 4
</div>

View File

@ -1,6 +1,6 @@
<p>AT&amp;T has an ampersand in their name</p>
<p>this &amp; that</p>
<p>4 &lt; 5 and 6 > 5</p>
<p>4 &lt; 5 and 6 &gt; 5</p>
<p><a href="http://example.com/autolink?a=1&amp;b=2">http://example.com/autolink?a=1&amp;b=2</a></p>
<p><a href="/script?a=1&amp;b=2">inline link</a></p>
<p><a href="http://example.com/?a=1&amp;b=2">reference link</a></p>

View File

@ -11,8 +11,12 @@
<td><del>cell</del> 1.2</td>
</tr>
<tr>
<td><code>cell</code> 2.1</td>
<td>cell 2.2</td>
<td><code>|</code> 2.1</td>
<td>| 2.2</td>
</tr>
<tr>
<td><code>\|</code> 2.1</td>
<td><a href="/">link</a></td>
</tr>
</tbody>
</table>

View File

@ -1,4 +1,5 @@
| _header_ 1 | header 2 |
| ------------ | ------------ |
| _cell_ 1.1 | ~~cell~~ 1.2 |
| `cell` 2.1 | cell 2.2 |
| `|` 2.1 | \| 2.2 |
| `\|` 2.1 | [link](/) |