From 7274556fb19a2da10ae8a0644c2710c191ab85b1 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 6 Sep 2014 22:53:15 -0700 Subject: Don't treat "br" as a block-level HTML tag. Fixed in spec and both implementations. Closes #67. --- js/stmd.js | 2 +- spec.txt | 2 +- src/scanners.re | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/stmd.js b/js/stmd.js index b4a305e..1212252 100755 --- a/js/stmd.js +++ b/js/stmd.js @@ -21,7 +21,7 @@ var IN_PARENS = '\\((' + ESCAPED_CHAR + '|[^)\\x00])*\\)'; var REG_CHAR = '[^\\\\()\\x00-\\x20]'; var IN_PARENS_NOSP = '\\((' + REG_CHAR + '|' + ESCAPED_CHAR + ')*\\)'; var TAGNAME = '[A-Za-z][A-Za-z0-9]*'; -var BLOCKTAGNAME = '(?:article|header|aside|hgroup|blockquote|hr|body|li|br|map|button|object|canvas|ol|caption|output|col|p|colgroup|pre|dd|progress|div|section|dl|table|td|dt|tbody|embed|textarea|fieldset|tfoot|figcaption|th|figure|thead|footer|footer|tr|form|ul|h1|h2|h3|h4|h5|h6|video|script|style)'; +var BLOCKTAGNAME = '(?:article|header|aside|hgroup|blockquote|hr|body|li|map|button|object|canvas|ol|caption|output|col|p|colgroup|pre|dd|progress|div|section|dl|table|td|dt|tbody|embed|textarea|fieldset|tfoot|figcaption|th|figure|thead|footer|footer|tr|form|ul|h1|h2|h3|h4|h5|h6|video|script|style)'; var ATTRIBUTENAME = '[a-zA-Z_:][a-zA-Z0-9:._-]*'; var UNQUOTEDVALUE = "[^\"'=<>`\\x00-\\x20]+"; var SINGLEQUOTEDVALUE = "'[^']*'"; diff --git a/spec.txt b/spec.txt index 5fc1dac..2a460cc 100644 --- a/spec.txt +++ b/spec.txt @@ -1351,7 +1351,7 @@ An [HTML block tag](#html-block-tag) is an [open tag](#open-tag) or [closing tag](#closing-tag) whose tag name is one of the following (case-insensitive): `article`, `header`, `aside`, `hgroup`, `blockquote`, `hr`, `body`, -`li`, `br`, `map`, `button`, `object`, `canvas`, `ol`, `caption`, +`li`, `map`, `button`, `object`, `canvas`, `ol`, `caption`, `output`, `col`, `p`, `colgroup`, `pre`, `dd`, `progress`, `div`, `section`, `dl`, `table`, `td`, `dt`, `tbody`, `embed`, `textarea`, `fieldset`, `tfoot`, `figcaption`, `th`, `figure`, `thead`, `footer`, diff --git a/src/scanners.re b/src/scanners.re index f90238d..2c2646a 100644 --- a/src/scanners.re +++ b/src/scanners.re @@ -17,7 +17,7 @@ tagname = [A-Za-z][A-Za-z0-9]*; - blocktagname = 'article'|'header'|'aside'|'hgroup'|'blockquote'|'hr'|'body'|'li'|'br'|'map'|'button'|'object'|'canvas'|'ol'|'caption'|'output'|'col'|'p'|'colgroup'|'pre'|'dd'|'progress'|'div'|'section'|'dl'|'table'|'td'|'dt'|'tbody'|'embed'|'textarea'|'fieldset'|'tfoot'|'figcaption'|'th'|'figure'|'thead'|'footer'|'footer'|'tr'|'form'|'ul'|'h1'|'h2'|'h3'|'h4'|'h5'|'h6'|'video'|'script'|'style'; + blocktagname = 'article'|'header'|'aside'|'hgroup'|'blockquote'|'hr'|'body'|'li'|'map'|'button'|'object'|'canvas'|'ol'|'caption'|'output'|'col'|'p'|'colgroup'|'pre'|'dd'|'progress'|'div'|'section'|'dl'|'table'|'td'|'dt'|'tbody'|'embed'|'textarea'|'fieldset'|'tfoot'|'figcaption'|'th'|'figure'|'thead'|'footer'|'footer'|'tr'|'form'|'ul'|'h1'|'h2'|'h3'|'h4'|'h5'|'h6'|'video'|'script'|'style'; attributename = [a-zA-Z_:][a-zA-Z0-9:._-]*; -- cgit v1.2.3