[colorer/Colorer-schemes] master: markdown: further HTML blocks improvement (#200) (9497fb0)

0 views

Skip to first unread message

farg...@farmanager.com

unread,

Jan 31, 2026, 2:31:01 AM (6 days ago) Jan 31

to farco...@googlegroups.com

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

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

commit 9497fb0b1a1dc5f20e78c3bd39394fcf37f8fa3f
Author: exkrexpexfex <75270873+e...@users.noreply.github.com>
Date: Sat Jan 31 10:20:44 2026 +0300

markdown: further HTML blocks improvement (#200)

Fixes nightroman/FarNet#71 new observations

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

9497fb0b1a1dc5f20e78c3bd39394fcf37f8fa3f
base/hrc/misc/markdown.hrc | 20 +++--
tests/test/_valid/other/markdown.md.html | 143 +++++++++++++++++--------------
tests/test/other/markdown.md | 21 ++++-
3 files changed, 110 insertions(+), 74 deletions(-)

diff --git a/base/hrc/misc/markdown.hrc b/base/hrc/misc/markdown.hrc
index c371bf1..e377c21 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), 2026-01-27
+markdown.hrc by Roman Kuzmin (nightroman), 2026-01-30

* Use markdown2 for extensions.
* Opened spans are always colored.
@@ -149,6 +149,12 @@ Contributors:

</scheme>

+<scheme name="HtmlTags">
+ <inherit scheme="html:html">
+ <virtual scheme="html:htmlPairs" subst-scheme="def:empty"/>
+ </inherit>
+</scheme>
+
<scheme name="HtmlBlock">

<block scheme="html:html"
@@ -179,15 +185,15 @@ Contributors:
/>


- <block scheme="html:html"
- start="/\M(?{start}%i3;<\/?%Html;(?:\s|\t|$|>|\/>))/i"
- end="/(?{end}%Blank;)/"
+ <block scheme="HtmlTags"
+ start="/\M(?:%i3;<\/?%Html;(?:\s|\t|$|>|\/>))/i"
+ end="/(?:%Blank;)/"
/>


- <block scheme="html:html"
- start="/\M(?{start}%i3;(?:<%ID;(?:\s+[^<>]*?)?\/?>|<\/%ID;\s*>)[ \t]*$)/i"
- end="/(?{end}%Blank;)/"
+ <block scheme="HtmlTags"
+ start="/\M(?:%i3;(?:<%ID;(?:\s+[^<>]*?)?\/?>|<\/%ID;\s*>)[ \t]*$)/i"
+ end="/(?:%Blank;)/"
/>
</scheme>

diff --git a/tests/test/_valid/other/markdown.md.html b/tests/test/_valid/other/markdown.md.html
index c695de0..44b24f5 100644
--- a/tests/test/_valid/other/markdown.md.html
+++ b/tests/test/_valid/other/markdown.md.html
@@ -1,5 +1,5 @@
0: Inline HTML should not bleed:
- 1: <sub>lower with<br> breaks</sub> and <custom-tag attr="v">inline with<br> breaks</custom-tag>
+ 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=">" />
@@ -15,69 +15,84 @@
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: ]]>
+17:
+18: *Still* __not__
+19: <html lang="en">
+20: <body>
+21: <p>This is <br> HTML</p>
+22: </body>
+23: </html>
+24: </pre>
+25:
+26: HTML block type 2 (comment):
+27: 
+30:
+31: HTML block type 3 (processing instruction):
+32: <?pi
+33: *not markdown*
+34: ?>
+35:
+36: <?xml version="1.0"?>
+37: <?xml-stylesheet href="style.css" type="text/css"?>
+38:
+39: HTML block type 4 (declaration):
+40: <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
+41: "http://www.w3.org/TR/html4/frameset.dtd">
+42:
+43: HTML block type 5 (CDATA):
+44: <![CDATA[
+45: *not markdown*
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">
+47: *Still* __not__
+48: <data attr='v'></data>
+49: ]]>
+50:
+51: HTML block type 6 (block tags, blank line ends):
+52: <div id=1>
+53: *not markdown*
+54:
+55: _Hello_ **markdown*
+56: </div>
+57:
+58: Additional block tag samples (type 6):
+59: <table style="CSS" >
+60: <tr>
+61: *no*
+62:
+63: _yes_
+64: <td attr="v">`not markdown`</td></tr>
+65: </table>
+66:
+67: <section>
+68: *not markdown*
+69: </section>
+70: <SEARCH>
71: *not markdown*
-72: </ns:x-tag>
-73:
-74: In list:
+72:
+73: `markdown`
+74: </SEARCH>
75:
-76: - before
-77: <pre>
-78: `not highlighted` _neither_ *nor this*
-79: </pre>
-80: - after
-81: and here `code span` _emphasis_ **strong**
-82:
+76: HTML block type 7 (complete tag line, blank line ends):
+77: <custom-tag>
+78: *not markdown*
+79: </custom-tag>
+80:
+81: Additional complete-tag samples (type 7):
+82: <ns:x-tag data-x="1">
+83: *not markdown*
+84:
+85: <down>*lies* _mark_</down>
+86: </ns:x-tag>
+87: `not markdown`
+88:
+89: In list:
+90:
+91: - before
+92: <pre>
+93: `not highlighted` _neither_ *nor this*
+94: </pre>
+95: - after
+96: and here `code span` _emphasis_ **strong**
+97:
diff --git a/tests/test/other/markdown.md b/tests/test/other/markdown.md
index 99db318..7825bdb 100644
--- a/tests/test/other/markdown.md
+++ b/tests/test/other/markdown.md
@@ -1,5 +1,5 @@
Inline HTML should not bleed:
-lower with breaks and <custom-tag attr="v">inline with breaks</custom-tag>
+lower with *breaks* and <custom-tag attr="v">inline with breaks</custom-tag>
_and break highlighting_.

Inline <div style=">" />
@@ -15,6 +15,8 @@ HTML block type 1 (pre/script/style/textarea):
`not`
_markdown_
<!DOCTYPE html>
+
+*Still* __not__
<html lang="en">
<body>
This is HTML
@@ -42,17 +44,25 @@ HTML block type 4 (declaration):
HTML block type 5 (CDATA):
<![CDATA[
*not markdown*
+
+*Still* __not__
<data attr='v'></data>
]]>

HTML block type 6 (block tags, blank line ends):
-<div>
+<div id=1>
*not markdown*
+
+_Hello_ **markdown*
</div>

Additional block tag samples (type 6):
<table style="CSS" >
-<tr><td attr="v">`not markdown`</td></tr>
+<tr>
+*no*
+
+_yes_
+<td attr="v">`not markdown`</td></tr>
</table>

<section>
@@ -60,6 +70,8 @@ Additional block tag samples (type 6):
</section>
<SEARCH>
*not markdown*
+
+`markdown`
</SEARCH>

HTML block type 7 (complete tag line, blank line ends):
@@ -70,7 +82,10 @@ HTML block type 7 (complete tag line, blank line ends):
Additional complete-tag samples (type 7):
<ns:x-tag data-x="1">
*not markdown*
+
+<down>*lies* _mark_</down>
</ns:x-tag>
+`not markdown`

In list:

Reply all

Reply to author

Forward

0 new messages