Merge branch 'extra' into lib
Conflicts: Michelf/Markdown.php PHP Markdown Extra Readme.text
This commit is contained in:
Michel Fortin
commit
b3e016bd2a
2 changed files with 111 additions and 0 deletions
|
|
@ -1302,9 +1302,16 @@ class Markdown implements MarkdownInterface {
|
|||
>
|
||||
}xi',
|
||||
array(&$this, '_doAutoLinks_email_callback'), $text);
|
||||
$text = preg_replace_callback('{<(tel:([^\'">\s]+))>}i',array(&$this, '_doAutoLinks_tel_callback'), $text);
|
||||
|
||||
return $text;
|
||||
}
|
||||
protected function _doAutoLinks_tel_callback($matches) {
|
||||
$url = $this->encodeAttribute($matches[1]);
|
||||
$tel = $this->encodeAttribute($matches[2]);
|
||||
$link = "<a href=\"$url\">$tel</a>";
|
||||
return $this->hashPart($link);
|
||||
}
|
||||
protected function _doAutoLinks_url_callback($matches) {
|
||||
$url = $this->encodeAttribute($matches[1]);
|
||||
$link = "<a href=\"$url\">$url</a>";
|
||||
|
|
@ -3097,3 +3104,94 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown {
|
|||
|
||||
}
|
||||
|
||||
<<<<<<< HEAD:Michelf/Markdown.php
|
||||
=======
|
||||
|
||||
/*
|
||||
|
||||
PHP Markdown Extra
|
||||
==================
|
||||
|
||||
Description
|
||||
-----------
|
||||
|
||||
This is a PHP port of the original Markdown formatter written in Perl
|
||||
by John Gruber. This special "Extra" version of PHP Markdown features
|
||||
further enhancements to the syntax for making additional constructs
|
||||
such as tables and definition list.
|
||||
|
||||
Markdown is a text-to-HTML filter; it translates an easy-to-read /
|
||||
easy-to-write structured text format into HTML. Markdown's text format
|
||||
is mostly similar to that of plain text email, and supports features such
|
||||
as headers, *emphasis*, code blocks, blockquotes, and links.
|
||||
|
||||
Markdown's syntax is designed not as a generic markup language, but
|
||||
specifically to serve as a front-end to (X)HTML. You can use span-level
|
||||
HTML tags anywhere in a Markdown document, and you can use block level
|
||||
HTML tags (like <div> and <table> as well).
|
||||
|
||||
For more information about Markdown's syntax, see:
|
||||
|
||||
<http://daringfireball.net/projects/markdown/>
|
||||
|
||||
|
||||
Bugs
|
||||
----
|
||||
|
||||
To file bug reports please send email to:
|
||||
|
||||
<michel.fortin@michelf.ca>
|
||||
|
||||
Please include with your report: (1) the example input; (2) the output you
|
||||
expected; (3) the output Markdown actually produced.
|
||||
|
||||
|
||||
Version History
|
||||
---------------
|
||||
|
||||
See the readme file for detailed release notes for this version.
|
||||
|
||||
|
||||
Copyright and License
|
||||
---------------------
|
||||
|
||||
PHP Markdown & Extra
|
||||
Copyright (c) 2004-2013 Michel Fortin
|
||||
<http://michelf.ca/>
|
||||
All rights reserved.
|
||||
|
||||
Based on Markdown
|
||||
Copyright (c) 2003-2006 John Gruber
|
||||
<http://daringfireball.net/>
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
|
||||
* Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
|
||||
* Neither the name "Markdown" nor the names of its contributors may
|
||||
be used to endorse or promote products derived from this software
|
||||
without specific prior written permission.
|
||||
|
||||
This software is provided by the copyright holders and contributors "as
|
||||
is" and any express or implied warranties, including, but not limited
|
||||
to, the implied warranties of merchantability and fitness for a
|
||||
particular purpose are disclaimed. In no event shall the copyright owner
|
||||
or contributors be liable for any direct, indirect, incidental, special,
|
||||
exemplary, or consequential damages (including, but not limited to,
|
||||
procurement of substitute goods or services; loss of use, data, or
|
||||
profits; or business interruption) however caused and on any theory of
|
||||
liability, whether in contract, strict liability, or tort (including
|
||||
negligence or otherwise) arising in any way out of the use of this
|
||||
software, even if advised of the possibility of such damage.
|
||||
|
||||
*/
|
||||
?>
|
||||
>>>>>>> extra:markdown.php
|
||||
|
|
|
|||
13
Readme.md
13
Readme.md
|
|
@ -162,6 +162,19 @@ too.
|
|||
Version History
|
||||
---------------
|
||||
|
||||
Current Version:
|
||||
|
||||
* Added backtick fenced code blocks, originally from Github-flavored Markdown.
|
||||
|
||||
* Added support for the `tel:` URL scheme in automatic links.
|
||||
|
||||
<tel:+1-111-111-1111>
|
||||
|
||||
is converted to:
|
||||
|
||||
<a href="tel:+1-111-111-1111">+1-111-111-1111</a>
|
||||
|
||||
|
||||
PHP Markdown Lib 1.3 (11 Apr 2013):
|
||||
|
||||
This is the first release of PHP Markdown Lib. This package requires PHP
|
||||
|
|
|
|||
Loading…
Reference in a new issue