From 84bf5dbdfe3db1cc4fc9e01b1ffd46ee98239360 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Sat, 27 Aug 2022 04:26:20 +0400
Subject: [PATCH 1/2] bash.xml: Reformat for better looking

Signed-off-by: Alex Turbov <i.zaufi@gmail.com>
---
 data/syntax/bash.xml | 180 +++++++++++++++++++++++--------------------
 1 file changed, 95 insertions(+), 85 deletions(-)

diff --git a/data/syntax/bash.xml b/data/syntax/bash.xml
index 905851ea..264a121c 100644
--- a/data/syntax/bash.xml
+++ b/data/syntax/bash.xml
@@ -1,70 +1,80 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd"
 [
-        <!ENTITY tab      "&#009;">
-        <!ENTITY funcname "([^&_fragpathseps;}=#$]|[+!@](?!\())([^&_fragpathseps;}=$]*+([+!@](?!\())?+)*+">
-        <!ENTITY varname  "[A-Za-z_][A-Za-z0-9_]*">
-        <!ENTITY eos      "(?=$|[ &tab;])">                 <!-- eol or space following -->
-        <!ENTITY eoexpr   "(?=$|[ &tab;&lt;>|&amp;;)])">
-
-        <!ENTITY substseps  "${'&quot;`\\">
-        <!ENTITY symbolseps "&lt;>|&amp;;()"> <!-- see man bash -->
-        <!ENTITY wordseps   " &tab;&symbolseps;"> <!-- see man bash -->
-
-        <!ENTITY bq_string  "`[^`]*+`">
-        <!ENTITY sq_string  "'[^']*+'">
-        <!ENTITY dq_string  "&quot;(?:[^&quot;\\`]*+|&bq_string;|\\.)*+&quot;">
-        <!ENTITY strings    "(?:&sq_string;|&dq_string;|&bq_string;)">
-
-        <!ENTITY globany    "\[(?:[^&wordseps;&quot;'`\\\[\]]+|\\.|&strings;|\[:\w+:\]|\[)*\]">
-
-        <!ENTITY next_is_globany    "(?:\^?\]\]|(?:\^?\]?)?(?:\\.|[^'&quot; &tab;&lt;>|&amp;;()\\[\]]+|&strings;|\[:\w+:\])+\])">
-        <!ENTITY bracket_noglobany  "\[(?!&next_is_globany;)">
-
-        <!ENTITY _fragpathseps  "*?+!@&wordseps;&substseps;">
-        <!ENTITY _fragpathnosep "(?:[+!@](?!\()|\\.|&_brace_noexpansion;)?+">
-        <!ENTITY path       "(?:[^&_fragpathseps;\[]*+&_fragpathnosep;)*+">
-        <!ENTITY fragpath   "(?:[^&_fragpathseps;\[/]*+&_fragpathnosep;)*+">
-        <!ENTITY opt        "(?:[^&_fragpathseps;\[=/]*+&_fragpathnosep;)*+">
-        <!ENTITY pathpart   "(?:~|\.\.?|&fragpath;)(?:/&path;|(?=[*?]|[+!@]\(|&fragpath;(?:[/*?]|\[&next_is_globany;|[+!@]\()))|(?:~|\.\.?)(?=[&wordseps;]|$)">
-
-        <!ENTITY _fragpathseps_alt  "*?+!@&substseps;}">
-        <!ENTITY _fragpathnosep_alt "(?:[+!@](?!\()|\\.)?+">
-        <!ENTITY path_alt       "(?:[^&_fragpathseps_alt;]*+&_fragpathnosep_alt;)*+">
-        <!ENTITY fragpath_alt   "(?:[^&_fragpathseps_alt;/]*+&_fragpathnosep_alt;)*+">
-        <!ENTITY opt_alt        "(?:[^&_fragpathseps_alt;=/]*+&_fragpathnosep_alt;)*+">
-        <!ENTITY pathpart_alt   "(?:~|\.\.?|&fragpath_alt;)(?:/&path_alt;|(?=[*?]|[+!@]\(|&fragpath_alt;(?:[/*?]|[+!@]\()))|(?:~|\.\.?)(?=\}|$)">
-
-        <!-- Path only with / -->
-        <!ENTITY path_with_sep_text  "[^?*+!@&wordseps;'&quot;`\\/]">
-        <!ENTITY path_with_sep_text2 "[^?*+!@()'&quot;`\\/]">
-        <!ENTITY path_with_sep_expr  "\\.|&strings;|&globany;|[?*+](?!\()">
-        <!ENTITY path_with_sep_spe   "(~|\.\.?)($|[/ &tab;&lt;>|&amp;;)])">
-        <!ENTITY path_with_sep_sub   "[?*+!@]\((&path_with_sep_text2;++|&path_with_sep_expr;)*+(\)|(?=/))">
-        <!ENTITY path_with_sep "/|&path_with_sep_spe;|(&path_with_sep_text;++|&path_with_sep_expr;|&path_with_sep_sub;)*+/">
-
-        <!ENTITY _braceexpansion_spe     " &tab;&lt;>|&amp;;{}\\`'&quot;$">
-        <!ENTITY _brace_noexpansion       "\{[^&_braceexpansion_spe;,]*+\}">
-        <!ENTITY _braceexpansion_var     "\$(?:\{[^\[\]&_braceexpansion_spe;]*+(?:\[[*@a-zA-Z0-9]\])\})?">
-        <!ENTITY _braceexpansion_string  "'[^']*'|&quot;([^&quot;\`]*+|`[^`]*`)*+&quot;">
-        <!ENTITY _braceexpansion_elems   "\\.|`[^`]*`|&_braceexpansion_string;|&_braceexpansion_var;|&_brace_noexpansion;">
-        <!ENTITY _braceexpansion_consume "&_braceexpansion_elems;|{(?:[^&_braceexpansion_spe;,]++|&_braceexpansion_elems;)*?}|(?R)?+">
-        <!ENTITY _braceexpansion "(?:[^&_braceexpansion_spe;,]++|&_braceexpansion_consume;)*?,(?:[^&_braceexpansion_spe;]++|&_braceexpansion_consume;)*?}">
-        <!ENTITY braceexpansion "{&_braceexpansion;">
-
-        <!ENTITY heredocq "(?|&quot;([^&quot;]+)&quot;|'([^']+)'|\\(.[^&wordseps;&substseps;]*))">
-
-        <!ENTITY arithmetic_as_subshell "\(((?:[^`'&quot;()$]++|\$\{[^`'&quot;(){}$]+\}|\$(?=[^{`'&quot;()])|`[^`]*+`|\((?1)(?:[)]|(?=['&quot;])))++)(?:[)](?=$|[^)])|[&quot;'])">
-
-        <!ENTITY unary_operators  "-[abcdefghkprstuwxGLNOSovRnz]&eos;">
-        <!ENTITY binary_operators "(?:-(?:e[fq]|[nolg]t|[nlg]e)|==?|!=)&eos;">
-
-        <!ENTITY dblbracket_close "\]\](?=($|[ &tab;;|&amp;)]))">
-
-        <!ENTITY weakDeliminatorSymbols "^&#37;#[]$.{}:-/">
+    <!ENTITY tab      "&#009;">
+    <!ENTITY funcname "([^&_fragpathseps;}=#$]|[+!@](?!\())([^&_fragpathseps;}=$]*+([+!@](?!\())?+)*+">
+    <!ENTITY varname  "[A-Za-z_][A-Za-z0-9_]*">
+    <!ENTITY eos      "(?=$|[ &tab;])">                 <!-- eol or space following -->
+    <!ENTITY eoexpr   "(?=$|[ &tab;&lt;>|&amp;;)])">
+
+    <!ENTITY substseps  "${'&quot;`\\">
+    <!ENTITY symbolseps "&lt;>|&amp;;()"> <!-- see man bash -->
+    <!ENTITY wordseps   " &tab;&symbolseps;"> <!-- see man bash -->
+
+    <!ENTITY bq_string  "`[^`]*+`">
+    <!ENTITY sq_string  "'[^']*+'">
+    <!ENTITY dq_string  "&quot;(?:[^&quot;\\`]*+|&bq_string;|\\.)*+&quot;">
+    <!ENTITY strings    "(?:&sq_string;|&dq_string;|&bq_string;)">
+
+    <!ENTITY globany    "\[(?:[^&wordseps;&quot;'`\\\[\]]+|\\.|&strings;|\[:\w+:\]|\[)*\]">
+
+    <!ENTITY next_is_globany    "(?:\^?\]\]|(?:\^?\]?)?(?:\\.|[^'&quot; &tab;&lt;>|&amp;;()\\[\]]+|&strings;|\[:\w+:\])+\])">
+    <!ENTITY bracket_noglobany  "\[(?!&next_is_globany;)">
+
+    <!ENTITY _fragpathseps  "*?+!@&wordseps;&substseps;">
+    <!ENTITY _fragpathnosep "(?:[+!@](?!\()|\\.|&_brace_noexpansion;)?+">
+    <!ENTITY path       "(?:[^&_fragpathseps;\[]*+&_fragpathnosep;)*+">
+    <!ENTITY fragpath   "(?:[^&_fragpathseps;\[/]*+&_fragpathnosep;)*+">
+    <!ENTITY opt        "(?:[^&_fragpathseps;\[=/]*+&_fragpathnosep;)*+">
+    <!ENTITY pathpart   "(?:~|\.\.?|&fragpath;)(?:/&path;|(?=[*?]|[+!@]\(|&fragpath;(?:[/*?]|\[&next_is_globany;|[+!@]\()))|(?:~|\.\.?)(?=[&wordseps;]|$)">
+
+    <!ENTITY _fragpathseps_alt  "*?+!@&substseps;}">
+    <!ENTITY _fragpathnosep_alt "(?:[+!@](?!\()|\\.)?+">
+    <!ENTITY path_alt       "(?:[^&_fragpathseps_alt;]*+&_fragpathnosep_alt;)*+">
+    <!ENTITY fragpath_alt   "(?:[^&_fragpathseps_alt;/]*+&_fragpathnosep_alt;)*+">
+    <!ENTITY opt_alt        "(?:[^&_fragpathseps_alt;=/]*+&_fragpathnosep_alt;)*+">
+    <!ENTITY pathpart_alt   "(?:~|\.\.?|&fragpath_alt;)(?:/&path_alt;|(?=[*?]|[+!@]\(|&fragpath_alt;(?:[/*?]|[+!@]\()))|(?:~|\.\.?)(?=\}|$)">
+
+    <!-- Path only with / -->
+    <!ENTITY path_with_sep_text  "[^?*+!@&wordseps;'&quot;`\\/]">
+    <!ENTITY path_with_sep_text2 "[^?*+!@()'&quot;`\\/]">
+    <!ENTITY path_with_sep_expr  "\\.|&strings;|&globany;|[?*+](?!\()">
+    <!ENTITY path_with_sep_spe   "(~|\.\.?)($|[/ &tab;&lt;>|&amp;;)])">
+    <!ENTITY path_with_sep_sub   "[?*+!@]\((&path_with_sep_text2;++|&path_with_sep_expr;)*+(\)|(?=/))">
+    <!ENTITY path_with_sep "/|&path_with_sep_spe;|(&path_with_sep_text;++|&path_with_sep_expr;|&path_with_sep_sub;)*+/">
+
+    <!ENTITY _braceexpansion_spe     " &tab;&lt;>|&amp;;{}\\`'&quot;$">
+    <!ENTITY _brace_noexpansion       "\{[^&_braceexpansion_spe;,]*+\}">
+    <!ENTITY _braceexpansion_var     "\$(?:\{[^\[\]&_braceexpansion_spe;]*+(?:\[[*@a-zA-Z0-9]\])\})?">
+    <!ENTITY _braceexpansion_string  "'[^']*'|&quot;([^&quot;\`]*+|`[^`]*`)*+&quot;">
+    <!ENTITY _braceexpansion_elems   "\\.|`[^`]*`|&_braceexpansion_string;|&_braceexpansion_var;|&_brace_noexpansion;">
+    <!ENTITY _braceexpansion_consume "&_braceexpansion_elems;|{(?:[^&_braceexpansion_spe;,]++|&_braceexpansion_elems;)*?}|(?R)?+">
+    <!ENTITY _braceexpansion "(?:[^&_braceexpansion_spe;,]++|&_braceexpansion_consume;)*?,(?:[^&_braceexpansion_spe;]++|&_braceexpansion_consume;)*?}">
+    <!ENTITY braceexpansion "{&_braceexpansion;">
+
+    <!ENTITY heredocq "(?|&quot;([^&quot;]+)&quot;|'([^']+)'|\\(.[^&wordseps;&substseps;]*))">
+
+    <!ENTITY arithmetic_as_subshell "\(((?:[^`'&quot;()$]++|\$\{[^`'&quot;(){}$]+\}|\$(?=[^{`'&quot;()])|`[^`]*+`|\((?1)(?:[)]|(?=['&quot;])))++)(?:[)](?=$|[^)])|[&quot;'])">
+
+    <!ENTITY unary_operators  "-[abcdefghkprstuwxGLNOSovRnz]&eos;">
+    <!ENTITY binary_operators "(?:-(?:e[fq]|[nolg]t|[nlg]e)|==?|!=)&eos;">
+
+    <!ENTITY dblbracket_close "\]\](?=($|[ &tab;;|&amp;)]))">
+
+    <!ENTITY weakDeliminatorSymbols "^&#37;#[]$.{}:-/">
 ]>
 
