Commit b7eea95 1 parent 36a2b63 commit b7eea95 Copy full SHA for b7eea95
File tree 4 files changed +10
-13
lines changed
4 files changed +10
-13
lines changed Original file line number Diff line number Diff line change @@ -365,14 +365,15 @@ export class Tokenizer {
365
365
def ( src ) {
366
366
const cap = this . rules . block . def . exec ( src ) ;
367
367
if ( cap ) {
368
- if ( cap [ 3 ] ) cap [ 3 ] = cap [ 3 ] . substring ( 1 , cap [ 3 ] . length - 1 ) ;
369
368
const tag = cap [ 1 ] . toLowerCase ( ) . replace ( / \s + / g, ' ' ) ;
369
+ const href = cap [ 2 ] ? cap [ 2 ] . replace ( / ^ < ( .* ) > $ / , '$1' ) . replace ( this . rules . inline . _escapes , '$1' ) : '' ;
370
+ const title = cap [ 3 ] ? cap [ 3 ] . substring ( 1 , cap [ 3 ] . length - 1 ) . replace ( this . rules . inline . _escapes , '$1' ) : cap [ 3 ] ;
370
371
return {
371
372
type : 'def' ,
372
373
tag,
373
374
raw : cap [ 0 ] ,
374
- href : cap [ 2 ] ? cap [ 2 ] . replace ( this . rules . inline . _escapes , '$1' ) : cap [ 2 ] ,
375
- title : cap [ 3 ] ? cap [ 3 ] . replace ( this . rules . inline . _escapes , '$1' ) : cap [ 3 ]
375
+ href,
376
+ title
376
377
} ;
377
378
}
378
379
}
@@ -574,7 +575,7 @@ export class Tokenizer {
574
575
|| ( cap = this . rules . inline . nolink . exec ( src ) ) ) {
575
576
let link = ( cap [ 2 ] || cap [ 1 ] ) . replace ( / \s + / g, ' ' ) ;
576
577
link = links [ link . toLowerCase ( ) ] ;
577
- if ( ! link || ! link . href ) {
578
+ if ( ! link ) {
578
579
const text = cap [ 0 ] . charAt ( 0 ) ;
579
580
return {
580
581
type : 'text' ,
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ export const block = {
25
25
+ '|<(?!script|pre|style|textarea)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) open tag
26
26
+ '|</(?!script|pre|style|textarea)[a-z][\\w-]*\\s*>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) closing tag
27
27
+ ')' ,
28
- def : / ^ { 0 , 3 } \[ ( l a b e l ) \] : * (?: \n * ) ? < ? ( [ ^ \s > ] + ) > ? (?: (?: + (?: \n * ) ? | * \n * ) ( t i t l e ) ) ? * (?: \n + | $ ) / ,
28
+ def : / ^ { 0 , 3 } \[ ( l a b e l ) \] : * (?: \n * ) ? ( [ ^ < \s ] [ ^ \s ] * | < . * ? > ) (?: (?: + (?: \n * ) ? | * \n * ) ( t i t l e ) ) ? * (?: \n + | $ ) / ,
29
29
table : noopTest ,
30
30
lheading : / ^ ( [ ^ \n ] + ) \n { 0 , 3 } ( = + | - + ) * (?: \n + | $ ) / ,
31
31
// regex template, placeholders will be replaced according to different paragraph
Original file line number Diff line number Diff line change 1562
1562
"example" : 195 ,
1563
1563
"start_line" : 3212 ,
1564
1564
"end_line" : 3220 ,
1565
- "section" : " Link reference definitions" ,
1566
- "shouldFail" : true
1565
+ "section" : " Link reference definitions"
1567
1566
},
1568
1567
{
1569
1568
"markdown" : " [foo]: /url '\n title\n line1\n line2\n '\n\n [foo]\n " ,
1603
1602
"example" : 200 ,
1604
1603
"start_line" : 3283 ,
1605
1604
"end_line" : 3289 ,
1606
- "section" : " Link reference definitions" ,
1607
- "shouldFail" : true
1605
+ "section" : " Link reference definitions"
1608
1606
},
1609
1607
{
1610
1608
"markdown" : " [foo]: <bar>(baz)\n\n [foo]\n " ,
Original file line number Diff line number Diff line change 1562
1562
"example" : 195 ,
1563
1563
"start_line" : 3212 ,
1564
1564
"end_line" : 3220 ,
1565
- "section" : " Link reference definitions" ,
1566
- "shouldFail" : true
1565
+ "section" : " Link reference definitions"
1567
1566
},
1568
1567
{
1569
1568
"markdown" : " [foo]: /url '\n title\n line1\n line2\n '\n\n [foo]\n " ,
1603
1602
"example" : 200 ,
1604
1603
"start_line" : 3283 ,
1605
1604
"end_line" : 3289 ,
1606
- "section" : " Link reference definitions" ,
1607
- "shouldFail" : true
1605
+ "section" : " Link reference definitions"
1608
1606
},
1609
1607
{
1610
1608
"markdown" : " [foo]: <bar>(baz)\n\n [foo]\n " ,
You can’t perform that action at this time.
0 commit comments