[colorer/Colorer-schemes] master: markdown: improve HTML handling (inline tags and CommonMark blocks) (#198) (de6df5f)

0 views

Skip to first unread message

farg...@farmanager.com

unread,

Jan 28, 2026, 1:01:10 PM (9 days ago) Jan 28

to farco...@googlegroups.com

Repository : https://github.com/colorer/Colorer-schemes
On branch : master
Link : https://github.com/colorer/Colorer-schemes/commit/de6df5f720e1cdfe43f8f1e37d7f55563413fe0b

>---------------------------------------------------------------

commit de6df5f720e1cdfe43f8f1e37d7f55563413fe0b
Author: exkrexpexfex <75270873+e...@users.noreply.github.com>
Date: Wed Jan 28 20:57:53 2026 +0300

markdown: improve HTML handling (inline tags and CommonMark blocks) (#198)

Fixes nightroman/FarNet#71

>---------------------------------------------------------------

de6df5f720e1cdfe43f8f1e37d7f55563413fe0b
CHANGELOG.md | 1 +
base/hrc/misc/markdown.hrc | 69 ++++++++++++++++++++++----
tests/test/_valid/other/markdown.md.html | 83 ++++++++++++++++++++++++++++++++
tests/test/other/markdown.md | 82 +++++++++++++++++++++++++++++++
4 files changed, 226 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be1d98f..bd9517a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,7 @@
- [verilog] add define, include, timescale support
- [cmake] fix escaping strings
- [cpp] functions outliner list cleanup
+- [markdown] improve HTML handling (inline tags and CommonMark blocks)

### Added
- New package type of base - all packed. Hrc and hrd files in one archive. Directory 'auto' not in archive.
diff --git a/base/hrc/misc/markdown.hrc b/base/hrc/misc/markdown.hrc
index 74efc00..c371bf1 100644
--- a/base/hrc/misc/markdown.hrc
+++ b/base/hrc/misc/markdown.hrc
@@ -7,7 +7,7 @@ xsi:schemaLocation="http://colorer.sf.net/2003/hrc http://colorer.sf.net/2003/hr
<type name="markdown">
<annotation><documentation><![CDATA[

-markdown.hrc by Roman Kuzmin (nightroman), 2025-05-09
+markdown.hrc by Roman Kuzmin (nightroman), 2026-01-27

* Use markdown2 for extensions.
* Opened spans are always colored.
@@ -18,13 +18,15 @@ markdown.hrc by Roman Kuzmin (nightroman), 2025-05-09

Inline HTML

-* ALLCAPS tags are treated separately, not affecting markdown, see #6: https://github.github.com/gfm/#html-block
-* Other HTML is treated as XML and should be well formed.
+* HTML highlighting applies to CommonMark HTML blocks https://spec.commonmark.org/0.31.2/#html-blocks
+* Inline HTML tags are highlighted as tags only and do not disable markdown parsing inside.

Inline JavaScript

* <% %> marks Obsidian Templater blocks.

+Contributors:
+ Alexey Shelaev
]]></documentation></annotation>

<region name="Anchor" parent="def:LabelStrong" description="{#Anchor}"/>
@@ -86,6 +88,7 @@ Inline JavaScript
<entity name="Html" value="(?: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|H2|H3|H4|H5|H6|HEAD|HEADER|HR|HTML|IFRAME|LEGEND|LI|LINK|MAIN|MENU|MENUITEM|NAV|NOFRAMES|OL|OPTGROUP|OPTION|P|PARAM|SECTION|SOURCE|SUMMARY|TABLE|TBODY|TD|TFOOT|TH|THEAD|TITLE|TR|TRACK|UL)"/>

<entity name="Top" value="^(?:\s*$|%Rule;|%Head;|%Ref;|%Abbr;)"/>
+<entity name="Blank" value="^\s*$"/>
<entity name="LEnd" value="^(?:%Top;|\s*%List2;|%Fence;|%i3;%Quote;)?="/>
<entity name="PEnd" value="^(?:%Top;| {,3}:\s+\S|%Fence;|%i3;%Quote;)?="/>

@@ -134,16 +137,57 @@ Inline JavaScript
<scheme name="Html">
<regexp match="/(?{LinkMark}<)(?{LinkText}%URI;|%Email;)(?{LinkMark}>)/"/>

+ <block scheme="def:Comment" region="def:Comment"
+ start="/(?{start})/"
+ />
<block scheme="xml:Attribute"
- start="/(?{start}(?{xml:element.start.lt}<)(?{xml:element.start.name}%Html;)\b)/"
- end="/(?{end}(?{xml:element.start.gt}>))/"
+ start="/(?{start}(?{xml:element.start.lt}<)(?{xml:element.start.name}%ID;)\b)/"
+ end="/(?{end}(?{xml:element.start.gt}\/?>))/"
+ />
+
+ <regexp match="/(?{xml:element.end.lt}<\/)(?{xml:element.end.name}%ID;)(?{xml:element.end.gt}>)/"/>
+
+</scheme>
+
+<scheme name="HtmlBlock">
+ 
+ <block scheme="html:html"
+ start="/(?{start}%i3;(?{html:htmlTagBr}<(?{html:htmlOpenTag}(?{starttag}pre|script|style|textarea))(?:\s+[^<>]*?)?(?:>|$)))/i"
+ end="/(?{end}(?{html:htmlTagBr}<\/(?{html:htmlCloseTag}\y{starttag}\b\s*)>))/i"
/>

- <regexp match="/(?{xml:element.end.lt}<\/)(?{xml:element.end.name}%Html;)(?{xml:element.end.gt}>)/"/>
+ 
+ 
+
+ 
+ <block scheme="html:htmlCoreParams"
+ start="/(?{start}%i3;(?{html:htmlTagBr}<\?%ID;*))/"
+ end="/(?{end}(?{html:htmlTagBr}\?>))/"
+ />

- <block scheme="xml:xml"
- start="/\M<(?:!--|\d?!\w+(?:\s|\/?>|$))/"
- end="//"
+ 
+ <block scheme="html:html"
+ start="/(?{start}%i3;<![A-Za-z])/i"
+ end="/(?{end}>)/"
+ region="html:htmlDirective"
+ />
+
+ 
+ <block scheme="html:html"
+ start="/(?{start}%i3;(?{BlindMark}<!\[CDATA\[))/"
+ end="/(?{end}(?{BlindMark}\]\]>))/"
+ />
+
+ 
+ <block scheme="html:html"
+ start="/\M(?{start}%i3;<\/?%Html;(?:\s|\t|$|>|\/>))/i"
+ end="/(?{end}%Blank;)/"
+ />
+
+ 
+ <block scheme="html:html"
+ start="/\M(?{start}%i3;(?:<%ID;(?:\s+[^<>]*?)?\/?>|<\/%ID;\s*>)[ \t]*$)/i"
+ end="/(?{end}%Blank;)/"
/>
</scheme>

@@ -153,6 +197,7 @@ Inline JavaScript
<inherit scheme="CodeSpan"/>
<inherit scheme="LinkSpan"/>
<inherit scheme="Template"/>
+ <inherit scheme="HtmlBlock"/>
<inherit scheme="Html"/>
</scheme>

@@ -201,6 +246,7 @@ Inline JavaScript
</scheme>

<scheme name="Quote">
+ <inherit scheme="HtmlBlock"/>
<inherit scheme="Wrap"/>
<inherit scheme="Escape"/>
<inherit scheme="Template"/>
@@ -234,6 +280,7 @@ Inline JavaScript
</scheme>

<scheme name="Item3">
+ <inherit scheme="HtmlBlock"/>
<block scheme="Template" region="QuoteText"
start="/(?{start}%s12;%QuoteMark;)/" end="/(?{end})\M(?:%Top;|^\s+%List1;|%x4;{,3}%Fence;|%i11;%Quote;)/"/>

@@ -259,6 +306,7 @@ Inline JavaScript
</scheme>

<scheme name="Item2">
+ <inherit scheme="HtmlBlock"/>
<block scheme="Template" region="QuoteText"
start="/(?{start}%s8;%QuoteMark;)/" end="/(?{end})\M(?:%Top;|^\s+%List1;|%x4;{,2}%Fence;|%i7;%Quote;)/"/>

@@ -284,6 +332,7 @@ Inline JavaScript
</scheme>

<scheme name="Item">
+ <inherit scheme="HtmlBlock"/>
<block scheme="Template" region="QuoteText"
start="/(?{start}%s4;%QuoteMark;)/" end="/(?{end})\M(?:%Top;|^\s+%List1;|%x4;%Fence;|%i3;%Quote;)/"/>

@@ -311,6 +360,8 @@ Inline JavaScript
<scheme name="markdown">

<inherit scheme="markdown2:markdown2" />
+ <inherit scheme="HtmlBlock"/>
+

<regexp match="/^(?{Rule}%Rule;)/"/>

diff --git a/tests/test/_valid/other/markdown.md.html b/tests/test/_valid/other/markdown.md.html
new file mode 100644
index 0000000..c695de0
--- /dev/null
+++ b/tests/test/_valid/other/markdown.md.html
@@ -0,0 +1,83 @@
+ 0: Inline HTML should not bleed:
+ 1: <sub>lower with<br> breaks</sub> and <custom-tag attr="v">inline with<br> breaks</custom-tag>
+ 2: _and break highlighting_.
+ 3:
+ 4: Inline <div style=">" />
+ 5:
+ 6: 
+ 7:
+ 8: Inline  followed by a self-closing tag <hr />
+ 9:
+10: HTML block type 1 (pre/script/style/textarea):
+11: <pre>
+12: *This*
+13: **is**
+14: `not`
+15: _markdown_
+16: <!DOCTYPE html>
+17: <html lang="en">
+18: <body>
+19: <p>This is <br> HTML</p>
+20: </body>
+21: </html>
+22: </pre>
+23:
+24: HTML block type 2 (comment):
+25: 
+28:
+29: HTML block type 3 (processing instruction):
+30: <?pi
+31: *not markdown*
+32: ?>
+33:
+34: <?xml version="1.0"?>
+35: <?xml-stylesheet href="style.css" type="text/css"?>
+36:
+37: HTML block type 4 (declaration):
+38: <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
+39: "http://www.w3.org/TR/html4/frameset.dtd">
+40:
+41: HTML block type 5 (CDATA):
+42: <![CDATA[
+43: *not markdown*
+44: <data attr='v'></data>
+45: ]]>
+46:
+47: HTML block type 6 (block tags, blank line ends):
+48: <div>
+49: *not markdown*
+50: </div>
+51:
+52: Additional block tag samples (type 6):
+53: <table style="CSS" >
+54: <tr><td attr="v">`not markdown`</td></tr>
+55: </table>
+56:
+57: <section>
+58: *not markdown*
+59: </section>
+60: <SEARCH>
+61: *not markdown*
+62: </SEARCH>
+63:
+64: HTML block type 7 (complete tag line, blank line ends):
+65: <custom-tag>
+66: *not markdown*
+67: </custom-tag>
+68:
+69: Additional complete-tag samples (type 7):
+70: <ns:x-tag data-x="1">
+71: *not markdown*
+72: </ns:x-tag>
+73:
+74: In list:
+75:
+76: - before
+77: <pre>
+78: `not highlighted` _neither_ *nor this*
+79: </pre>
+80: - after
+81: and here `code span` _emphasis_ **strong**
+82:
diff --git a/tests/test/other/markdown.md b/tests/test/other/markdown.md
new file mode 100644
index 0000000..99db318
--- /dev/null
+++ b/tests/test/other/markdown.md
@@ -0,0 +1,82 @@
+Inline HTML should not bleed:
+lower with breaks and <custom-tag attr="v">inline with breaks</custom-tag>
+_and break highlighting_.
+
+Inline <div style=">" />
+
+
+
+Inline  followed by a self-closing tag <hr />
+
+HTML block type 1 (pre/script/style/textarea):
+<pre>
+ *This*
+ **is**
+ `not`
+ _markdown_
+<!DOCTYPE html>
+<html lang="en">
+<body>
+ This is HTML
+</body>
+</html>
+</pre>
+
+HTML block type 2 (comment):
+
+
+HTML block type 3 (processing instruction):
+<?pi
+*not markdown*
+?>
+
+<?xml version="1.0"?>
+<?xml-stylesheet href="style.css" type="text/css"?>
+
+HTML block type 4 (declaration):
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
+ "http://www.w3.org/TR/html4/frameset.dtd">
+
+HTML block type 5 (CDATA):
+<![CDATA[
+*not markdown*
+<data attr='v'></data>
+]]>
+
+HTML block type 6 (block tags, blank line ends):
+<div>
+*not markdown*
+</div>
+
+Additional block tag samples (type 6):
+<table style="CSS" >
+<tr><td attr="v">`not markdown`</td></tr>
+</table>
+
+<section>
+*not markdown*
+</section>
+<SEARCH>
+*not markdown*
+</SEARCH>
+
+HTML block type 7 (complete tag line, blank line ends):
+<custom-tag>
+*not markdown*
+</custom-tag>
+
+Additional complete-tag samples (type 7):
+<ns:x-tag data-x="1">
+*not markdown*
+</ns:x-tag>
+
+In list:
+
+- before
+ <pre>
+ `not highlighted` _neither_ *nor this*
+ </pre>
+- after
+ and here `code span` _emphasis_ **strong**

Reply all

Reply to author

Forward

0 new messages