ouyang/typecho
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update hyperdown

Browse Source
This commit is contained in:
joyqi
2021-05-21 11:52:13 +08:00
parent 2f6a0c6f36
commit 6164d92173
3 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/js/hyperdown.js
+1 -1
View File
File diff suppressed because one or more lines are too long
admin/src/js/hyperdown.js
+23 -10
View File
@@ -516,7 +516,7 @@
};
Parser.prototype.parseBlockList = function(block, key, line, state) {
var matches, space, type;
var matches, space, tab, type;
if ((this.isBlock('list')) && !line.match(/^\s*\[((?:[^\]]|\\\]|\\\[)+?)\]:\s*(.+)$/)) {
if (!!(line.match(/^(\s*)(~{3,}|`{3,})([^`~]*)$/i))) {
return true;
@@ -532,16 +532,17 @@
}
if (!!(matches = line.match(/^(\s*)((?:[0-9]+\.)|\-|\+|\*)\s+/i))) {
space = matches[1].length;
tab = matches[0].length - space;
state.empty = 0;
type = 0 <= '+-*'.indexOf(matches[2]) ? 'ul' : 'ol';
if (this.isBlock('list')) {
if (space < block[3][0] || (space === block[3][0] && type !== block[3][1])) {
this.startBlock('list', key, [space, type]);
this.startBlock('list', key, [space, type, tab]);
} else {
this.setBlock(key);
}
} else {
this.startBlock('list', key, [space, type]);
this.startBlock('list', key, [space, type, tab]);
}
return false;
}
@@ -552,6 +553,10 @@
var isAfterList, matches, space;
if (!!(matches = line.match(/^(\s*)(~{3,}|`{3,})([^`~]*)$/i))) {
if (this.isBlock('code')) {
if (state.code !== matches[2]) {
this.setBlock(key);
return false;
}
isAfterList = block[3][2];
if (isAfterList) {
this.combineBlock().setBlock(key);
@@ -564,6 +569,7 @@
space = block[3][0];
isAfterList = matches[1].length >= space + state.empty;
}
state.code = matches[2];
this.startBlock('code', key, [matches[1], matches[3], isAfterList]);
}
return false;
@@ -888,7 +894,7 @@
}
isEmpty = true;
lines = lines.slice(1, -1).map(function(line) {
line = line.replace(new RegExp("/^[ ]{" + count + "}/"), '');
line = line.replace(new RegExp("^[ ]{" + count + "}"), '');
if (isEmpty && !line.match(/^\s*$/)) {
isEmpty = false;
}
@@ -955,18 +961,25 @@
};
Parser.prototype.parseList = function(lines, value, start) {
var html, j, l, last, len, len1, line, matches, row, rows, space, type;
var html, j, key, l, last, len, len1, line, matches, row, rows, space, suffix, tab, type;
html = '';
space = value[0], type = value[1];
space = value[0], type = value[1], tab = value[2];
rows = [];
suffix = '';
last = 0;
for (j = 0, len = lines.length; j < len; j++) {
line = lines[j];
for (key = j = 0, len = lines.length; j < len; key = ++j) {
line = lines[key];
if (matches = line.match(new RegExp("^(\\s{" + space + "})((?:[0-9]+\\.?)|\\-|\\+|\\*)(\\s+)(.*)$"))) {
if (type === 'ol' && key === 0) {
start = parseInt(matches[2]);
if (start !== 1) {
suffix = ' start="' + start + '"';
}
}
rows.push([matches[4]]);
last = rows.length - 1;
} else {
rows[last].push(line.replace(new RegExp("^\\s{" + space + "}"), ''));
rows[last].push(line.replace(new RegExp("^\\s{" + (tab + space) + "}"), ''));
}
}
for (l = 0, len1 = rows.length; l < len1; l++) {
@@ -974,7 +987,7 @@
html += '<li>' + (this.parse(row.join("\n"), true, start)) + '</li>';
start += row.length;
}
return "<" + type + ">" + html + "</" + type + ">";
return "<" + type + suffix + ">" + html + "</" + type + ">";
};
Parser.prototype.parseTable = function(lines, value, start) {
var/HyperDown.php
+24 -7
View File
@@ -711,18 +711,19 @@ class HyperDown
if (preg_match("/^(\s*)((?:[0-9]+\.)|\-|\+|\*)\s+/i", $line, $matches)) {
$space = strlen($matches[1]);
$tab = strlen($matches[0]) - $space;
$state['empty'] = 0;
$type = false !== strpos('+-*', $matches[2]) ? 'ul' : 'ol';
// opened
if ($this->isBlock('list')) {
if ($space < $block[3][0] || ($space == $block[3][0] && $type != $block[3][1])) {
$this->startBlock('list', $key, [$space, $type]);
$this->startBlock('list', $key, [$space, $type, $tab]);
} else {
$this->setBlock($key);
}
} else {
$this->startBlock('list', $key, [$space, $type]);
$this->startBlock('list', $key, [$space, $type, $tab]);
}
return false;
@@ -738,10 +739,15 @@ class HyperDown
* @param $state
* @return bool
*/
private function parseBlockCode($block, $key, $line, $state)
private function parseBlockCode($block, $key, $line, &$state)
{
if (preg_match("/^(\s*)(~{3,}|`{3,})([^`~]*)$/i", $line, $matches)) {
if ($this->isBlock('code')) {
if ($state['code'] != $matches[2]) {
$this->setBlock($key);
return false;
}
$isAfterList = $block[3][2];
if ($isAfterList) {
@@ -760,6 +766,8 @@ class HyperDown
$isAfterList = strlen($matches[1]) >= $space + $state['empty'];
}
$state['code'] = $matches[2];
$this->startBlock('code', $key, array(
$matches[1], $matches[3], $isAfterList
));
@@ -1391,16 +1399,25 @@ class HyperDown
private function parseList(array $lines, $value, $start)
{
$html = '';
list($space, $type) = $value;
list($space, $type, $tab) = $value;
$rows = array();
$suffix = '';
$last = 0;
foreach ($lines as $line) {
foreach ($lines as $key => $line) {
if (preg_match("/^(\s{" . $space . "})((?:[0-9]+\.?)|\-|\+|\*)(\s+)(.*)$/i", $line, $matches)) {
if ($type == 'ol' && $key == 0) {
$start = intval($matches[2]);
if ($start != 1) {
$suffix = ' start="' . $start . '"';
}
}
$rows[] = [$matches[4]];
$last = count($rows) - 1;
} else {
$rows[$last][] = preg_replace("/^\s{" . $space . "}/", '', $line);
$rows[$last][] = preg_replace("/^\s{" . ($tab + $space) . "}/", '', $line);
}
}
@@ -1409,7 +1426,7 @@ class HyperDown
$start += count($row);
}
return "<{$type}>{$html}</{$type}>";
return "<{$type}{$suffix}>{$html}</{$type}>";
}
/**