markdown-it-mark - npm Package Compare versions

Comparing version 0.1.0 to 1.0.0

CHANGELOG.md

@@ -0,1 +1,7 @@
+1.0.0 / 2015-03-12
+------------------
+
+- Markdown-it 4.0.0 support. Use previous version for 2.x-3.x.
+
+
 0.1.0 / 2015-01-04
@@ -2,0 +8,0 @@ ------------------

dist/markdown-it-mark.js

@@ -1,2 +0,2 @@
-/*! markdown-it-mark 0.1.0 https://github.com//markdown-it/markdown-it-mark @license MIT */!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.markdownitMark=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+/*! markdown-it-mark 1.0.0 https://github.com//markdown-it/markdown-it-mark @license MIT */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.markdownitMark = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 'use strict';
@@ -9,19 +9,48 @@
   var pos = start, lastChar, nextChar, count,
+      isLastWhiteSpace, isLastPunctChar,
+      isNextWhiteSpace, isNextPunctChar,
       can_open = true,
       can_close = true,
       max = state.posMax,
-      marker = state.src.charCodeAt(start);
+      marker = state.src.charCodeAt(start),
+      isWhiteSpace = state.md.utils.isWhiteSpace,
+      isPunctChar = state.md.utils.isPunctChar,
+      isMdAsciiPunct = state.md.utils.isMdAsciiPunct;
 
-  lastChar = start > 0 ? state.src.charCodeAt(start - 1) : -1;
+  // treat beginning of the line as a whitespace
+  lastChar = start > 0 ? state.src.charCodeAt(start - 1) : 0x20;
 
   while (pos < max && state.src.charCodeAt(pos) === marker) { pos++; }
-  if (pos >= max) { can_open = false; }
+
+  if (pos >= max) {
+    can_open = false;
+  }
+
   count = pos - start;
 
-  nextChar = pos < max ? state.src.charCodeAt(pos) : -1;
+  // treat end of the line as a whitespace
+  nextChar = pos < max ? state.src.charCodeAt(pos) : 0x20;
 
-  // check whitespace conditions
-  if (nextChar === 0x20 || nextChar === 0x0A) { can_open = false; }
-  if (lastChar === 0x20 || lastChar === 0x0A) { can_close = false; }
+  isLastPunctChar = isMdAsciiPunct(lastChar) || isPunctChar(String.fromCharCode(lastChar));
+  isNextPunctChar = isMdAsciiPunct(nextChar) || isPunctChar(String.fromCharCode(nextChar));
 