-<language name="Bash" version="42" kateversion="5.79" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.exlib;*.exheres-0;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language
+    name="Bash"
+    version="42"
+    kateversion="5.79"
+    section="Scripts"
+    extensions="*.sh;*.bash;*.ebuild;*.eclass;*.exlib;*.exheres-0;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD"
+    mimetype="application/x-shellscript"
+    casesensitive="1"
+    author="Wilbert Berendsen (wilbert@kde.nl)"
+    license="LGPL"
+  >
 
 <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
@@ -1800,37 +1810,37 @@
     <itemDatas>
       <itemData name="Normal Text"    defStyleNum="dsNormal"/>
       <itemData name="Comment"        defStyleNum="dsComment"/>
-      <itemData name="Keyword"        defStyleNum="dsKeyword" spellChecking="false"/>
-      <itemData name="Control"        defStyleNum="dsKeyword" spellChecking="false"/>
-      <itemData name="Control Flow"   defStyleNum="dsControlFlow" spellChecking="false"/>
-      <itemData name="Builtin"        defStyleNum="dsBuiltIn" spellChecking="false"/>
-      <itemData name="Command"        defStyleNum="dsFunction" spellChecking="false"/>
-      <itemData name="OtherCommand"   defStyleNum="dsExtension" spellChecking="false"/>
-      <itemData name="Redirection"    defStyleNum="dsOperator" spellChecking="false"/>
-      <itemData name="Escape"         defStyleNum="dsDataType" spellChecking="false"/>
+      <itemData name="Keyword"        defStyleNum="dsKeyword"       spellChecking="false"/>
+      <itemData name="Control"        defStyleNum="dsKeyword"       spellChecking="false"/>
+      <itemData name="Control Flow"   defStyleNum="dsControlFlow"   spellChecking="false"/>
+      <itemData name="Builtin"        defStyleNum="dsBuiltIn"       spellChecking="false"/>
+      <itemData name="Command"        defStyleNum="dsFunction"      spellChecking="false"/>
+      <itemData name="OtherCommand"   defStyleNum="dsExtension"     spellChecking="false"/>
+      <itemData name="Redirection"    defStyleNum="dsOperator"      spellChecking="false"/>
+      <itemData name="Escape"         defStyleNum="dsDataType"      spellChecking="false"/>
       <itemData name="String SingleQ" defStyleNum="dsString"/>
       <itemData name="String DoubleQ" defStyleNum="dsString"/>
       <itemData name="Here Doc"       defStyleNum="dsString"/>
-      <itemData name="Backquote"      defStyleNum="dsKeyword" spellChecking="false"/>
+      <itemData name="Backquote"      defStyleNum="dsKeyword"       spellChecking="false"/>
       <itemData name="String Transl." defStyleNum="dsString"/>
       <itemData name="String Escape"  defStyleNum="dsDataType"/>
-      <itemData name="Variable"       defStyleNum="dsVariable" spellChecking="false"/>
-      <itemData name="Expression"     defStyleNum="dsOthers" spellChecking="false"/>
-      <itemData name="Function"       defStyleNum="dsFunction" spellChecking="false"/>
+      <itemData name="Variable"       defStyleNum="dsVariable"      spellChecking="false"/>
+      <itemData name="Expression"     defStyleNum="dsOthers"        spellChecking="false"/>
+      <itemData name="Function"       defStyleNum="dsFunction"      spellChecking="false"/>
       <itemData name="Pattern"        defStyleNum="dsSpecialString" spellChecking="false"/>
