.travis.yml

@@ -1,25 +1,25 @@
 language: php
 
+dist: trusty
+sudo: false
+
 matrix:
   include:
     - php: 5.3
       dist: precise
     - php: 5.4
-      dist: trusty
     - php: 5.5
-      dist: trusty
     - php: 5.6
-      dist: xenial
     - php: 7.0
-      dist: xenial
     - php: 7.1
-      dist: bionic
     - php: 7.2
-      dist: bionic
-    - php: 7.3
-      dist: bionic
-    - php: 7.4
-      dist: bionic
+    - 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

Parsedown.php

@@ -17,7 +17,7 @@ class Parsedown
 {
     # ~
 
-    const version = '1.8.0-beta-7';
+    const version = '1.8.0-beta-4';
 
     # ~
 
@@ -107,7 +107,6 @@ class Parsedown
         'ftp://',
         'ftps://',
         'mailto:',
-        'tel:',
         'data:image/png;base64,',
         'data:image/gif;base64,',
         'data:image/jpeg;base64,',
@@ -392,11 +391,6 @@ class Parsedown
         }
     }
 
-    protected function blockCodeComplete($Block)
-    {
-        return $Block;
-    }
-
     #
     # Comment
 
@@ -470,21 +464,7 @@ class Parsedown
 
         if ($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");
+            $Element['attributes'] = array('class' => "language-$infostring");
         }
 
         $Block = array(
@@ -528,11 +508,6 @@ class Parsedown
         return $Block;
     }
 
-    protected function blockFencedCodeComplete($Block)
-    {
-        return $Block;
-    }
-
     #
     # Header
 
