flinker-markdown 1.1.3 → 1.1.5

package/dist/esm/md.js

@@ -59,16 +59,14 @@ export class MDGrammar {
         this.code = new MDInlineGrammarRule();
         this.code.matcher = [/``([^`]+)``/g, '<code>$1</code>'];
         this.figure = new MDInlineGrammarRule();
-        this.figure.matcher = [/\[img:([^ ]+) ([^\]]+)\]/gm, '<figure><img src="$1"/><figcaption>$2</figcaption></figure>'];
+        this.figure.matcher = [/\[img:([^, ]+), ?([^\]]+)\]/gm, '<figure><img src="$1"/><figcaption>$2</figcaption></figure>'];
         this.img = new MDInlineGrammarRule();
-        this.img.matcher = [/\[img:([^ ]+)\]/gm, '<img src="$1"/>'];
+        this.img.matcher = [/\[img:([^\]]+)\]/gm, '<img src="$1"/>'];
         this.link = new MDInlineGrammarRule();
-        this.link.matcher = [/\[link:([^ ]+) ?([^\]]*)\]/, (line, url, descr) => {
+        this.link.matcher = [/\[link:([^, ]+),? ?([^\]]*)\]/, (line, url, descr) => {
                 return '<a href="' + url + '">' + (descr || url) + '</a>';
             }];
-        this.audio = new MDInlineGrammarRule();
-        this.audio.matcher = [/\[audio:([^\]]+)\]/, '<audio controls src="$1"></audio>'];
-        this.globalRule.childrenInlineRules = [this.code, this.figure, this.img, this.link, this.audio, this.sub, this.sup, this.strong, this.boldItalic, this.bold, this.em, this.italic];
+        this.globalRule.childrenInlineRules = [this.code, this.figure, this.img, this.link, this.sub, this.sup, this.strong, this.boldItalic, this.bold, this.em, this.italic];
         // 
         // LINE GRAMMAR RULES
         //
@@ -107,7 +105,11 @@ export class MDGrammar {
         this.uli.matcher = [/^\+ (.*)$/, '<li>$1</li>'];
         this.uli.childrenInlineRules = this.globalRule.childrenInlineRules;
         this.uli.preProccessing = defLinePreproccessing;
-        this.globalRule.childrenLineRules = [this.header, this.quote, this.alignCenter, this.alignRight, this.stars, this.br, this.p];
+        this.audio = new MDLineGrammarRule();
+        this.audio.matcher = [/\[audio:([^\]]+)\]/, '<audio controls src="$1"></audio>'];
+        this.video = new MDLineGrammarRule();
+        this.video.matcher = [/\[video:([^\]]+)\]/, '<video controls src="$1"></audio>'];
+        this.globalRule.childrenLineRules = [this.header, this.quote, this.alignCenter, this.alignRight, this.audio, this.video, this.stars, this.br, this.p];
         //
         // MULTILINE GRAMMAR RULES
         //

package/dist/types/md.d.ts

@@ -35,7 +35,6 @@ export declare class MDGrammar {
     readonly figure: MDInlineGrammarRule;
     readonly img: MDInlineGrammarRule;
     readonly link: MDInlineGrammarRule;
-    readonly audio: MDInlineGrammarRule;
     readonly header: MDLineGrammarRule;
     readonly quote: MDLineGrammarRule;
     readonly alignRight: MDLineGrammarRule;
@@ -45,6 +44,8 @@ export declare class MDGrammar {
     readonly br: MDLineGrammarRule;
     readonly oli: MDLineGrammarRule;
     readonly uli: MDLineGrammarRule;
+    readonly audio: MDLineGrammarRule;
+    readonly video: MDLineGrammarRule;
     readonly ol: MDMultilineGrammarRule;
     readonly ul: MDMultilineGrammarRule;
     readonly table: MDMultilineGrammarRule;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "flinker-markdown",
   "description": "Free TypeScript library for parsing markdown text (customisable, not standardized).",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Dittner/FlinkerMD.git"