-      <itemData name="Path"           defStyleNum="dsNormal" spellChecking="false"/>
-      <itemData name="Glob"           defStyleNum="dsPreprocessor" spellChecking="false"/>
-      <itemData name="Option"         defStyleNum="dsAttribute" spellChecking="false"/>
-      <itemData name="Hex"            defStyleNum="dsBaseN" spellChecking="false"/>
-      <itemData name="Octal"          defStyleNum="dsBaseN" spellChecking="false"/>
-      <itemData name="Decimal"        defStyleNum="dsDecVal" spellChecking="false"/>
-      <itemData name="Base"           defStyleNum="dsDataType" spellChecking="false"/>
-      <itemData name="BaseN"          defStyleNum="dsBaseN" spellChecking="false"/>
-      <itemData name="File Descriptor" defStyleNum="dsDecVal" spellChecking="false"/>
+      <itemData name="Path"           defStyleNum="dsNormal"        spellChecking="false"/>
+      <itemData name="Glob"           defStyleNum="dsPreprocessor"  spellChecking="false"/>
+      <itemData name="Option"         defStyleNum="dsAttribute"     spellChecking="false"/>
+      <itemData name="Hex"            defStyleNum="dsBaseN"         spellChecking="false"/>
+      <itemData name="Octal"          defStyleNum="dsBaseN"         spellChecking="false"/>
+      <itemData name="Decimal"        defStyleNum="dsDecVal"        spellChecking="false"/>
+      <itemData name="Base"           defStyleNum="dsDataType"      spellChecking="false"/>
+      <itemData name="BaseN"          defStyleNum="dsBaseN"         spellChecking="false"/>
+      <itemData name="File Descriptor" defStyleNum="dsDecVal"       spellChecking="false"/>
       <itemData name="Parameter Expansion" defStyleNum="dsVariable" spellChecking="false"/>
       <itemData name="Parameter Expansion Operator" defStyleNum="dsOperator" spellChecking="false"/>
-      <itemData name="Operator"       defStyleNum="dsOperator" spellChecking="false"/>
-      <itemData name="Error"          defStyleNum="dsError" spellChecking="false"/>
+      <itemData name="Operator"       defStyleNum="dsOperator"      spellChecking="false"/>
+      <itemData name="Error"          defStyleNum="dsError"         spellChecking="false"/>
     </itemDatas>
   </highlighting>
   <general>
-- 
GitLab


From 5f8019b5d55bffe145f843e5d061e1f8b4475893 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Sat, 27 Aug 2022 05:19:45 +0400
Subject: [PATCH 2/2] bash.xml: Enable multiline comments and RST documentation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Example:

<<'#BLOCK-COMMENT'
[===[.rst:

Script Documentation
--------------------

Here is **possible** to use `RST`_ markup to provide a script _documentation_…

]===]
---
 autotests/folding/highlight.sh.fold   | 347 +++++++++++++-------------
 autotests/html/highlight.sh.dark.html |  13 +
 autotests/html/highlight.sh.html      |  13 +
 autotests/input/highlight.sh          |  13 +
 autotests/reference/highlight.sh.ref  |  13 +
 data/syntax/bash.xml                  |  16 +-
 6 files changed, 247 insertions(+), 168 deletions(-)

diff --git a/autotests/folding/highlight.sh.fold b/autotests/folding/highlight.sh.fold
index c568cd9f..14a4d99b 100644
--- a/autotests/folding/highlight.sh.fold
+++ b/autotests/folding/highlight.sh.fold
@@ -29,6 +29,19 @@ mkdir this\ isnt\ #a\ comment
 mkdir this\ isnt\\\;#a\ comment
 mkdir this\\ #is a comment
 
+<<'#BLOCK-COMMENT'
+NOTE This is the "miltiline" comment.
+
+<beginfold id='1'>[===[.rst:</beginfold id='1'>
+
+Docs
+----
+
+Documentation block in ``RST`` format **starts** *here*.
+
+<endfold id='1'>]===]</endfold id='1'>
+#BLOCK-COMMENT
+
 # brace expansion
 mv my_file.{JPG,jpg}
 echo f.{01..100..3} f.{Z..a..-3}
@@ -56,17 +69,17 @@ echo ${10} $10a # 9 is max
 
 
 # expression subst:
-echo <beginfold id='1'>$((</beginfold id='1'> cd << ed + 1 <endfold id='1'>))</endfold id='1'>
+echo <beginfold id='2'>$((</beginfold id='2'> cd << ed + 1 <endfold id='2'>))</endfold id='2'>
 
 
 # command subst:
-echo <beginfold id='2'>$(</beginfold id='2'>ls -l<endfold id='2'>)</endfold id='2'>
+echo <beginfold id='3'>$(</beginfold id='3'>ls -l<endfold id='3'>)</endfold id='3'>
 echo `cat myfile`
 
 
 # file subst:
-echo <beginfold id='2'>$(</beginfold id='2'><$filename<endfold id='2'>)</endfold id='2'>
-echo <beginfold id='2'>$(</beginfold id='2'></path/to/myfile<endfold id='2'>)</endfold id='2'>
+echo <beginfold id='3'>$(</beginfold id='3'><$filename<endfold id='3'>)</endfold id='3'>
+echo <beginfold id='3'>$(</beginfold id='3'></path/to/myfile<endfold id='3'>)</endfold id='3'>
 
 # process subst:
 sort <(show_labels) | sed 's/a/bg' > my_file.txt 2>&1
@@ -74,7 +87,7 @@ sort <(show_labels) | sed 's/a/bg' > my_file.txt 2>&1
 
 # All substitutions also work in strings:
 echo "subst ${in}side string"  'not $inside this ofcourse'
-echo "The result is <beginfold id='1'>$((</beginfold id='1'> $a + $b <endfold id='1'>))</endfold id='1'>. Thanks!"
+echo "The result is <beginfold id='2'>$((</beginfold id='2'> $a + $b <endfold id='2'>))</endfold id='2'>. Thanks!"
 echo "Your homedir contains `ls $HOME |wc -l` files."
 
 
@@ -89,53 +102,53 @@ login
 
 
 # Other colorings:
-error() <beginfold id='3'>{</beginfold id='3'>
+error() <beginfold id='4'>{</beginfold id='4'>
 	cat /usr/bin/lesspipe.sh
 	runscript >& redir.bak
 	exec 3>&4
-<endfold id='3'>}</endfold id='3'>
+<endfold id='4'>}</endfold id='4'>
 
 
 # do - done make code blocks
-while <beginfold id='1'>[</beginfold id='1'> $p -lt $q <endfold id='1'>]</endfold id='1'>
-<beginfold id='4'>do</beginfold id='4'>
+while <beginfold id='2'>[</beginfold id='2'> $p -lt $q <endfold id='2'>]</endfold id='2'>
+<beginfold id='5'>do</beginfold id='5'>
 	chown 0644 $file.$p
-<endfold id='4'>done</endfold id='4'>
+<endfold id='5'>done</endfold id='5'>
 
 
 # braces as well
 run_prog | sort -u |
-<beginfold id='3'>{</beginfold id='3'>
+<beginfold id='4'>{</beginfold id='4'>
 	echo Header
 	while read a b d
-	<beginfold id='4'>do</beginfold id='4'>
+	<beginfold id='5'>do</beginfold id='5'>
 		echo $a/$b/$c
-	<endfold id='4'>done</endfold id='4'>
+	<endfold id='5'>done</endfold id='5'>
 	echo Footer
-<endfold id='3'>}</endfold id='3'>
+<endfold id='4'>}</endfold id='4'>
 
 
 # Any constructions can be nested:
-echo "A long string with <beginfold id='2'>$(</beginfold id='2'>
-	<beginfold id='5'>if</beginfold id='5'> <beginfold id='1'>[</beginfold id='1'> $count -gt 100 <endfold id='1'>]</endfold id='1'> ; then
+echo "A long string with <beginfold id='3'>$(</beginfold id='3'>
+	<beginfold id='6'>if</beginfold id='6'> <beginfold id='2'>[</beginfold id='2'> $count -gt 100 <endfold id='2'>]</endfold id='2'> ; then
 		echo "much"
 	else
 		echo "not much"
-	<endfold id='5'>fi</endfold id='5'> <endfold id='2'>)</endfold id='2'> substitutions." ;
+	<endfold id='6'>fi</endfold id='6'> <endfold id='3'>)</endfold id='3'> substitutions." ;
 
 
 # Even the case construct is correctly folded:
 test -f blaat &&
-<beginfold id='2'>(</beginfold id='2'>	do_something
-	<beginfold id='6'>case</beginfold id='6'> $p in
-		*bak<beginfold id='7'>)</beginfold id='7'>
+<beginfold id='3'>(</beginfold id='3'>	do_something
+	<beginfold id='7'>case</beginfold id='7'> $p in
+		*bak<beginfold id='8'>)</beginfold id='8'>
 			do_bak $p
-			<endfold id='7'>;;</endfold id='7'>
-		*<beginfold id='7'>)</beginfold id='7'>
+			<endfold id='8'>;;</endfold id='8'>
+		*<beginfold id='8'>)</beginfold id='8'>
 			dont_bak $p
