From a301337084eaa6d7381703e8d96dd7ac9d308629 Mon Sep 17 00:00:00 2001 From: TestSubject528491 Date: Thu, 25 Jul 2013 12:15:28 -0400 Subject: [PATCH 1/4] started adding syntax and itemizer support --- .gitignore | 1 + Itemizers/HTML5.xml | 56 +++++++ Languages.xml | 11 ++ Syntaxes/HTML5Syntax.xml | 317 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 385 insertions(+) create mode 100644 .gitignore create mode 100644 Itemizers/HTML5.xml create mode 100644 Syntaxes/HTML5Syntax.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e43b0f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store diff --git a/Itemizers/HTML5.xml b/Itemizers/HTML5.xml new file mode 100644 index 0000000..08107c6 --- /dev/null +++ b/Itemizers/HTML5.xml @@ -0,0 +1,56 @@ + + + + + ESCommentItem + html.comment.conditional:has-child(conditional.start:has-child(condition:capture(name))) + + + + + + + ESCommentItem + html.comment + + + + + + + html.tag.open:has-child(name[text='datalist']:capture(name)) + html.tag.close:has-child(name[text == $name.text]) + + + html.tag.open:has-child(name[text='option']:capture(name)) + ESXHTMLItem + + + + ESXHTMLItem + + + + html.tag.open:has-child(name:capture(name)) + html.tag.close:has-child(name[text == $name.text]) + + + + ESXHTMLItem + + + + html.tag.open:has-child(name:capture(name), empty-element-marker), html.tag.self-closing:has-child(name:capture(name)), html.tag.open:has-child(name:capture(name), self-closing) + ESXHTMLItem + + + + + + diff --git a/Languages.xml b/Languages.xml index 2b8e2b4..041c9be 100644 --- a/Languages.xml +++ b/Languages.xml @@ -8,4 +8,15 @@ 0.1 git://github.com/minimalweb/HTML5.sugar.git + + langage-root.html + HTML5 + + html + htm + shtml + shtm + xhtml + + \ No newline at end of file diff --git a/Syntaxes/HTML5Syntax.xml b/Syntaxes/HTML5Syntax.xml new file mode 100644 index 0000000..8a1b51f --- /dev/null +++ b/Syntaxes/HTML5Syntax.xml @@ -0,0 +1,317 @@ + + + + + + <!--- + + + + --> + + + + + + (<!)(?i:DOCTYPE) + + + + + > + + + + + + (?=<(?i:style)) + + + (</)((?i:style))(>) + + + + + + + + + (<)((?i:style)) + + + + + (/?)(>) + + + + + + + + + + (?<=>)\s*(<!--)? + + + + (-->\s*)?(?=</(?i:style)>) + + + + + + + + + + + (?=<(?i:script)) + + + (</)((?i:script))(>) + + + + + + + + + (<)((?i:script)) + + + + + (/?)(>) + + + + + + + + + + (?<=>)\s*(<!--)? + + + + ((?://)?\s*(?:-->|]]>)\s*)?(?=</(?i:script)>) + + + + + + + + + + + + + + + + + (<)(base|basefont|img|br|link|meta|hr|input|command|col|wbr|source|track) + + + + + (/?)(>) + + + + + + + + + + (<)(address|article|aside|audio|blockquote|body|canvas|caption|center|colgroup|dd|details|dir|div|dl|dt|embed|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hgroup|html|iframe|li|map|menu|noframes|noscript|object|ol|output|p|pre|progress|samp|section|table|tbody|td|textarea|tfoot|th|thead|title|tr|ul|video)\b + + + + + (/?)(>) + + + + + + + + + + (</)(address|article|aside|audio|blockquote|body|canvas|caption|center|colgroup|dd|details|dir|div|dl|dt|embed|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hgroup|html|iframe|li|map|menu|noframes|noscript|object|ol|output|p|pre|progress|samp|section|table|tbody|td|textarea|tfoot|th|thead|title|tr|ul|video)\b + + + + + (>) + + + + + + (<)(a|abbr|acronym|big|cite|code|dfn|command|em|font|i|kbd|mark|meter|nav|q|s|small|span|strike|strong|sub|summary|sup|time|tt|u|var)\b + + + + + (/?)(>) + + + + + + + + + + (</)(a|abbr|acronym|big|cite|code|dfn|command|em|font|i|kbd|mark|meter|nav|q|s|small|span|strike|strong|sub|summary|sup|time|tt|u|var)\b + + + + + (>) + + + + + + (<)([a-zA-Z:_]+[a-zA-Z:_0-9.-]*) + + + + + (/?)(>) + + + + + + + + + + (</)([a-zA-Z:_]+[a-zA-Z:_0-9.-]*) + + + + + (>) + + + + + + + ((&)(?:[a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;))|(&) + + + + + + + + + + + + \s+(id)(=)((")([^"]*)(")|(')([^']*)('))|\s+(class)(=)((")([^"]*)(")|(')([^']*)(')) + + + + + + + + + + + + + + + + + + + + + + + + + \s+(style)(=)((")([^"]*)(")|(')([^']*)('))|\s+(on[a-zA-Z]+)(=)((")(.*?)((?<!\\)")|(')(.*?)((?<!\\)'))|\s+([-_a-zA-Z0-9:]+)(=) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ([^:]+)(:)(.*) + + + + + + + + + + + + + + + ("|') + + + + \1 + + + + + + + \ No newline at end of file From 31c0f79c2d6696baeab155478ff3ff01c9630ee2 Mon Sep 17 00:00:00 2001 From: TestSubject528491 Date: Thu, 25 Jul 2013 12:33:27 -0400 Subject: [PATCH 2/4] moved self-closing tags below open/closed tags --- Syntaxes/HTML5Syntax.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Syntaxes/HTML5Syntax.xml b/Syntaxes/HTML5Syntax.xml index 8a1b51f..3f00dca 100644 --- a/Syntaxes/HTML5Syntax.xml +++ b/Syntaxes/HTML5Syntax.xml @@ -112,21 +112,6 @@ - - - (<)(base|basefont|img|br|link|meta|hr|input|command|col|wbr|source|track) - - - - - (/?)(>) - - - - - - - (<)(address|article|aside|audio|blockquote|body|canvas|caption|center|colgroup|dd|details|dir|div|dl|dt|embed|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hgroup|html|iframe|li|map|menu|noframes|noscript|object|ol|output|p|pre|progress|samp|section|table|tbody|td|textarea|tfoot|th|thead|title|tr|ul|video)\b @@ -179,6 +164,21 @@ + + + (<)(base|img|br|link|meta|hr|input|command|col|wbr|source|track) + + + + + (/?)(>) + + + + + + + (<)([a-zA-Z:_]+[a-zA-Z:_0-9.-]*) From 8b88def3939fae2f4b51f577999c8d404fbdc8f8 Mon Sep 17 00:00:00 2001 From: TestSubject528491 Date: Mon, 29 Jul 2013 13:04:19 -0400 Subject: [PATCH 3/4] fixed typo --- Languages.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Languages.xml b/Languages.xml index 041c9be..3cbd3cf 100644 --- a/Languages.xml +++ b/Languages.xml @@ -9,7 +9,7 @@ git://github.com/minimalweb/HTML5.sugar.git - langage-root.html + language-root.html HTML5 html From 69a51c43c260a3398bba6c7fcf2881e2ad6aabe8 Mon Sep 17 00:00:00 2001 From: TestSubject528491 Date: Tue, 30 Jul 2013 01:43:31 -0400 Subject: [PATCH 4/4] fixed typo --- Syntaxes/HTML5Syntax.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Syntaxes/HTML5Syntax.xml b/Syntaxes/HTML5Syntax.xml index 3f00dca..af647e2 100644 --- a/Syntaxes/HTML5Syntax.xml +++ b/Syntaxes/HTML5Syntax.xml @@ -3,7 +3,7 @@ - <!--- + <!--