Commit graph

497 commits

Author SHA1 Message Date
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
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
Michel Fortin
ab94f5c4c5 Merge branch 'lib' of git://github.com/JasWSInc/php-markdown into lib 2013-11-28 15:10:23 -05:00
Michel Fortin
fe2c74424e Added instructions in the Readme about submitting pull requests, with reference to MDTest.
Fixes #114.
2013-11-28 10:21:43 -05:00
Michel Fortin
2b13410202 Merge branch 'patch-1' of git://github.com/Cangit/php-markdown into lib 2013-11-28 09:51:56 -05:00
David Angel
2d578a8607 Minor documentation typo fix.
‘praser’ to ‘parser’
2013-11-25 15:20:06 -05:00
Cangit
91e0abc040 Update Readme.md
Typo fix in version number.
2013-11-19 11:06:15 +01: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
Florian Dorn
b16addc663 added support for the tel: url-scheme 2013-09-12 17:16:10 +02:00
Michel Fortin
9dbd8352de Merge branch 'lib' of git://github.com/donatj/php-markdown into lib 2013-08-02 06:50:14 -04: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
Michel Fortin
7515e20f95 Removed a forgotten paragraph in the readme that does no longer apply in the lib version. 2013-07-27 22:48:05 -04: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
Matt Gorle matt@gorle.co.uk
ae374da0b0 Removed debug text. 2013-07-16 20:16:27 +01:00
Matt Gorle matt@gorle.co.uk
16c510e924 Moved enhanced ordered list implementation to MarkdownExtra class.
Added configuration variable to enable enhanced ordered list.
Enhanced ordered list is disabled by default.
Removed extra 'start="1"' when the list's starting value is 1
Removed 'start="1"' on unordered lists
2013-07-16 20:10:39 +01:00
Michel Fortin
f7f33720a6 Merge branch 'lib' of git://github.com/yosymfony/php-markdown into lib 2013-07-16 12:38:13 -04:00
YoSymfony
a315693e5e Fixed the configuration variables links 2013-07-16 18:21:19 +02:00
Matt Gorle
b4995d75b8 Implemented some of Enhanced Ordered Lists: numerically ordered lists
now start with the first number given.  For example, if you start your
list in Markdown as follows:

2. second list item
3. third list item

then Markdown will produce this:

<ol start="2">
<li>second list item</li>
<li>third list item</li>
</ol>
2013-07-16 09:17:20 +01:00
Claus Due
b496f5410c Unify indentations to tabs in composer.json 2013-07-01 18:20:03 +02:00
Mark Trapp
b2dd8b41cf Add interface. 2013-05-10 22:22:50 -07:00
Michel Fortin
53f6388717 Removed doppelgänger Usage section in the Readme.md file. 2013-04-13 15:18:58 -04:00
Jan Minar
ce4aa777ca Spell-check Readme.md 2013-04-13 18:54:58 +01:00
Michel Fortin
fcdd3e0781 Documentation revamp. 2013-04-11 14:53:11 -04:00
Michel Fortin
9e034f6970 Removed constants for related versions of PHP Markdown from PHP Markdown Lib.
This is probably more trouble to maintain than it is worth. Also, people will mistake this for the version to use when filling bug reports.
2013-04-11 14:22:57 -04:00
Michel Fortin
9bb43f4208 Merge branch 'extra' into lib
Conflicts:
	Michelf/Markdown.php
2013-04-11 14:22:37 -04:00
Michel Fortin
b503c58756 Typo in version number. 2013-04-11 14:21:44 -04:00
Michel Fortin
0cf3345f8c Set PHP Markdown Lib version to 1.3. Merge branch 'extra' into lib.
Conflicts:
	Michelf/Markdown.php
	Readme.md
2013-04-11 14:20:50 -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
57a59c71b9 Bumped version to 1.3-rc2. 2013-04-10 22:34:11 -04:00
Michel Fortin
c8c17c316b transform() should be public. 2013-04-08 16:41:52 -04:00
Michel Fortin
a90ca11375 Updated Readme file for new Lib 1.3-rc1 2013-04-08 08:40:51 -04:00
Michel Fortin
2b1d98bc35 Bumped MARKDOWNLIB_VERSION to 1.3-rc1 2013-04-08 08:38:01 -04:00
Michel Fortin
e045d23969 Revealed a few quirks in Lib version now that unit tests are in place. 2013-04-08 07:51:34 -04:00
Michel Fortin
6070ddbd7c Oops, class constants cannot have a visibility attribute. 2013-04-08 07:34:29 -04:00
Michel Fortin
3ffc75e7c0 Merge branch 'extra' into lib 2013-04-07 15:11:15 -04:00
Michel Fortin
7a00f238c3 Merge branch 'master' into extra 2013-04-07 15:11:00 -04:00