-			<endfold id='7'>;;</endfold id='7'>
-	<endfold id='6'>esac</endfold id='6'>
-<endfold id='2'>)</endfold id='2'> # despite the extra parentheses in the case construction.
+			<endfold id='8'>;;</endfold id='8'>
+	<endfold id='7'>esac</endfold id='7'>
+<endfold id='3'>)</endfold id='3'> # despite the extra parentheses in the case construction.
 
 
 # more control flow
@@ -143,7 +156,7 @@ while :;
   break
   continue
   return
-<endfold id='4'>done</endfold id='4'>
+<endfold id='5'>done</endfold id='5'>
 
 
 # variable assignments:
@@ -180,11 +193,11 @@ make  destdir=/usr/
 
 # [[ and [ correctly need spaces to be regarded as structure,
 # otherwise they are patterns (currently treated as normal text)
-<beginfold id='5'>if</beginfold id='5'> <beginfold id='1'>[</beginfold id='1'> "$p" == "" <endfold id='1'>]</endfold id='1'> ; then
+<beginfold id='6'>if</beginfold id='6'> <beginfold id='2'>[</beginfold id='2'> "$p" == "" <endfold id='2'>]</endfold id='2'> ; then
 	ls /usr/bin/[a-z]*
-elif <beginfold id='1'>[[</beginfold id='1'> $p == 0 <endfold id='1'>]]</endfold id='1'> ; then
+elif <beginfold id='2'>[[</beginfold id='2'> $p == 0 <endfold id='2'>]]</endfold id='2'> ; then
 	ls /usr/share/$p
-<endfold id='5'>fi</endfold id='5'>
+<endfold id='6'>fi</endfold id='6'>
 
 # Fixed:
 ls a[ab]*		# dont try to interprete as assignment with subscript (fixed)
@@ -211,33 +224,33 @@ bla
 
 
 # indented:
-<beginfold id='5'>if</beginfold id='5'> true
+<beginfold id='6'>if</beginfold id='6'> true
 then
 	cat <<- EOF
 		Indented text with a $dollar or \$two
 	EOF
-elif <beginfold id='1'>[</beginfold id='1'> -d $file <endfold id='1'>]</endfold id='1'>; then
+elif <beginfold id='2'>[</beginfold id='2'> -d $file <endfold id='2'>]</endfold id='2'>; then
 	cat <<- "EOF"
 		Indented text without a $dollar
 	EOF
-<endfold id='5'>fi</endfold id='5'>
+<endfold id='6'>fi</endfold id='6'>
 
-<beginfold id='5'>if</beginfold id='5'> ! <beginfold id='3'>{</beginfold id='3'> cmd1 && cmd2 ; <endfold id='3'>}</endfold id='3'>; then echo ok ; <endfold id='5'>fi</endfold id='5'>
-<beginfold id='5'>if</beginfold id='5'> ! cmd1 arg; then echo ok ; <endfold id='5'>fi</endfold id='5'>
+<beginfold id='6'>if</beginfold id='6'> ! <beginfold id='4'>{</beginfold id='4'> cmd1 && cmd2 ; <endfold id='4'>}</endfold id='4'>; then echo ok ; <endfold id='6'>fi</endfold id='6'>
+<beginfold id='6'>if</beginfold id='6'> ! cmd1 arg; then echo ok ; <endfold id='6'>fi</endfold id='6'>
 
-<beginfold id='6'>case</beginfold id='6'> 1 in
-2<beginfold id='7'>)</beginfold id='7'> echo xxx;
-<endfold id='7'>;;</endfold id='7'>
-?<beginfold id='7'>)</beginfold id='7'> foo || yyy ; foo abc || echo abc <endfold id='7'>;;</endfold id='7'>
-1<beginfold id='7'>)</beginfold id='7'> echo yyy;
-<endfold id='7'></endfold id='7'><endfold id='6'>esac</endfold id='6'>
+<beginfold id='7'>case</beginfold id='7'> 1 in
+2<beginfold id='8'>)</beginfold id='8'> echo xxx;
+<endfold id='8'>;;</endfold id='8'>
+?<beginfold id='8'>)</beginfold id='8'> foo || yyy ; foo abc || echo abc <endfold id='8'>;;</endfold id='8'>
+1<beginfold id='8'>)</beginfold id='8'> echo yyy;
+<endfold id='8'></endfold id='8'><endfold id='7'>esac</endfold id='7'>
 
 ls #should be outside of case 1 folding block
 
-for i in `ls tests/auto/output/*.html`; <beginfold id='4'>do</beginfold id='4'>
+for i in `ls tests/auto/output/*.html`; <beginfold id='5'>do</beginfold id='5'>
     refFile=`echo $i | sed -e s,build,src, | sed -e s,output,reference, | sed -e s,.html,.ref.html,`
     cp -v $i $refFile
-<endfold id='4'>done</endfold id='4'>
+<endfold id='5'>done</endfold id='5'>
 
 ## >Settings >Configure Kate >Fonts & Colors >Highlitghing Text Styles >Scripts/Bash >Option >Change colors to some distinct color
 ## 1- In following line the -ucode should not be colored as option
@@ -246,13 +259,13 @@ pacman -Syu --needed intel-ucode grub
 pacman -syu --needed intel-ucode grub
 
 # Braces (bug ##387915)
-<beginfold id='1'>[[</beginfold id='1'> $line_name =~ \{([0-9]{1,})\}\{([0-9]{1,})\}(.*) <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> $name =~ (.*)_(S[0-9]{2})(E[0-9]{2,3}[a-z]{0,1})_(.*) <endfold id='1'>]]</endfold id='1'>
+<beginfold id='2'>[[</beginfold id='2'> $line_name =~ \{([0-9]{1,})\}\{([0-9]{1,})\}(.*) <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> $name =~ (.*)_(S[0-9]{2})(E[0-9]{2,3}[a-z]{0,1})_(.*) <endfold id='2'>]]</endfold id='2'>
 # Comments in Braces (bug 450878)
-<beginfold id='1'>[[</beginfold id='1'> # comment 1
+<beginfold id='2'>[[</beginfold id='2'> # comment 1
    1 == 1 # comment 2
    # comment 3
-<endfold id='1'>]]</endfold id='1'>
+<endfold id='2'>]]</endfold id='2'>
 
 rm /data/{hello1,hello2}/input/{bye1,$bye2}/si{a,${b},c{k,p{e,a}}}/*.non
 rm /data/{aa,{e,i}t{b,c} # Not closed
@@ -354,7 +367,7 @@ h
 <<"'" cat
 bla
 '
-r=<beginfold id='2'>$(</beginfold id='2'>xxx $@ 2>&1<endfold id='2'>)</endfold id='2'>
+r=<beginfold id='3'>$(</beginfold id='3'>xxx $@ 2>&1<endfold id='3'>)</endfold id='3'>
 
 # branches
 cat a|cat
@@ -372,115 +385,115 @@ cat a'a';cat
 # substitutions
 echo '' 'a' '\' "" "a" "\\" "$a" "a""a"'a''a' a'b'c a"b"c a$'\n'c
 echo a!bc a{a}b a{b,c}d a{b,{d,e}}d a\ b
-echo a$bc a$b/c a${b}c a<beginfold id='1'>$((</beginfold id='1'>b-3<endfold id='1'>))</endfold id='1'>c a<beginfold id='2'>$(</beginfold id='2'>b<endfold id='2'>)</endfold id='2'>c a<beginfold id='2'>$(</beginfold id='2'>a b c<endfold id='2'>)</endfold id='2'>c
+echo a$bc a$b/c a${b}c a<beginfold id='2'>$((</beginfold id='2'>b-3<endfold id='2'>))</endfold id='2'>c a<beginfold id='3'>$(</beginfold id='3'>b<endfold id='3'>)</endfold id='3'>c a<beginfold id='3'>$(</beginfold id='3'>a b c<endfold id='3'>)</endfold id='3'>c
 echo ${a[*]} ${a[@]} ${a[${b}]} ${a:-x$z} ${a-x} ${a/g} ${a//f/f} ${a//f*/f*}
