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

Compare commits

...

4 Commits
1.4.2 ... 1.4.5

Author SHA1 Message Date
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
4 changed files with 17 additions and 8 deletions

View File

@ -558,6 +558,11 @@ class Parsedown
return $Block; return $Block;
} }
if ($Line['text'][0] === '[' and $this->blockReference($Line))
{
return $Block;
}
if ( ! isset($Block['interrupted'])) if ( ! isset($Block['interrupted']))
{ {
$text = preg_replace('/^[ ]{0,4}/', '', $Line['body']); $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
@ -905,9 +910,9 @@ class Parsedown
$row = trim($row); $row = trim($row);
$row = trim($row, '|'); $row = trim($row, '|');
$cells = explode('|', $row); preg_match_all('/(?:(\\\\[|])|[^|`]|`[^`]+`|`)+/', $row, $matches);
foreach ($cells as $index => $cell) foreach ($matches[0] as $index => $cell)
{ {
$cell = trim($cell); $cell = trim($cell);
@ -1511,7 +1516,7 @@ class Parsedown
# Read-only # Read-only
protected $specialCharacters = array( protected $specialCharacters = array(
'\\', '`', '*', '_', '{', '}', '[', ']', '(', ')', '>', '#', '+', '-', '.', '!', '\\', '`', '*', '_', '{', '}', '[', ']', '(', ')', '>', '#', '+', '-', '.', '!', '|',
); );
protected $StrongRegex = array( protected $StrongRegex = array(

View File

@ -10,9 +10,8 @@ Better Markdown Parser in PHP
* [Consistent](http://parsedown.org/consistency) * [Consistent](http://parsedown.org/consistency)
* [GitHub flavored](https://help.github.com/articles/github-flavored-markdown) * [GitHub flavored](https://help.github.com/articles/github-flavored-markdown)
* [Tested](http://parsedown.org/tests/) in PHP 5.2, 5.3, 5.4, 5.5, 5.6 and [hhvm](http://www.hhvm.com/) * [Tested](http://parsedown.org/tests/) in PHP 5.2, 5.3, 5.4, 5.5, 5.6 and [hhvm](http://www.hhvm.com/)
* Extensible * [Extensible](https://github.com/erusev/parsedown/wiki/Writing-Extensions)
* [Markdown Extra extension](https://github.com/erusev/parsedown-extra) * [Markdown Extra extension](https://github.com/erusev/parsedown-extra)
* [JavaScript port](https://github.com/hkdobrev/parsedown.js) under development
### Installation ### Installation

View File

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

View File

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