+  isLastWhiteSpace = isWhiteSpace(lastChar);
+  isNextWhiteSpace = isWhiteSpace(nextChar);
+
+  if (isNextWhiteSpace) {
+    can_open = false;
+  } else if (isNextPunctChar) {
+    if (!(isLastWhiteSpace || isLastPunctChar)) {
+      can_open = false;
+    }
+  }
+
+  if (isLastWhiteSpace) {
+    can_close = false;
+  } else if (isLastPunctChar) {
+    if (!(isNextWhiteSpace || isNextPunctChar)) {
+      can_close = false;
+    }
+  }
+
   return {
@@ -34,2 +63,3 @@ can_open: can_open,
 
+
 function mark(state, silent) {
@@ -42,2 +72,3 @@ var startCount,
       res,
+      token,
       max = state.posMax,
@@ -99,6 +130,10 @@ start = state.pos,
   // Earlier we checked !silent, but this implementation does not need it
-  state.push({ type: 'mark_open', level: state.level++ });
+  token        = state.push('mark_open', 'mark', 1);
+  token.markup = String.fromCharCode(marker) + String.fromCharCode(marker);
+
   state.md.inline.tokenize(state);
-  state.push({ type: 'mark_close', level: --state.level });
 
+  token        = state.push('mark_close', 'mark', -1);
+  token.markup = String.fromCharCode(marker) + String.fromCharCode(marker);
+
   state.pos = state.posMax + 2;
@@ -110,10 +145,4 @@ state.posMax = max;
 
-function mark_open()  { return '<mark>'; }
-function mark_close() { return '</mark>'; }
-
-
 module.exports = function mark_plugin(md) {
   md.inline.ruler.before('emphasis', 'mark', mark);
-  md.renderer.rules.mark_open = mark_open;
-  md.renderer.rules.mark_close = mark_close;
 };
@@ -120,0 +149,0 @@

dist/markdown-it-mark.min.js

@@ -1,2 +0,2 @@
-/*! markdown-it-mark 0.1.0 https://github.com//markdown-it/markdown-it-mark @license MIT */
-!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var r;"undefined"!=typeof window?r=window:"undefined"!=typeof global?r=global:"undefined"!=typeof self&&(r=self),r.markdownitMark=e()}}(function(){return function e(r,o,n){function t(s,f){if(!o[s]){if(!r[s]){var p="function"==typeof require&&require;if(!f&&p)return p(s,!0);if(i)return i(s,!0);var u=new Error("Cannot find module '"+s+"'");throw u.code="MODULE_NOT_FOUND",u}var a=o[s]={exports:{}};r[s][0].call(a.exports,function(e){var o=r[s][1][e];return t(o?o:e)},a,a.exports,e,r,o,n)}return o[s].exports}for(var i="function"==typeof require&&require,s=0;s<n.length;s++)t(n[s]);return t}({1:[function(e,r){"use strict";function o(e,r){var o,n,t,i=r,s=!0,f=!0,p=e.posMax,u=e.src.charCodeAt(r);for(o=r>0?e.src.charCodeAt(r-1):-1;p>i&&e.src.charCodeAt(i)===u;)i++;return i>=p&&(s=!1),t=i-r,n=p>i?e.src.charCodeAt(i):-1,(32===n||10===n)&&(s=!1),(32===o||10===o)&&(f=!1),{can_open:s,can_close:f,delims:t}}function n(e,r){var n,t,i,s,f,p,u=e.posMax,a=e.pos,c=e.src.charCodeAt(a);if(61!==c)return!1;if(r)return!1;if(p=o(e,a),n=p.delims,!p.can_open)return e.pos+=n,e.pending+=e.src.slice(a,e.pos),!0;if(f=Math.floor(n/2),0>=f)return!1;for(e.pos=a+n;e.pos<u;)if(e.src.charCodeAt(e.pos)!==c)e.md.inline.skipToken(e);else{if(p=o(e,e.pos),t=p.delims,i=Math.floor(t/2),p.can_close){if(i>=f){e.pos+=t-2,s=!0;break}f-=i,e.pos+=t;continue}p.can_open&&(f+=i),e.pos+=t}return s?(e.posMax=e.pos,e.pos=a+2,e.push({type:"mark_open",level:e.level++}),e.md.inline.tokenize(e),e.push({type:"mark_close",level:--e.level}),e.pos=e.posMax+2,e.posMax=u,!0):(e.pos=a,!1)}function t(){return"<mark>"}function i(){return"</mark>"}r.exports=function(e){e.inline.ruler.before("emphasis","mark",n),e.renderer.rules.mark_open=t,e.renderer.rules.mark_close=i}},{}]},{},[1])(1)});
+/*! markdown-it-mark 1.0.0 https://github.com//markdown-it/markdown-it-mark @license MIT */
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var r;r="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,r.markdownitMark=e()}}(function(){return function e(r,o,n){function i(s,f){if(!o[s]){if(!r[s]){var a="function"==typeof require&&require;if(!f&&a)return a(s,!0);if(t)return t(s,!0);var u=new Error("Cannot find module '"+s+"'");throw u.code="MODULE_NOT_FOUND",u}var p=o[s]={exports:{}};r[s][0].call(p.exports,function(e){var o=r[s][1][e];return i(o?o:e)},p,p.exports,e,r,o,n)}return o[s].exports}for(var t="function"==typeof require&&require,s=0;s<n.length;s++)i(n[s]);return i}({1:[function(e,r){"use strict";function o(e,r){var o,n,i,t,s,f,a,u=r,p=!0,c=!0,d=e.posMax,l=e.src.charCodeAt(r),m=e.md.utils.isWhiteSpace,h=e.md.utils.isPunctChar,C=e.md.utils.isMdAsciiPunct;for(o=r>0?e.src.charCodeAt(r-1):32;d>u&&e.src.charCodeAt(u)===l;)u++;return u>=d&&(p=!1),i=u-r,n=d>u?e.src.charCodeAt(u):32,s=C(o)||h(String.fromCharCode(o)),a=C(n)||h(String.fromCharCode(n)),t=m(o),f=m(n),f?p=!1:a&&(t||s||(p=!1)),t?c=!1:s&&(f||a||(c=!1)),{can_open:p,can_close:c,delims:i}}function n(e,r){var n,i,t,s,f,a,u,p=e.posMax,c=e.pos,d=e.src.charCodeAt(c);if(61!==d)return!1;if(r)return!1;if(a=o(e,c),n=a.delims,!a.can_open)return e.pos+=n,e.pending+=e.src.slice(c,e.pos),!0;if(f=Math.floor(n/2),0>=f)return!1;for(e.pos=c+n;e.pos<p;)if(e.src.charCodeAt(e.pos)!==d)e.md.inline.skipToken(e);else{if(a=o(e,e.pos),i=a.delims,t=Math.floor(i/2),a.can_close){if(t>=f){e.pos+=i-2,s=!0;break}f-=t,e.pos+=i;continue}a.can_open&&(f+=t),e.pos+=i}return s?(e.posMax=e.pos,e.pos=c+2,u=e.push("mark_open","mark",1),u.markup=String.fromCharCode(d)+String.fromCharCode(d),e.md.inline.tokenize(e),u=e.push("mark_close","mark",-1),u.markup=String.fromCharCode(d)+String.fromCharCode(d),e.pos=e.posMax+2,e.posMax=p,!0):(e.pos=c,!1)}r.exports=function(e){e.inline.ruler.before("emphasis","mark",n)}},{}]},{},[1])(1)});