-echo ${a^^l*} ${a,} ${!a} ${#a[1]} ${a:1:$b} <beginfold id='1'>$((</beginfold id='1'>++i,i--<endfold id='1'>))</endfold id='1'>
+echo ${a^^l*} ${a,} ${!a} ${#a[1]} ${a:1:$b} <beginfold id='2'>$((</beginfold id='2'>++i,i--<endfold id='2'>))</endfold id='2'>
 echo "${var#lo+(r)em}" x "${var#+(r)em}" x
 echo "${var#refs/heads}" x "${var#refs}" x
 
-<beginfold id='1'>[</beginfold id='1'> a <endfold id='1'>]</endfold id='1'>
-<beginfold id='1'>[</beginfold id='1'> -f f'f'f <endfold id='1'>]</endfold id='1'>
-<beginfold id='1'>[</beginfold id='1'> -f f]'f'f] <endfold id='1'>]</endfold id='1'>
-<beginfold id='1'>[</beginfold id='1'> -t 13 <endfold id='1'>]</endfold id='1'>
-<beginfold id='1'>[</beginfold id='1'> -t 13] <endfold id='1'>]</endfold id='1'>
-<beginfold id='1'>[</beginfold id='1'> -t 13] <endfold id='1'>]</endfold id='1'>
-<beginfold id='1'>[</beginfold id='1'> -v abc <endfold id='1'>]</endfold id='1'>
-<beginfold id='1'>[</beginfold id='1'> -z abc <endfold id='1'>]</endfold id='1'>
-<beginfold id='1'>[</beginfold id='1'> abc -ef abc <endfold id='1'>]</endfold id='1'>
-<beginfold id='1'>[</beginfold id='1'> abc -ef abc <endfold id='1'>]</endfold id='1'>
-<beginfold id='1'>[</beginfold id='1'> abc-ef -ef abc-ef <endfold id='1'>]</endfold id='1'>
-<beginfold id='1'>[</beginfold id='1'> abc == abc <endfold id='1'>]</endfold id='1'>
-<beginfold id='1'>[</beginfold id='1'> abc < abc <endfold id='1'>]</endfold id='1'>
-<beginfold id='1'>[</beginfold id='1'> abc -eq abc <endfold id='1'>]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> abc -eq abc <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[</beginfold id='1'> 1+2 -eq 1+2 <endfold id='1'>]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> 1+2 -eq 1+2 <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[</beginfold id='1'> a = b <endfold id='1'>c</endfold id='1'> ]
-<beginfold id='1'>[[</beginfold id='1'> a = b <endfold id='1'>c</endfold id='1'> ]]
-<beginfold id='1'>[</beginfold id='1'> -z 1 -a 1 -eq 1 <endfold id='1'>]</endfold id='1'>
-<beginfold id='1'>[</beginfold id='1'> 2 -eq 1 -o 1 -eq 1 <endfold id='1'>]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> x =~ a(b c|$)' '{1,}[a[.digit.]] <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> x =~ [ <endfold id='1'>] </endfold id='1'>]]
-<beginfold id='1'>[[</beginfold id='1'> x =~ ([ ]) <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> x =~ [ <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> x =~ ([) <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> (a =~ a) <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> a =~ a || a -eq 2 <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> (a =~ a) || a -eq 2 <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> (0 -le $b) <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> ( 0 -le $b ) <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> ( 0 -le $b || $b -le 100 ) <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> a<b <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> a <b <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> a< b <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> a < b <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'>(! -d .)<endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> ! -d . <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> !(-d .) <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> -f a || -f b <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> -f a||-f b <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> ! (a -eq b) <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[</beginfold id='1'> -d `echo .`] <endfold id='1'>]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> -d `echo .`]] <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> a != b && ${a}a = b${b} <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'>
+<beginfold id='2'>[</beginfold id='2'> a <endfold id='2'>]</endfold id='2'>
+<beginfold id='2'>[</beginfold id='2'> -f f'f'f <endfold id='2'>]</endfold id='2'>
+<beginfold id='2'>[</beginfold id='2'> -f f]'f'f] <endfold id='2'>]</endfold id='2'>
+<beginfold id='2'>[</beginfold id='2'> -t 13 <endfold id='2'>]</endfold id='2'>
+<beginfold id='2'>[</beginfold id='2'> -t 13] <endfold id='2'>]</endfold id='2'>
+<beginfold id='2'>[</beginfold id='2'> -t 13] <endfold id='2'>]</endfold id='2'>
+<beginfold id='2'>[</beginfold id='2'> -v abc <endfold id='2'>]</endfold id='2'>
+<beginfold id='2'>[</beginfold id='2'> -z abc <endfold id='2'>]</endfold id='2'>
+<beginfold id='2'>[</beginfold id='2'> abc -ef abc <endfold id='2'>]</endfold id='2'>
+<beginfold id='2'>[</beginfold id='2'> abc -ef abc <endfold id='2'>]</endfold id='2'>
+<beginfold id='2'>[</beginfold id='2'> abc-ef -ef abc-ef <endfold id='2'>]</endfold id='2'>
+<beginfold id='2'>[</beginfold id='2'> abc == abc <endfold id='2'>]</endfold id='2'>
+<beginfold id='2'>[</beginfold id='2'> abc < abc <endfold id='2'>]</endfold id='2'>
+<beginfold id='2'>[</beginfold id='2'> abc -eq abc <endfold id='2'>]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> abc -eq abc <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[</beginfold id='2'> 1+2 -eq 1+2 <endfold id='2'>]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> 1+2 -eq 1+2 <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[</beginfold id='2'> a = b <endfold id='2'>c</endfold id='2'> ]
+<beginfold id='2'>[[</beginfold id='2'> a = b <endfold id='2'>c</endfold id='2'> ]]
+<beginfold id='2'>[</beginfold id='2'> -z 1 -a 1 -eq 1 <endfold id='2'>]</endfold id='2'>
+<beginfold id='2'>[</beginfold id='2'> 2 -eq 1 -o 1 -eq 1 <endfold id='2'>]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> x =~ a(b c|$)' '{1,}[a[.digit.]] <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> x =~ [ <endfold id='2'>] </endfold id='2'>]]
+<beginfold id='2'>[[</beginfold id='2'> x =~ ([ ]) <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> x =~ [ <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> x =~ ([) <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> (a =~ a) <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> a =~ a || a -eq 2 <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> (a =~ a) || a -eq 2 <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> (0 -le $b) <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> ( 0 -le $b ) <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> ( 0 -le $b || $b -le 100 ) <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> a<b <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> a <b <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> a< b <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> a < b <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'>(! -d .)<endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> ! -d . <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> !(-d .) <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> -f a || -f b <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> -f a||-f b <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> ! (a -eq b) <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[</beginfold id='2'> -d `echo .`] <endfold id='2'>]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> -d `echo .`]] <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> a != b && ${a}a = b${b} <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'>
   1 -eq 2
-<endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> -&&- <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> -f <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> -f [0-9a] <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> ?*[0-9] = [^0-9] <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> -f = ?*[0-9] <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> ?*[0-9] = ?*[0-9] <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> a/sa[s = dsad?*[0-9]dsa$ds <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> a/sa[s = dsad?*[0-9]ds/a$ds <endfold id='1'>]]</endfold id='1'>
-<beginfold id='1'>[[</beginfold id='1'> a =~ [12]a([!d]a?s[x[:alnum:]]|d?)p <endfold id='1'>]]</endfold id='1'>
-
-<beginfold id='1'>[[</beginfold id='1'> #comm1
+<endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> -&&- <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> -f <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> -f [0-9a] <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> ?*[0-9] = [^0-9] <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> -f = ?*[0-9] <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> ?*[0-9] = ?*[0-9] <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> a/sa[s = dsad?*[0-9]dsa$ds <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> a/sa[s = dsad?*[0-9]ds/a$ds <endfold id='2'>]]</endfold id='2'>
+<beginfold id='2'>[[</beginfold id='2'> a =~ [12]a([!d]a?s[x[:alnum:]]|d?)p <endfold id='2'>]]</endfold id='2'>
+
+<beginfold id='2'>[[</beginfold id='2'> #comm1
  #comm2
  p[1] == p[2]
  #comm3
  #comm4
-<endfold id='1'>]]</endfold id='1'>
+<endfold id='2'>]]</endfold id='2'>
 
-<beginfold id='1'>[[</beginfold id='1'> #comm1
+<beginfold id='2'>[[</beginfold id='2'> #comm1
  #comm2
  -f p[2]
  #comm3
  #comm4
-<endfold id='1'>]]</endfold id='1'>
+<endfold id='2'>]]</endfold id='2'>
 
-<beginfold id='1'>((</beginfold id='1'>3+1+a+$c*(x) & 0x43422fd+03-085/23#D9a@_^8<endfold id='1'>))</endfold id='1'>
-<beginfold id='1'>((</beginfold id='1'>1/(2-(a-4))<endfold id='1'>))</endfold id='1'>
+<beginfold id='2'>((</beginfold id='2'>3+1+a+$c*(x) & 0x43422fd+03-085/23#D9a@_^8<endfold id='2'>))</endfold id='2'>
+<beginfold id='2'>((</beginfold id='2'>1/(2-(a-4))<endfold id='2'>))</endfold id='2'>
 
 # they are not arithmetic evaluations...
-<beginfold id='2'>(</beginfold id='2'><beginfold id='2'>(</beginfold id='2'>cmd && cmd<endfold id='2'>)</endfold id='2'> || cmd<endfold id='2'>)</endfold id='2'>
-<beginfold id='2'>$(</beginfold id='2'><beginfold id='2'>(</beginfold id='2'>cmd && cmd<endfold id='2'>)</endfold id='2'> || cmd<endfold id='2'>)</endfold id='2'>
-<beginfold id='1'>((</beginfold id='1'>cmd &&
-cmd<endfold id='1'></endfold id='1'><beginfold id='2'>)</beginfold id='2'> || cmd<endfold id='2'>)</endfold id='2'>
-<beginfold id='1'>$((</beginfold id='1'>cmd &&
-cmd<endfold id='1'></endfold id='1'><beginfold id='2'>)</beginfold id='2'> || cmd<endfold id='2'>)</endfold id='2'>
-
-<beginfold id='3'>{</beginfold id='3'> echo
+<beginfold id='3'>(</beginfold id='3'><beginfold id='3'>(</beginfold id='3'>cmd && cmd<endfold id='3'>)</endfold id='3'> || cmd<endfold id='3'>)</endfold id='3'>
+<beginfold id='3'>$(</beginfold id='3'><beginfold id='3'>(</beginfold id='3'>cmd && cmd<endfold id='3'>)</endfold id='3'> || cmd<endfold id='3'>)</endfold id='3'>
+<beginfold id='2'>((</beginfold id='2'>cmd &&
+cmd<endfold id='2'></endfold id='2'><beginfold id='3'>)</beginfold id='3'> || cmd<endfold id='3'>)</endfold id='3'>
+<beginfold id='2'>$((</beginfold id='2'>cmd &&
+cmd<endfold id='2'></endfold id='2'><beginfold id='3'>)</beginfold id='3'> || cmd<endfold id='3'>)</endfold id='3'>
+
+<beginfold id='4'>{</beginfold id='4'> echo
     echo
-<endfold id='3'>}</endfold id='3'>
-<beginfold id='3'>{</beginfold id='3'> echo ; <endfold id='3'>}</endfold id='3'>
-<beginfold id='2'>(</beginfold id='2'>echo ; echo<endfold id='2'>)</endfold id='2'>
-<beginfold id='2'>(</beginfold id='2'>echo
-    echo<endfold id='2'>)</endfold id='2'>
-<beginfold id='2'>(</beginfold id='2'>echo a<endfold id='2'>)</endfold id='2'>
-<beginfold id='2'>(</beginfold id='2'><beginfold id='3'>{</beginfold id='3'> echo plop;<endfold id='3'>}</endfold id='3'><endfold id='2'>)</endfold id='2'>
-<beginfold id='1'>[</beginfold id='1'> a -eq 2 <endfold id='1'>]</endfold id='1'> || <beginfold id='1'>[</beginfold id='1'> a -eq 2] <endfold id='1'>]</endfold id='1'> && <beginfold id='1'>[[</beginfold id='1'> a -eq 2 <endfold id='1'>]]</endfold id='1'> || <beginfold id='1'>[[</beginfold id='1'> a != b <endfold id='1'>]]</endfold id='1'>;
-<beginfold id='1'>[</beginfold id='1'> a -eq 2 <endfold id='1'>]</endfold id='1'>||<beginfold id='1'>[</beginfold id='1'> a -eq 2] <endfold id='1'>]</endfold id='1'>&&<beginfold id='1'>[[</beginfold id='1'> a -eq 2 <endfold id='1'>]]</endfold id='1'>||<beginfold id='1'>[[</beginfold id='1'> a != b <endfold id='1'>]]</endfold id='1'>;
+<endfold id='4'>}</endfold id='4'>
+<beginfold id='4'>{</beginfold id='4'> echo ; <endfold id='4'>}</endfold id='4'>
+<beginfold id='3'>(</beginfold id='3'>echo ; echo<endfold id='3'>)</endfold id='3'>
+<beginfold id='3'>(</beginfold id='3'>echo
+    echo<endfold id='3'>)</endfold id='3'>
+<beginfold id='3'>(</beginfold id='3'>echo a<endfold id='3'>)</endfold id='3'>
+<beginfold id='3'>(</beginfold id='3'><beginfold id='4'>{</beginfold id='4'> echo plop;<endfold id='4'>}</endfold id='4'><endfold id='3'>)</endfold id='3'>
+<beginfold id='2'>[</beginfold id='2'> a -eq 2 <endfold id='2'>]</endfold id='2'> || <beginfold id='2'>[</beginfold id='2'> a -eq 2] <endfold id='2'>]</endfold id='2'> && <beginfold id='2'>[[</beginfold id='2'> a -eq 2 <endfold id='2'>]]</endfold id='2'> || <beginfold id='2'>[[</beginfold id='2'> a != b <endfold id='2'>]]</endfold id='2'>;
+<beginfold id='2'>[</beginfold id='2'> a -eq 2 <endfold id='2'>]</endfold id='2'>||<beginfold id='2'>[</beginfold id='2'> a -eq 2] <endfold id='2'>]</endfold id='2'>&&<beginfold id='2'>[[</beginfold id='2'> a -eq 2 <endfold id='2'>]]</endfold id='2'>||<beginfold id='2'>[[</beginfold id='2'> a != b <endfold id='2'>]]</endfold id='2'>;
 test a -eq b
 
 # functions
-a() <beginfold id='3'>{</beginfold id='3'> echo x; <endfold id='3'>}</endfold id='3'>
-a  () <beginfold id='3'>{</beginfold id='3'> echo x; <endfold id='3'>}</endfold id='3'>
-function f <beginfold id='3'>{</beginfold id='3'> echo x; <endfold id='3'>}</endfold id='3'>
-kde.org() <beginfold id='3'>{</beginfold id='3'> echo x; <endfold id='3'>}</endfold id='3'>
---func() <beginfold id='3'>{</beginfold id='3'> echo x; <endfold id='3'>}</endfold id='3'>
+a() <beginfold id='4'>{</beginfold id='4'> echo x; <endfold id='4'>}</endfold id='4'>
+a  () <beginfold id='4'>{</beginfold id='4'> echo x; <endfold id='4'>}</endfold id='4'>
+function f <beginfold id='4'>{</beginfold id='4'> echo x; <endfold id='4'>}</endfold id='4'>
+kde.org() <beginfold id='4'>{</beginfold id='4'> echo x; <endfold id='4'>}</endfold id='4'>
+--func() <beginfold id='4'>{</beginfold id='4'> echo x; <endfold id='4'>}</endfold id='4'>
 
 # variables
 a=(a b c)
@@ -488,9 +501,9 @@ a='a'
 a+=b
 a[1]='a'
 a[$i]='x'
-a[<beginfold id='1'>$((</beginfold id='1'>
+a[<beginfold id='2'>$((</beginfold id='2'>
     2+4
-<endfold id='1'>))</endfold id='1'>]='x'
+<endfold id='2'>))</endfold id='2'>]='x'
 a=([a]=2 `echo` -s > 'ds')
 a=(#comment
 value#nocomment #comment)
@@ -499,41 +512,41 @@ a=a cat
 a=`ls` cat
 
 # errors
-a a(s<endfold id='2'>)</endfold id='2'> a
+a a(s<endfold id='3'>)</endfold id='3'> a
 
 # control structure
-for name in a b c {d,e} ; <beginfold id='4'>do</beginfold id='4'> echo ; <endfold id='4'>done</endfold id='4'>
-for name; <beginfold id='4'>do</beginfold id='4'> echo ; <endfold id='4'>done</endfold id='4'>
-for name <beginfold id='4'>do</beginfold id='4'> echo ; <endfold id='4'>done</endfold id='4'>
-for ((i=0;i<5;++i)) ; <beginfold id='4'>do</beginfold id='4'> echo $i ; <endfold id='4'>done</endfold id='4'>
-select name in a ; <beginfold id='4'>do</beginfold id='4'> echo ; <endfold id='4'>done</endfold id='4'>
-select name; <beginfold id='4'>do</beginfold id='4'> echo ; <endfold id='4'>done</endfold id='4'>
-<beginfold id='5'>if</beginfold id='5'> : ; then echo ; elif <beginfold id='1'>[[</beginfold id='1'> : <endfold id='1'>]]</endfold id='1'> ; then echo ; else echo ; <endfold id='5'>fi</endfold id='5'>
-while : || : ; <beginfold id='4'>do</beginfold id='4'> echo ; <endfold id='4'>done</endfold id='4'>
-until : ; : ; <beginfold id='4'>do</beginfold id='4'> echo ; <endfold id='4'>done</endfold id='4'>
-<beginfold id='6'>case</beginfold id='6'> a in a<beginfold id='7'>)</beginfold id='7'> <endfold id='7'></endfold id='7'><endfold id='6'>esac</endfold id='6'>
-<beginfold id='6'>case</beginfold id='6'> a in a<beginfold id='7'>)</beginfold id='7'> echo ; <endfold id='7'></endfold id='7'><endfold id='6'>esac</endfold id='6'>
-<beginfold id='6'>case</beginfold id='6'> pwd in (patt1<beginfold id='7'>)</beginfold id='7'> echo ; echo <endfold id='7'>;;</endfold id='7'> (patt*<beginfold id='7'>)</beginfold id='7'> echo <endfold id='7'>;;&</endfold id='7'> patt?|patt<beginfold id='7'>)</beginfold id='7'> echo <endfold id='7'>;&</endfold id='7'>
-patt<beginfold id='7'>)</beginfold id='7'> echo <endfold id='7'>;;</endfold id='7'> <endfold id='6'>esac</endfold id='6'>
+for name in a b c {d,e} ; <beginfold id='5'>do</beginfold id='5'> echo ; <endfold id='5'>done</endfold id='5'>
+for name; <beginfold id='5'>do</beginfold id='5'> echo ; <endfold id='5'>done</endfold id='5'>
+for name <beginfold id='5'>do</beginfold id='5'> echo ; <endfold id='5'>done</endfold id='5'>
+for ((i=0;i<5;++i)) ; <beginfold id='5'>do</beginfold id='5'> echo $i ; <endfold id='5'>done</endfold id='5'>
+select name in a ; <beginfold id='5'>do</beginfold id='5'> echo ; <endfold id='5'>done</endfold id='5'>
+select name; <beginfold id='5'>do</beginfold id='5'> echo ; <endfold id='5'>done</endfold id='5'>
+<beginfold id='6'>if</beginfold id='6'> : ; then echo ; elif <beginfold id='2'>[[</beginfold id='2'> : <endfold id='2'>]]</endfold id='2'> ; then echo ; else echo ; <endfold id='6'>fi</endfold id='6'>
+while : || : ; <beginfold id='5'>do</beginfold id='5'> echo ; <endfold id='5'>done</endfold id='5'>
+until : ; : ; <beginfold id='5'>do</beginfold id='5'> echo ; <endfold id='5'>done</endfold id='5'>
+<beginfold id='7'>case</beginfold id='7'> a in a<beginfold id='8'>)</beginfold id='8'> <endfold id='8'></endfold id='8'><endfold id='7'>esac</endfold id='7'>
+<beginfold id='7'>case</beginfold id='7'> a in a<beginfold id='8'>)</beginfold id='8'> echo ; <endfold id='8'></endfold id='8'><endfold id='7'>esac</endfold id='7'>
+<beginfold id='7'>case</beginfold id='7'> pwd in (patt1<beginfold id='8'>)</beginfold id='8'> echo ; echo <endfold id='8'>;;</endfold id='8'> (patt*<beginfold id='8'>)</beginfold id='8'> echo <endfold id='8'>;;&</endfold id='8'> patt?|patt<beginfold id='8'>)</beginfold id='8'> echo <endfold id='8'>;&</endfold id='8'>
+patt<beginfold id='8'>)</beginfold id='8'> echo <endfold id='8'>;;</endfold id='8'> <endfold id='7'>esac</endfold id='7'>
 
 for name in a
  b c ;
