Skip to content
Snippets Groups Projects
Commit 16fb2a4e authored by marihachi's avatar marihachi
Browse files

Merge branch 'develop' into master

parents 9a192601 5a4a3678
No related branches found
No related tags found
No related merge requests found
{
"name": "mfm-js",
"version": "0.16.1",
"version": "0.16.2",
"description": "An MFM parser implementation with PEG.js",
"main": "./built/index.js",
"types": "./built/index.d.ts",
......
......@@ -92,9 +92,9 @@ full
/ mention
/ hashtag
/ url
/ fnVer2
/// fnVer2
/ link
/ fnVer1
/// fnVer1
/ search // block
/ inlineText
......@@ -111,9 +111,9 @@ inline
/ mention
/ hashtag
/ url
/ fnVer2
/// fnVer2
/ link
/ fnVer1
/// fnVer1
/ inlineText
//
......@@ -384,10 +384,12 @@ link
return LINK((silent != null), url, mergeText(label));
}
// linkLabelPart
// = url { return text(); /* text node */ }
// / link { return text(); /* text node */ }
// / !"]" n:inline { return n; }
linkLabelPart
= url { return text(); /* text node */ }
/ link { return text(); /* text node */ }
/ !"]" n:inline { return n; }
= !"]" . { return text(); }
linkUrl
= url { return text(); }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment