diff --git a/admin/src/js/hyperdown.js b/admin/src/js/hyperdown.js index 15969d10..c485d5ff 100644 --- a/admin/src/js/hyperdown.js +++ b/admin/src/js/hyperdown.js @@ -4,7 +4,7 @@ slice = [].slice; Parser = (function() { - var array_keys, array_values, htmlspecialchars, pL, preg_quote, str_replace, trim, ucfirst; + var array_keys, array_values, htmlspecialchars, preg_quote, str_replace, trim, ucfirst; ucfirst = function(str) { return (str.charAt(0)).toUpperCase() + str.substring(1); @@ -14,8 +14,6 @@ return str.replace(/[-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"); }; - pL = 'A-Za-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0\u08A2-\u08AC\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC'; - str_replace = function(search, replace, str) { var i, j, l, len, len1, val; if (search instanceof Array) { @@ -291,7 +289,6 @@ }; Parser.prototype.parseInline = function(text, whiteList, clearHolders, enableAutoLink) { - var regex; if (whiteList == null) { whiteList = ''; } @@ -409,8 +406,7 @@ text = this.parseInlineCallback(text); text = text.replace(/<([_a-z0-9-\.\+]+@[^@]+\.[a-z]{2,})>/ig, '$1'); if (enableAutoLink) { - regex = new RegExp("(^|[^\"])((https?):[" + pL + "_0-9-\\./%#!@\\?\\[\\]\\+=~\\|\\,&\\(\\)]+)($|[^\"])", 'ig'); - text = text.replace(regex, (function(_this) { + text = text.replace(/(^|[^\"])((https?):\S+)($|[^\"])/ig, (function(_this) { return function() { var link, matches; matches = 1 <= arguments.length ? slice.call(arguments, 0) : []; @@ -520,9 +516,9 @@ }; Parser.prototype.parseBlockList = function(block, key, line, state) { - var matches, space; + var matches, space, type; if ((this.isBlock('list')) && !line.match(/^\s*\[((?:[^\]]|\\\]|\\\[)+?)\]:\s*(.+)$/)) { - if ((state.empty <= 1) && !!(matches = line.match(/^(\s+)/)) && matches[1].length > block[3]) { + if ((state.empty <= 1) && !!(matches = line.match(/^(\s*)\S+/)) && matches[1].length >= (block[3][0] + state.empty)) { state.empty = 0; this.setBlock(key); return false; @@ -535,10 +531,15 @@ if (!!(matches = line.match(/^(\s*)((?:[0-9]+\.)|\-|\+|\*)\s+/i))) { space = matches[1].length; state.empty = 0; + type = 0 <= '+-*'.indexOf(matches[2]) ? 'ul' : 'ol'; if (this.isBlock('list')) { - this.setBlock(key, space); + if (space < block[3][0] || (space === block[3][0] && type !== block[3][1])) { + this.startBlock('list', key, [space, type]); + } else { + this.setBlock(key); + } } else { - this.startBlock('list', key, space); + this.startBlock('list', key, [space, type]); } return false; } @@ -854,8 +855,8 @@ if ('normal' === type) { types = ['list', 'quote']; if (from === to && (lines[from].match(/^\s*$/)) && (prevBlock != null) && (nextBlock != null)) { - if (prevBlock[0] === nextBlock[0] && (types.indexOf(prevBlock[0])) >= 0) { - blocks[key - 1] = [prevBlock[0], prevBlock[1], nextBlock[2], null]; + if (prevBlock[0] === nextBlock[0] && (types.indexOf(prevBlock[0])) >= 0 && (prevBlock[0] !== 'list' || (prevBlock[3][0] === nextBlock[3][0] && prevBlock[3][1] === nextBlock[3][1]))) { + blocks[key - 1] = [prevBlock[0], prevBlock[1], nextBlock[2], prevBlock[3] != null ? prevBlock[3] : null]; blocks.splice(key, 2); moved = true; } @@ -952,69 +953,26 @@ }; Parser.prototype.parseList = function(lines, value, start) { - var found, html, j, key, l, lastType, leftLines, leftStart, len, len1, line, matches, minSpace, row, rows, secondFound, secondMinSpace, space, text, type; + var html, j, l, last, len, len1, line, matches, row, rows, space, type; html = ''; - minSpace = 99999; - secondMinSpace = 99999; - found = false; - secondFound = false; + space = value[0], type = value[1]; rows = []; - for (key = j = 0, len = lines.length; j < len; key = ++j) { - line = lines[key]; - if (matches = line.match(/^(\s*)((?:[0-9]+\.?)|\-|\+|\*)(\s+)(.*)$/i)) { - space = matches[1].length; - type = 0 <= '+-*'.indexOf(matches[2]) ? 'ul' : 'ol'; - minSpace = Math.min(space, minSpace); - found = true; - if (space > 0) { - secondMinSpace = Math.min(space, secondMinSpace); - secondFound = true; - } - rows.push([space, type, line, matches[4]]); + last = 0; + for (j = 0, len = lines.length; j < len; j++) { + line = lines[j]; + if (matches = line.match(new RegExp("^(\\s{" + space + "})((?:[0-9]+\\.?)|\\-|\\+|\\*)(\\s+)(.*)$"))) { + rows.push([matches[4]]); + last = rows.length - 1; } else { - rows.push(line); - if (!!(matches = line.match(/^(\s*)/))) { - space = matches[1].length; - if (space > 0) { - secondMinSpace = Math.min(space, secondMinSpace); - secondFound = true; - } - } + rows[last].push(line.replace(new RegExp("^\\s{" + space + "}"), '')); } } - minSpace = found ? minSpace : 0; - secondMinSpace = secondFound ? secondMinSpace : minSpace; - lastType = ''; - leftLines = []; - leftStart = 0; - for (key = l = 0, len1 = rows.length; l < len1; key = ++l) { - row = rows[key]; - if (row instanceof Array) { - space = row[0], type = row[1], line = row[2], text = row[3]; - if (space !== minSpace) { - leftLines.push(line.replace(new RegExp("^\\s{" + secondMinSpace + "}"), '')); - } else { - if (leftLines.length > 0) { - html += '
  • ' + (this.parse(leftLines.join("\n"), true, start + leftStart)) + '
    • '; - } - if (lastType !== type) { - if (!!lastType) { - html += ""; - } - html += "<" + type + ">"; - } - leftStart = key; - leftLines = [text]; - lastType = type; - } - } else { - leftLines.push(row.replace(new RegExp("^\\s{" + secondMinSpace + "}"), '')); - } + for (l = 0, len1 = rows.length; l < len1; l++) { + row = rows[l]; + html += '
  • ' + (this.parse(row.join("\n"), true, start)) + '
    • '; + start += row.length; } - if (leftLines.length > 0) { - html += '
  • ' + (this.parse(leftLines.join("\n"), true, start + leftStart)) + ("
    • "); - } - return html; + return "<" + type + ">" + html + ""; }; Parser.prototype.parseTable = function(lines, value, start) { @@ -1109,9 +1067,6 @@ Parser.prototype.parseNormal = function(lines, inline, start) { var key, str; - if (inline == null) { - inline = false; - } key = 0; lines = lines.map((function(_this) { return function(line) { @@ -1124,7 +1079,12 @@ }; })(this)); str = trim(lines.join("\n")); - str = str.replace(/(\n\s*){2,}/g, '

    '); + str = str.replace(/(\n\s*){2,}/g, (function(_this) { + return function() { + inline = false; + return '

    '; + }; + })(this)); str = str.replace(/\n/g, '
    '); if (str.match(/^\s*$/)) { return ''; @@ -1163,12 +1123,10 @@ }; Parser.prototype.cleanUrl = function(url) { - var matches, regexUrl, regexWord; - regexUrl = new RegExp("^\\s*((http|https|ftp|mailto):[" + pL + "_a-z0-9-:\\.\\*/%#;!@\\?\\[\\]\\+=~\\|\\,&\\(\\)]+)", 'i'); - regexWord = new RegExp("^\\s*([" + pL + "_a-z0-9-:\\.\\*/%#!@\\?\\+=~\\|\\,&]+)", 'i'); - if (!!(matches = url.match(regexUrl))) { + var matches; + if (!!(matches = url.match(/^\s*((http|https|ftp|mailto):\S+)/i))) { return matches[1]; - } else if (!!(matches = url.match(regexWord))) { + } else if (!!(matches = url.match(/^\s*(\S+)/))) { return matches[1]; } else { return '#'; diff --git a/var/HyperDown.php b/var/HyperDown.php index 374fa4f3..1386c34f 100644 --- a/var/HyperDown.php +++ b/var/HyperDown.php @@ -144,7 +144,7 @@ class HyperDown }); foreach ($this->blockParsers as $parser) { - list ($name) = $parser; + [$name] = $parser; if (isset($parser[2])) { $this->_parsers[$name] = $parser[2]; @@ -256,7 +256,7 @@ class HyperDown } foreach ($blocks as $block) { - list ($type, $start, $end, $value) = $block; + [$type, $start, $end, $value] = $block; $extract = array_slice($lines, $start, $end - $start + 1); $method = 'parse' . ucfirst($type); @@ -309,7 +309,7 @@ class HyperDown /** * @param array $lines * @param $start - * @return string + * @return string[] */ public function markLines(array $lines, $start) { @@ -537,7 +537,7 @@ class HyperDown // autolink url if ($enableAutoLink) { $text = preg_replace_callback( - "/(^|[^\"])((https?):[\p{L}_0-9-\.\/%#!@\?\+=~\|\,&\(\)]+)($|[^\"])/iu", + "/(^|[^\"])((https?):\S+)($|[^\"])/i", function ($matches) use ($self) { $link = $self->call('parseLink', $matches[2]); return "{$matches[1]}{$link}{$matches[4]}"; @@ -693,8 +693,8 @@ class HyperDown { if ($this->isBlock('list') && !preg_match("/^\s*\[((?:[^\]]|\\]|\\[)+?)\]:\s*(.+)$/", $line)) { if ($state['empty'] <= 1 - && preg_match("/^(\s+)/", $line, $matches) - && strlen($matches[1]) > $block[3]) { + && preg_match("/^(\s*)\S+/", $line, $matches) + && strlen($matches[1]) >= ($block[3][0] + $state['empty'])) { $state['empty'] = 0; $this->setBlock($key); @@ -709,12 +709,17 @@ class HyperDown if (preg_match("/^(\s*)((?:[0-9]+\.)|\-|\+|\*)\s+/i", $line, $matches)) { $space = strlen($matches[1]); $state['empty'] = 0; + $type = false !== strpos('+-*', $matches[2]) ? 'ul' : 'ol'; // opened if ($this->isBlock('list')) { - $this->setBlock($key, $space); + if ($space < $block[3][0] || ($space == $block[3][0] && $type != $block[3][1])) { + $this->startBlock('list', $key, [$space, $type]); + } else { + $this->setBlock($key); + } } else { - $this->startBlock('list', $key, $space); + $this->startBlock('list', $key, [$space, $type]); } return false; @@ -1179,7 +1184,7 @@ class HyperDown $prevBlock = isset($blocks[$key - 1]) ? $blocks[$key - 1] : NULL; $nextBlock = isset($blocks[$key + 1]) ? $blocks[$key + 1] : NULL; - list ($type, $from, $to) = $block; + [$type, $from, $to] = $block; if ('pre' == $type) { $isEmpty = array_reduce( @@ -1201,10 +1206,12 @@ class HyperDown if ($from == $to && preg_match("/^\s*$/", $lines[$from]) && !empty($prevBlock) && !empty($nextBlock)) { - if ($prevBlock[0] == $nextBlock[0] && in_array($prevBlock[0], $types)) { + if ($prevBlock[0] == $nextBlock[0] && in_array($prevBlock[0], $types) + && ($prevBlock[0] != 'list' + || ($prevBlock[3][0] == $nextBlock[3][0] && $prevBlock[3][1] == $nextBlock[3][1]))) { // combine 3 blocks $blocks[$key - 1] = array( - $prevBlock[0], $prevBlock[1], $nextBlock[2], NULL + $prevBlock[0], $prevBlock[1], $nextBlock[2], $prevBlock[3] ?? null ); array_splice($blocks, $key, 2); @@ -1232,7 +1239,7 @@ class HyperDown */ private function parseCode(array $lines, array $parts, $start) { - list ($blank, $lang) = $parts; + [$blank, $lang] = $parts; $lang = trim($lang); $count = strlen($blank); @@ -1241,7 +1248,7 @@ class HyperDown } else { $parts = explode(':', $lang); if (count($parts) > 1) { - list ($lang, $rel) = $parts; + [$lang, $rel] = $parts; $lang = trim($lang); $rel = trim($rel); } @@ -1381,80 +1388,25 @@ class HyperDown private function parseList(array $lines, $value, $start) { $html = ''; - $minSpace = 99999; - $secondMinSpace = 99999; - $found = false; - $secondFound = false; + [$space, $type] = $value; $rows = array(); + $last = 0; - // count levels - foreach ($lines as $key => $line) { - if (preg_match("/^(\s*)((?:[0-9]+\.?)|\-|\+|\*)(\s+)(.*)$/i", $line, $matches)) { - $space = strlen($matches[1]); - $type = false !== strpos('+-*', $matches[2]) ? 'ul' : 'ol'; - $minSpace = min($space, $minSpace); - $found = true; - - if ($space > 0) { - $secondMinSpace = min($space, $secondMinSpace); - $secondFound = true; - } - - $rows[] = array($space, $type, $line, $matches[4]); + foreach ($lines as $line) { + if (preg_match("/^(\s{" . $space . "})((?:[0-9]+\.?)|\-|\+|\*)(\s+)(.*)$/i", $line, $matches)) { + $rows[] = [$matches[4]]; + $last = count($rows) - 1; } else { - $rows[] = $line; - - if (preg_match("/^(\s*)/", $line, $matches)) { - $space = strlen($matches[1]); - - if ($space > 0) { - $secondMinSpace = min($space, $secondMinSpace); - $secondFound = true; - } - } + $rows[$last][] = preg_replace("/^\s{" . $space . "}/", '', $line); } } - $minSpace = $found ? $minSpace : 0; - $secondMinSpace = $secondFound ? $secondMinSpace : $minSpace; - - $lastType = ''; - $leftLines = array(); - $leftStart = 0; - - foreach ($rows as $key => $row) { - if (is_array($row)) { - list ($space, $type, $line, $text) = $row; - - if ($space != $minSpace) { - $leftLines[] = preg_replace("/^\s{" . $secondMinSpace . "}/", '', $line); - } else { - if (!empty($leftLines)) { - $html .= "

  • " . $this->parse(implode("\n", $leftLines), true, $start + $leftStart) . "
    • "; - } - - if ($lastType != $type) { - if (!empty($lastType)) { - $html .= ""; - } - - $html .= "<{$type}>"; - } - - $leftStart = $key; - $leftLines = array($text); - $lastType = $type; - } - } else { - $leftLines[] = preg_replace("/^\s{" . $secondMinSpace . "}/", '', $row); - } + foreach ($rows as $row) { + $html .= "
  • " . $this->parse(implode("\n", $row), true, $start) . "
    • "; + $start += count($row); } - if (!empty($leftLines)) { - $html .= "
  • " . $this->parse(implode("\n", $leftLines), true, $start + $leftStart) . "
    • "; - } - - return $html; + return "<{$type}>{$html}"; } /** @@ -1465,7 +1417,7 @@ class HyperDown */ private function parseTable(array $lines, array $value, $start) { - list ($ignores, $aligns) = $value; + [$ignores, $aligns] = $value; $head = count($ignores) > 0 && array_sum($ignores) > 0; $html = ''; @@ -1528,7 +1480,7 @@ class HyperDown . '" data-id="' . $this->_uniqid . '"' : '') . '>'; foreach ($columns as $key => $column) { - list ($num, $text) = $column; + [$num, $text] = $column; $tag = $head ? 'th' : 'td'; $html .= "<{$tag}"; @@ -1581,7 +1533,7 @@ class HyperDown * @param int $start * @return string */ - private function parseNormal(array $lines, $inline = false, $start) + private function parseNormal(array $lines, $inline, $start) { foreach ($lines as $key => &$line) { $line = $this->parseInline($line); @@ -1592,7 +1544,10 @@ class HyperDown } $str = trim(implode("\n", $lines)); - $str = preg_replace("/(\n\s*){2,}/", "

    ", $str); + $str = preg_replace_callback("/(\n\s*){2,}/", function () use (&$inline) { + $inline = false; + return "

    "; + }, $str); $str = preg_replace("/\n/", "
    ", $str); return preg_match("/^\s*$/", $str) ? '' : ($inline ? $str : "

    {$str}

    "); @@ -1607,7 +1562,7 @@ class HyperDown */ private function parseFootnote(array $lines, array $value) { - list($space, $note) = $value; + [$space, $note] = $value; $index = array_search($note, $this->_footnotes); if (false !== $index) { @@ -1652,9 +1607,9 @@ class HyperDown */ public function cleanUrl($url) { - if (preg_match("/^\s*((http|https|ftp|mailto):[\p{L}_a-z0-9-:\.\*\/%#;!@\?\+=~\|\,&\(\)\[\]]+)/iu", $url, $matches)) { + if (preg_match("/^\s*((http|https|ftp|mailto):\S+)/i", $url, $matches)) { return $matches[1]; - } else if (preg_match("/^\s*([\p{L}_a-z0-9-:\.\*\/%#!@\?\+=~\|\,&]+)/iu", $url, $matches)) { + } else if (preg_match("/^\s*(\S+)/i", $url, $matches)) { return $matches[1]; } else { return '#';