-<beginfold id='4'>do</beginfold id='4'>
+<beginfold id='5'>do</beginfold id='5'>
 echo
-<endfold id='4'>done</endfold id='4'>
+<endfold id='5'>done</endfold id='5'>
 
-<beginfold id='6'>case</beginfold id='6'> a in
-  a\( | b*c? <beginfold id='7'>)</beginfold id='7'> echo
-  <beginfold id='2'>(</beginfold id='2'>b$c<endfold id='2'>)</endfold id='2'> # no pattern
-  <endfold id='7'>;;</endfold id='7'>
-  (b$c<beginfold id='7'>)</beginfold id='7'> <endfold id='7'>;;</endfold id='7'>
+<beginfold id='7'>case</beginfold id='7'> a in
+  a\( | b*c? <beginfold id='8'>)</beginfold id='8'> echo
+  <beginfold id='3'>(</beginfold id='3'>b$c<endfold id='3'>)</endfold id='3'> # no pattern
+  <endfold id='8'>;;</endfold id='8'>
+  (b$c<beginfold id='8'>)</beginfold id='8'> <endfold id='8'>;;</endfold id='8'>
   # no pattern
-  (b$c<beginfold id='7'>)</beginfold id='7'>
-<endfold id='7'></endfold id='7'><endfold id='6'>esac</endfold id='6'>
-
-<beginfold id='6'>case</beginfold id='6'> "$1" in
- "a"<beginfold id='7'>)</beginfold id='7'> run_a|&a<endfold id='7'>;;</endfold id='7'>
- "b"<beginfold id='7'>)</beginfold id='7'> run_b<endfold id='7'>;;</endfold id='7'>
- "c"<beginfold id='7'>)</beginfold id='7'> run_c<endfold id='7'>;;</endfold id='7'>
- *<beginfold id='7'>)</beginfold id='7'> echo "Plase choose between 'a', 'b' or 'c'" && exit 1<endfold id='7'>;;</endfold id='7'>
-<endfold id='6'>esac</endfold id='6'>
+  (b$c<beginfold id='8'>)</beginfold id='8'>
+<endfold id='8'></endfold id='8'><endfold id='7'>esac</endfold id='7'>
+
+<beginfold id='7'>case</beginfold id='7'> "$1" in
+ "a"<beginfold id='8'>)</beginfold id='8'> run_a|&a<endfold id='8'>;;</endfold id='8'>
+ "b"<beginfold id='8'>)</beginfold id='8'> run_b<endfold id='8'>;;</endfold id='8'>
+ "c"<beginfold id='8'>)</beginfold id='8'> run_c<endfold id='8'>;;</endfold id='8'>
+ *<beginfold id='8'>)</beginfold id='8'> echo "Plase choose between 'a', 'b' or 'c'" && exit 1<endfold id='8'>;;</endfold id='8'>
+<endfold id='7'>esac</endfold id='7'>
diff --git a/autotests/html/highlight.sh.dark.html b/autotests/html/highlight.sh.dark.html
index 0850c060..ef9a54fc 100644
--- a/autotests/html/highlight.sh.dark.html
+++ b/autotests/html/highlight.sh.dark.html
@@ -35,6 +35,19 @@
 <span style="color:#8e44ad;">mkdir</span> this<span style="color:#2980b9;">\ </span>isnt<span style="color:#2980b9;">\\\;</span>#a<span style="color:#2980b9;">\ </span>comment
 <span style="color:#8e44ad;">mkdir</span> this<span style="color:#2980b9;">\\</span> <span style="color:#7a7c7d;">#is a comment</span>
 