index.js

@@ -8,19 +8,48 @@ 'use strict';
   var pos = start, lastChar, nextChar, count,
+      isLastWhiteSpace, isLastPunctChar,
+      isNextWhiteSpace, isNextPunctChar,
       can_open = true,
       can_close = true,
       max = state.posMax,
-      marker = state.src.charCodeAt(start);
+      marker = state.src.charCodeAt(start),
+      isWhiteSpace = state.md.utils.isWhiteSpace,
+      isPunctChar = state.md.utils.isPunctChar,
+      isMdAsciiPunct = state.md.utils.isMdAsciiPunct;
 
-  lastChar = start > 0 ? state.src.charCodeAt(start - 1) : -1;
+  // treat beginning of the line as a whitespace
+  lastChar = start > 0 ? state.src.charCodeAt(start - 1) : 0x20;
 
   while (pos < max && state.src.charCodeAt(pos) === marker) { pos++; }
-  if (pos >= max) { can_open = false; }
+
+  if (pos >= max) {
+    can_open = false;
+  }
+
   count = pos - start;
 
-  nextChar = pos < max ? state.src.charCodeAt(pos) : -1;
+  // treat end of the line as a whitespace
+  nextChar = pos < max ? state.src.charCodeAt(pos) : 0x20;
 
-  // check whitespace conditions
-  if (nextChar === 0x20 || nextChar === 0x0A) { can_open = false; }
-  if (lastChar === 0x20 || lastChar === 0x0A) { can_close = false; }
+  isLastPunctChar = isMdAsciiPunct(lastChar) || isPunctChar(String.fromCharCode(lastChar));
+  isNextPunctChar = isMdAsciiPunct(nextChar) || isPunctChar(String.fromCharCode(nextChar));
 
+  isLastWhiteSpace = isWhiteSpace(lastChar);
+  isNextWhiteSpace = isWhiteSpace(nextChar);
+
+  if (isNextWhiteSpace) {
+    can_open = false;
+  } else if (isNextPunctChar) {
+    if (!(isLastWhiteSpace || isLastPunctChar)) {
+      can_open = false;
+    }
+  }
+
+  if (isLastWhiteSpace) {
+    can_close = false;
+  } else if (isLastPunctChar) {
+    if (!(isNextWhiteSpace || isNextPunctChar)) {
+      can_close = false;
+    }
+  }
+
   return {
@@ -33,2 +62,3 @@ can_open: can_open,
 
+
 function mark(state, silent) {
@@ -41,2 +71,3 @@ var startCount,
       res,
+      token,
       max = state.posMax,
@@ -98,6 +129,10 @@ start = state.pos,
   // Earlier we checked !silent, but this implementation does not need it
-  state.push({ type: 'mark_open', level: state.level++ });
+  token        = state.push('mark_open', 'mark', 1);
+  token.markup = String.fromCharCode(marker) + String.fromCharCode(marker);
+
   state.md.inline.tokenize(state);
-  state.push({ type: 'mark_close', level: --state.level });
 
+  token        = state.push('mark_close', 'mark', -1);
+  token.markup = String.fromCharCode(marker) + String.fromCharCode(marker);
+
   state.pos = state.posMax + 2;
@@ -109,10 +144,4 @@ state.posMax = max;
 
-function mark_open()  { return '<mark>'; }
-function mark_close() { return '</mark>'; }
-
-
 module.exports = function mark_plugin(md) {
   md.inline.ruler.before('emphasis', 'mark', mark);
-  md.renderer.rules.mark_open = mark_open;
-  md.renderer.rules.mark_close = mark_close;
 };

package.json

 {
   "name": "markdown-it-mark",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "description": "<mark> tag for markdown-it markdown parser.",
@@ -31,3 +31,3 @@ "keywords": [
     "lodash": "*",
-    "markdown-it": "~3.0.0",
+    "markdown-it": "^4.0.0",
     "markdown-it-testgen": "~0.1.0",
@@ -34,0 +34,0 @@ "mocha": "*",

README.md

@@ -9,2 +9,4 @@ # markdown-it-mark
 
+__v1.+ requires `markdown-it` v4.+, see changelog.__
+
 `==marked==` => `<mark>inserted</mark>`
@@ -11,0 +13,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

14219

increased by14.96%

Lines of code

259

increased by21.6%

Number of low quality alerts

1

decreased by-50%

Number of lines in readme file

41

increased by5.13%

No dependency changes