@@ -556,7 +531,7 @@ class Parsedown
 
         $Block = array(
             'element' => array(
-                'name' => 'h' . $level,
+                'name' => 'h' . min(6, $level),
                 'handler' => array(
                     'function' => 'lineElements',
                     'argument' => $text,
@@ -1134,9 +1109,6 @@ class Parsedown
 
     protected function lineElements($text, $nonNestables = array())
     {
-        # standardize line breaks
-        $text = str_replace(array("\r\n", "\r"), "\n", $text);
-
         $Elements = array();
 
         $nonNestables = (empty($nonNestables)
@@ -1494,7 +1466,7 @@ class Parsedown
 
     protected function inlineSpecialCharacter($Excerpt)
     {
-        if (substr($Excerpt['text'], 1, 1) !== ' ' and strpos($Excerpt['text'], ';') !== false
+        if ($Excerpt['text'][1] !== ' ' and strpos($Excerpt['text'], ';') !== false
             and preg_match('/^&(#?+[0-9a-zA-Z]++);/', $Excerpt['text'], $matches)
         ) {
             return array(

README.md

@@ -1,61 +1,60 @@
-<!-- ![Parsedown](https://i.imgur.com/yE8afYV.png) -->
+> I also make [Caret](https://caret.io?ref=parsedown) - a Markdown editor for Mac and PC.
 
-<p align="center"><img alt="Parsedown" src="https://i.imgur.com/fKVY6Kz.png" width="240" /></p>
+## Parsedown
 
-<h1>Parsedown</h1>
+[![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)-->
 
-[![Build Status](https://travis-ci.org/erusev/parsedown.svg)](https://travis-ci.org/erusev/parsedown)
-[![Total Downloads](https://poser.pugx.org/erusev/parsedown/d/total.svg)](https://packagist.org/packages/erusev/parsedown)
-[![Version](https://poser.pugx.org/erusev/parsedown/v/stable.svg)](https://packagist.org/packages/erusev/parsedown)
-[![License](https://poser.pugx.org/erusev/parsedown/license.svg)](https://packagist.org/packages/erusev/parsedown)
+Better Markdown Parser in PHP
 
-Better Markdown Parser in PHP - <a href="http://parsedown.org/demo">Demo</a>.
+[Demo](http://parsedown.org/demo) |
+[Benchmarks](http://parsedown.org/speed) |
+[Tests](http://parsedown.org/tests/) |
+[Documentation](https://github.com/erusev/parsedown/wiki/)
 
-## Features
+### Features
 
 * One File
 * No Dependencies
-* [Super Fast](http://parsedown.org/speed)
+* Super Fast
 * Extensible
-* [GitHub flavored](https://github.github.com/gfm)
-* [Tested](http://parsedown.org/tests/) in 5.3 to 7.3
+* [GitHub flavored](https://help.github.com/articles/github-flavored-markdown)
+* Tested in 5.3 to 7.2 and in HHVM
 * [Markdown Extra extension](https://github.com/erusev/parsedown-extra)
 
-## Installation
-
-Install the [composer package]:
+### Installation
+#### Composer
+Install the [composer package] by running the following command:
 
     composer require erusev/parsedown
 
-Or download the [latest release] and include `Parsedown.php`
+#### Manual
+1. Download the "Source code" from the [latest release]
+2. Include `Parsedown.php`
 
 [composer package]: https://packagist.org/packages/erusev/parsedown "The Parsedown package on packagist.org"
 [latest release]: https://github.com/erusev/parsedown/releases/latest "The latest release of Parsedown"
 
-## Example
+### Example
 
-```php
+``` php
 $Parsedown = new Parsedown();
 
 echo $Parsedown->text('Hello _Parsedown_!'); # prints: <p>Hello <em>Parsedown</em>!</p>
-```
-
-You can also parse inline markdown only:
-
-```php
+// you can also parse inline markdown only
 echo $Parsedown->line('Hello _Parsedown_!'); # prints: Hello <em>Parsedown</em>!
 ```
 
 More examples in [the wiki](https://github.com/erusev/parsedown/wiki/) and in [this video tutorial](http://youtu.be/wYZBY8DEikI).
 
-## Security
+### Security
 
 Parsedown is capable of escaping user-input within the HTML that it generates. Additionally Parsedown will apply sanitisation to additional scripting vectors (such as scripting link destinations) that are introduced by the markdown syntax itself.
 
 To tell Parsedown that it is processing untrusted user-input, use the following:
-
 ```php
-$Parsedown->setSafeMode(true);
+$parsedown = new Parsedown;
+$parsedown->setSafeMode(true);
 ```
 
 If instead, you wish to allow HTML within untrusted user-input, but still want output to be free from XSS it is recommended that you make use of a HTML sanitiser that allows HTML tags to be whitelisted, like [HTML Purifier](http://htmlpurifier.org/).
@@ -66,19 +65,18 @@ In both cases you should strongly consider employing defence-in-depth measures,
 
 Safe mode does not necessarily yield safe results when using extensions to Parsedown. Extensions should be evaluated on their own to determine their specific safety against XSS.
 
-## Escaping HTML
-
-> **WARNING:** This method isn't safe from XSS!
+### Escaping HTML
+> ⚠️  **WARNING:** This method isn't safe from XSS!
 
 If you wish to escape HTML **in trusted input**, you can use the following:
-
 ```php
-$Parsedown->setMarkupEscaped(true);
+$parsedown = new Parsedown;
+$parsedown->setMarkupEscaped(true);
 ```
 
 Beware that this still allows users to insert unsafe scripting vectors, such as links like `[xss](javascript:alert%281%29)`.
 
-## Questions
+### Questions
 
 **How does Parsedown work?**
 
@@ -92,12 +90,8 @@ It passes most of the CommonMark tests. Most of the tests that don't pass deal w
 
 **Who uses it?**
 
-[Laravel Framework](https://laravel.com/), [Bolt CMS](http://bolt.cm/), [Grav CMS](http://getgrav.org/), [Herbie CMS](http://www.getherbie.org/), [Kirby CMS](http://getkirby.com/), [October CMS](http://octobercms.com/), [Pico CMS](http://picocms.org), [Statamic CMS](http://www.statamic.com/), [phpDocumentor](http://www.phpdoc.org/), [RaspberryPi.org](http://www.raspberrypi.org/), [Symfony Demo](https://github.com/symfony/demo) and [more](https://packagist.org/packages/erusev/parsedown/dependents).
+[Laravel Framework](https://laravel.com/), [Bolt CMS](http://bolt.cm/), [Grav CMS](http://getgrav.org/), [Herbie CMS](http://www.getherbie.org/), [Kirby CMS](http://getkirby.com/), [October CMS](http://octobercms.com/), [Pico CMS](http://picocms.org), [Statamic CMS](http://www.statamic.com/), [phpDocumentor](http://www.phpdoc.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).
-
-**What else should I know?**
-
-I also make [Nota](https://nota.md/) — a writing app designed for Markdown files :)