+<span style="color:#3f8058;">&lt;&lt;'#BLOCK-COMMENT'</span>
+<span style="color:#81ca2d;background-color:#4d1f24;font-weight:bold;">NOTE</span><span style="color:#7a7c7d;"> This is the &quot;miltiline&quot; comment.</span>
+
+<span style="color:#2980b9;background-color:#153042;">[===[.rst:</span>
+
+<span style="color:#7a7c7d;">Docs</span>
+<span style="color:#7a7c7d;">----</span>
+
+<span style="color:#7a7c7d;">Documentation block in </span><span style="color:#2980b9;">``RST``</span><span style="color:#7a7c7d;"> format </span><span style="font-weight:bold;">**starts**</span><span style="color:#7a7c7d;"> </span><span style="font-style:italic;">*here*</span><span style="color:#7a7c7d;">.</span>
+
+<span style="color:#2980b9;background-color:#153042;">]===]</span>
+<span style="color:#3f8058;">#BLOCK-COMMENT</span>
+
 <span style="color:#7a7c7d;"># brace expansion</span>
 <span style="color:#8e44ad;">mv</span> my_file.<span style="color:#2980b9;">{JPG</span><span style="color:#3f8058;">,</span><span style="color:#2980b9;">jpg}</span>
 <span style="color:#7f8c8d;">echo</span> f.<span style="color:#2980b9;">{</span><span style="color:#f67400;">01</span><span style="color:#2980b9;">..</span><span style="color:#f67400;">100</span><span style="color:#2980b9;">..</span><span style="color:#f67400;">3</span><span style="color:#2980b9;">}</span> f.<span style="color:#2980b9;">{</span>Z<span style="color:#2980b9;">..</span>a<span style="color:#2980b9;">..</span><span style="color:#f67400;">-3</span><span style="color:#2980b9;">}</span>
