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

Compare commits

..

15 Commits

Author SHA1 Message Date
87b57bf3cb Add test to prevent regression 2019-04-10 21:54:34 +01:00
fe7a50eceb New release due to mislabeled previous tag 2019-03-17 18:47:21 +00:00
7d4c06cb52 Bump version 2019-03-17 17:19:07 +00:00
f7b66e6b20 Merge pull request #701 from aidantwoods/fix/spaces-in-class-names-1.8.x-beta
[1.8.x-beta] Fix spaces in class names
2019-03-17 17:10:10 +00:00
811bc32726 Fix test platforms 2019-03-17 17:04:25 +00:00
8fd5464c46 [1.8.x-beta] Fix spaces in class names 2019-03-17 17:01:52 +00:00
c26a2ee4bf Bump beta version 2018-06-11 19:15:32 +01:00
ba3b60d6e4 Merge pull request #641 from aidantwoods/fix/api-stability-complete-function-removal
Restore existence of protected API methods
2018-06-08 14:38:42 +01:00
0b1e6b8c86 Restore existence of protected API methods 2018-06-07 19:47:09 +01:00
1f69f7e697 Bump version 2018-05-08 22:46:15 +01:00
c83af0a7d5 Merge pull request #628 from aidantwoods/fix/revert-rawHtml-breaks-insertion
Preserve plain-text in AST to avoid blinding extensions to it
2018-05-08 22:41:44 +01:00
4686daf8c2 Preserve plain-text in AST to avoid blinding extensions to it 2018-05-08 22:32:57 +01:00
c9e7183cfa Merge pull request #627 from aidantwoods/fix/hidden-blocks
Intepret special "hidden" key as an empty element
2018-05-08 22:07:51 +01:00
9eed1104e7 Intepret special "hidden" key as an empty element 2018-05-08 21:54:30 +01:00
fd95703da5 Version bump 2018-05-07 14:26:12 +01:00
4 changed files with 50 additions and 14 deletions

View File

@ -13,13 +13,11 @@ matrix:
- php: 7.0
- php: 7.1
- php: 7.2
- php: 7.3
- php: nightly
- php: hhvm
- php: hhvm-nightly
fast_finish: true
allow_failures:
- php: nightly
- php: hhvm-nightly
install:
- composer install --prefer-dist --no-interaction --no-progress

View File

@ -17,7 +17,7 @@ class Parsedown
{
# ~
const version = '1.8.0-beta-1';
const version = '1.8.0-beta-7';
# ~
@ -317,9 +317,16 @@ class Parsedown
protected function extractElement(array $Component)
{
if ( ! isset($Component['element']) and isset($Component['markup']))
if ( ! isset($Component['element']))
{
$Component['element'] = array('rawHtml' => $Component['markup']);
if (isset($Component['markup']))
{
$Component['element'] = array('rawHtml' => $Component['markup']);
}
elseif (isset($Component['hidden']))
{
$Component['element'] = array();
}
}
return $Component['element'];
@ -384,6 +391,11 @@ class Parsedown
}
}
protected function blockCodeComplete($Block)
{
return $Block;
}
#
# Comment
@ -457,7 +469,21 @@ class Parsedown
if ($infostring !== '')
{
$Element['attributes'] = array('class' => "language-$infostring");
/**
* https://www.w3.org/TR/2011/WD-html5-20110525/elements.html#classes
* Every HTML element may have a class attribute specified.
* The attribute, if specified, must have a value that is a set
* of space-separated tokens representing the various classes
* that the element belongs to.
* [...]
* The space characters, for the purposes of this specification,
* are U+0020 SPACE, U+0009 CHARACTER TABULATION (tab),
* U+000A LINE FEED (LF), U+000C FORM FEED (FF), and
* U+000D CARRIAGE RETURN (CR).
*/
$language = substr($infostring, 0, strcspn($infostring, " \t\n\f\r"));
$Element['attributes'] = array('class' => "language-$language");
}
$Block = array(
@ -501,6 +527,11 @@ class Parsedown
return $Block;
}
protected function blockFencedCodeComplete($Block)
{
return $Block;
}
#
# Header
@ -1208,14 +1239,14 @@ class Parsedown
'element' => array(),
);
$safeText = self::escape($text, true);
$Inline['element']['rawHtml'] = preg_replace(
$Inline['element']['elements'] = self::pregReplaceElements(
$this->breaksEnabled ? '/[ ]*+\n/' : '/(?:[ ]*+\\\\|[ ]{2,}+)\n/',
"<br />\n",
$safeText
array(
array('name' => 'br'),
array('text' => "\n"),
),
$text
);
$Inline['element']['allowRawHtmlInSafeMode'] = true;
return $Inline;
}

View File

@ -15,4 +15,6 @@ still a fenced code block</code></pre>
<pre><code>foo
bar</code></pre>
bar</code></pre>
<pre><code class="language-php">&lt;?php
echo "Hello World";</code></pre>

View File

@ -35,4 +35,9 @@ foo
bar
```
```php some-class
<?php
echo "Hello World";
```