Skip to content

Support _htmlBlockType for html_inline. #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Support _htmlBlockType for html_inline. #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
047b598
Support _htmlBlockType for html_inline.
tmpfs Apr 23, 2016
9032bba
Simplify iteration.
tmpfs Apr 23, 2016
ec01a50
Support lowercase doctype declarations.
tmpfs Apr 23, 2016
42223ce
Match on inline element names.
tmpfs Apr 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions lib/blocks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,7 @@ var C_OPEN_BRACKET = 91;

var InlineParser = require('./inlines');

var reHtmlBlockOpen = [
/./, // dummy for 0
/^<(?:script|pre|style)(?:\s|>|$)/i,
/^<!--/,
/^<[?]/,
/^<![A-Z]/,
/^<!\[CDATA\[/,
/^<[/]?(?:address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h1|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|title|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul)(?:\s|[/]?[>]|$)/i,
new RegExp('^(?:' + OPENTAG + '|' + CLOSETAG + ')\s*$', 'i')
];
var reHtmlBlockOpen = require('./common').reHtmlBlockOpen;

var reHtmlBlockClose = [
/./, // dummy for 0
Expand Down
14 changes: 13 additions & 1 deletion lib/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,23 @@ var OPENTAG = "<" + TAGNAME + ATTRIBUTE + "*" + "\\s*/?>";
var CLOSETAG = "</" + TAGNAME + "\\s*[>]";
var HTMLCOMMENT = "<!---->|<!--(?:-?[^>-])(?:-?[^-])*-->";
var PROCESSINGINSTRUCTION = "[<][?].*?[?][>]";
var DECLARATION = "<![A-Z]+" + "\\s+[^>]*>";
var DECLARATION = "<![A-Za-z]+" + "\\s+[^>]*>";
var CDATA = "<!\\[CDATA\\[[\\s\\S]*?\\]\\]>";
var HTMLTAG = "(?:" + OPENTAG + "|" + CLOSETAG + "|" + HTMLCOMMENT + "|" +
PROCESSINGINSTRUCTION + "|" + DECLARATION + "|" + CDATA + ")";
var reHtmlTag = new RegExp('^' + HTMLTAG, 'i');

var reHtmlBlockOpen = [
/./, // dummy for 0
/^<(?:script|pre|style)(?:\s|>|$)/i,
/^<!--/,
/^<[?]/,
/^<![A-Za-z]/,
/^<!\[CDATA\[/,
/^<[/]?(?:address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h1|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|title|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul)(?:\s|[/]?[>]|$)/i,
new RegExp('^(?:' + OPENTAG + '|' + CLOSETAG + ')\s*$', 'i')
];

var reBackslashOrAmp = /[\\&]/;

var ESCAPABLE = '[!"#$%&\'()*+,./:;<=>?@[\\\\\\]^_`{|}~-]';
Expand Down Expand Up @@ -96,6 +107,7 @@ module.exports = { unescapeString: unescapeString,
normalizeURI: normalizeURI,
escapeXml: escapeXml,
reHtmlTag: reHtmlTag,
reHtmlBlockOpen: reHtmlBlockOpen,
OPENTAG: OPENTAG,
CLOSETAG: CLOSETAG,
ENTITY: ENTITY,
Expand Down
15 changes: 15 additions & 0 deletions lib/inlines.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ var fromCodePoint = require('./from-code-point.js');
var decodeHTML = require('entities').decodeHTML;
require('string.prototype.repeat'); // Polyfill for String.prototype.repeat

var reHtmlBlockOpen = require('./common').reHtmlBlockOpen.slice(0);

// match on inline element names
reHtmlBlockOpen[6] =
/^<[/]?(?:big|small|tt|abbr|acronym|cite|code|dfn|em|kbd|strong|samp|time|var|bdo|br|img|map|object|script|span|sub|sup|button|input|label|select|textarea|b|i|a|q)(?:\s|[/]?[>]|$)/i;

// Constants for character codes:

var C_NEWLINE = 10;
Expand Down Expand Up @@ -213,6 +219,15 @@ var parseHtmlTag = function(block) {
var node = new Node('html_inline');
node._literal = m;
block.appendChild(node);

var blockType;
for (blockType = 1; blockType < 7; blockType++) {
if(reHtmlBlockOpen[blockType].test(m)) {
node._htmlBlockType = blockType;
break;
}
}

return true;
}
};
Expand Down