diff --git a/autotests/html/highlight.sh.html b/autotests/html/highlight.sh.html
index 86d05dbf..20acbb56 100644
--- a/autotests/html/highlight.sh.html
+++ b/autotests/html/highlight.sh.html
@@ -35,6 +35,19 @@
 <span style="color:#644a9b;">mkdir</span> this<span style="color:#0057ae;">\ </span>isnt<span style="color:#0057ae;">\\\;</span>#a<span style="color:#0057ae;">\ </span>comment
 <span style="color:#644a9b;">mkdir</span> this<span style="color:#0057ae;">\\</span> <span style="color:#898887;">#is a comment</span>
 
+<span style="color:#ca60ca;">&lt;&lt;'#BLOCK-COMMENT'</span>
+<span style="color:#81ca2d;background-color:#f7e6e6;font-weight:bold;">NOTE</span><span style="color:#898887;"> This is the &quot;miltiline&quot; comment.</span>
+
+<span style="color:#0057ae;background-color:#e0e9f8;">[===[.rst:</span>
+
+<span style="color:#898887;">Docs</span>
+<span style="color:#898887;">----</span>
+
+<span style="color:#898887;">Documentation block in </span><span style="color:#0057ae;">``RST``</span><span style="color:#898887;"> format </span><span style="font-weight:bold;">**starts**</span><span style="color:#898887;"> </span><span style="font-style:italic;">*here*</span><span style="color:#898887;">.</span>
+
+<span style="color:#0057ae;background-color:#e0e9f8;">]===]</span>
+<span style="color:#ca60ca;">#BLOCK-COMMENT</span>
+
 <span style="color:#898887;"># brace expansion</span>
 <span style="color:#644a9b;">mv</span> my_file.<span style="color:#0057ae;">{JPG</span><span style="color:#ca60ca;">,</span><span style="color:#0057ae;">jpg}</span>
 <span style="color:#644a9b;font-weight:bold;">echo</span> f.<span style="color:#0057ae;">{</span><span style="color:#b08000;">01</span><span style="color:#0057ae;">..</span><span style="color:#b08000;">100</span><span style="color:#0057ae;">..</span><span style="color:#b08000;">3</span><span style="color:#0057ae;">}</span> f.<span style="color:#0057ae;">{</span>Z<span style="color:#0057ae;">..</span>a<span style="color:#0057ae;">..</span><span style="color:#b08000;">-3</span><span style="color:#0057ae;">}</span>
diff --git a/autotests/input/highlight.sh b/autotests/input/highlight.sh
index e9781f36..6a4e15f6 100644
--- a/autotests/input/highlight.sh
+++ b/autotests/input/highlight.sh
@@ -29,6 +29,19 @@ mkdir this\ isnt\ #a\ comment
 mkdir this\ isnt\\\;#a\ comment
 mkdir this\\ #is a comment
 
+<<'#BLOCK-COMMENT'
+NOTE This is the "miltiline" comment.
+
+[===[.rst:
+
+Docs
+----
+
+Documentation block in ``RST`` format **starts** *here*.
+
+]===]
+#BLOCK-COMMENT
+
 # brace expansion
 mv my_file.{JPG,jpg}
 echo f.{01..100..3} f.{Z..a..-3}
diff --git a/autotests/reference/highlight.sh.ref b/autotests/reference/highlight.sh.ref
index ec1f1779..6bbe16c9 100644
--- a/autotests/reference/highlight.sh.ref
+++ b/autotests/reference/highlight.sh.ref
@@ -29,6 +29,19 @@
 <Command>mkdir</Command><Normal Text> this</Normal Text><Escape>\ </Escape><Normal Text>isnt</Normal Text><Escape>\\\;</Escape><Normal Text>#a</Normal Text><Escape>\ </Escape><Normal Text>comment</Normal Text><br/>
 <Command>mkdir</Command><Normal Text> this</Normal Text><Escape>\\</Escape><Normal Text> </Normal Text><Comment>#is a comment</Comment><br/>
 <Normal Text></Normal Text><br/>
+<Redirection><<'#BLOCK-COMMENT'</Redirection><br/>
+<Alert Level 3>NOTE</Alert Level 3><Comment> This is the "miltiline" comment.</Comment><br/>
+<Comment></Comment><br/>
+<Region Marker>[===[.rst:</Region Marker><br/>
+<Comment></Comment><br/>
+<Comment>Docs</Comment><br/>
+<Comment>----</Comment><br/>
+<Comment></Comment><br/>
+<Comment>Documentation block in </Comment><InlineLiteral>``RST``</InlineLiteral><Comment> format </Comment><Bold>**starts**</Bold><Comment> </Comment><Italic>*here*</Italic><Comment>.</Comment><br/>
+<Comment></Comment><br/>
+<Region Marker>]===]</Region Marker><br/>
+<Redirection>#BLOCK-COMMENT</Redirection><br/>
+<Normal Text></Normal Text><br/>
 <Comment># brace expansion</Comment><br/>
 <Command>mv</Command><Normal Text> my_file.</Normal Text><Escape>{JPG</Escape><Operator>,</Operator><Escape>jpg}</Escape><br/>
 <Builtin>echo</Builtin><Normal Text> f.</Normal Text><Escape>{</Escape><Decimal>01</Decimal><Escape>..</Escape><Decimal>100</Decimal><Escape>..</Escape><Decimal>3</Decimal><Escape>}</Escape><Normal Text> f.</Normal Text><Escape>{</Escape><Normal Text>Z</Normal Text><Escape>..</Escape><Normal Text>a</Normal Text><Escape>..</Escape><Decimal>-3</Decimal><Escape>}</Escape><br/>
diff --git a/data/syntax/bash.xml b/data/syntax/bash.xml
index 264a121c..1acb9c19 100644
--- a/data/syntax/bash.xml
+++ b/data/syntax/bash.xml
@@ -66,7 +66,7 @@
 
 <language
     name="Bash"
-    version="42"
+    version="43"
     kateversion="5.79"
     section="Scripts"
     extensions="*.sh;*.bash;*.ebuild;*.eclass;*.exlib;*.exheres-0;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD"
@@ -1013,6 +1013,7 @@
 
       <!-- HereDoc consumes Here-documents. It is called at the beginning of the "<<" construct. -->
       <context attribute="Normal Text" lineEndContext="#stay" name="HereDoc">
+        <RegExpr attribute="Redirection" context="HereDocMLComment" String="^[ &tab;]*&lt;&lt;[ &tab;]*'#([^']+)'$" column="0"/>
         <RegExpr attribute="Redirection" context="HereDocIQ"  String="&lt;&lt;-[ &tab;]*&heredocq;(?=[ &tab;]*$)"/>
         <RegExpr attribute="Redirection" context="HereDocINQ" String="&lt;&lt;-[ &tab;]*([^&wordseps;]+)(?=[ &tab;]*$)"/>
         <RegExpr attribute="Redirection" context="HereDocQ"   String="&lt;&lt;[ &tab;]*&heredocq;(?=[ &tab;]*$)"/>
@@ -1030,6 +1031,18 @@
         <IncludeRules context="Start"/>
       </context>
 
+      <context attribute="Comment" lineEndContext="#stay" name="HereDocMLComment" dynamic="true" fallthroughContext="Comment">
+        <RegExpr attribute="Redirection" context="#pop#pop" String="^#%1$" column="0" dynamic="true"/>
+        <RegExpr attribute="Region Marker" context="RST Documentation" String="^#?\[(=*)\[\.rst:" column="0" beginRegion="RSTDocumentation" />
+        <IncludeRules context="Comment"/>
+      </context>
+
+      <context attribute="Comment" lineEndContext="#stay" name="RST Documentation" dynamic="true">
+        <RegExpr attribute="Redirection" context="#pop#pop#pop" String="^#BLOCK-COMMENT$" column="0"/>
+        <RegExpr attribute="Region Marker" context="#pop" String="^#?\]%1\]" dynamic="true" column="0" endRegion="RSTDocumentation" />
+        <IncludeRules context="##reStructuredText" />
+      </context>
+
       <context attribute="Here Doc" lineEndContext="#stay" name="HereDocQ" dynamic="true" fallthroughContext="HereDocText">
         <RegExpr attribute="Redirection" context="#pop#pop" String="^%1$" dynamic="true" column="0"/>
       </context>
@@ -1841,6 +1854,7 @@
       <itemData name="Parameter Expansion Operator" defStyleNum="dsOperator" spellChecking="false"/>
       <itemData name="Operator"       defStyleNum="dsOperator"      spellChecking="false"/>
       <itemData name="Error"          defStyleNum="dsError"         spellChecking="false"/>
+      <itemData name="Region Marker"  defStyleNum="dsRegionMarker"  spellChecking="false" />
     </itemDatas>
   </highlighting>
   <general>
-- 
GitLab