From ad2e17a6a28c118e4e8f6bd22c7763a0bb02c0cf Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sat, 11 Jun 2022 19:37:23 +0900
Subject: kate syntax highlighting - markdown: fixed strong emphasis
 visualization and ruler's regex.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit b2144c1a8560180c677761731218801dc3d7c23c)
---
 kate/data/markdown.xml     | 10 +++++-----
 kate/data/update-files.xml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kate/data/markdown.xml b/kate/data/markdown.xml
index a132f6d63..7d99d02ed 100644
--- a/kate/data/markdown.xml
+++ b/kate/data/markdown.xml
@@ -30,13 +30,13 @@
 			 <!ENTITY refimageregex '\!\[[^\]\^]+\]\[[^\[]*\]'>
 			 <!ENTITY autolinkregex '&lt;(https?|ftp):[^\"&gt;\s]+&gt;'>
 			 <!ENTITY mailtolinkregex '&lt;(?:mailto:)?([-.\w]+\@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)&gt;'>
-			 <!ENTITY rulerregex '\s*([\*\-_]\s?){3,}\s*'>
+			 <!ENTITY rulerregex '^\s*([\*\-_]){3,}\s*$'>
 			 <!-- two spaces at end of line generates linebreak -->
 			 <!ENTITY linebreakregex "  $"> 
 			 <!ENTITY strikeoutregex "[~]{2}[^~].*[^~][~]{2}"> <!-- pandoc style -->
 ]>
 			 
-<language name="Markdown" version="1.2" section="Markup"
+<language name="Markdown" version="1.3" section="Markup"
 		extensions="*.text;*.md;*.mmd;*.mdwn" priority="15"
 		author="Darrin Yeager, Claes Holmerson"
 		license="GPL,BSD" >
@@ -50,10 +50,10 @@
 				<RegExpr attribute="h3" String="^###\s.*[#]?$" />
 				<RegExpr attribute="h4" String="^####\s.*[#]?$" />
 				<RegExpr attribute="h5" String="^#####\s.*[#]?$" />
-				<RegExpr attribute="ruler" String="&rulerregex;" />
+				<RegExpr attribute="strongemphasis" String="&strongemphasisregex;" />
 				<RegExpr attribute="strong" String="&strongregex;" />
 				<RegExpr attribute="emphasis" String="&emphasisregex;" />
-				<RegExpr attribute="strongemphasis" String="&strongemphasisregex;" />
+				<RegExpr attribute="ruler" String="&rulerregex;" />
 				<RegExpr attribute="code" String="^([\s]{4,}|\t+).*$" />
 				<RegExpr context="bullet" String="^[\*\+\-]\s" />
 				<RegExpr context="numlist" String="^[\d]+\.\s" />
@@ -102,9 +102,9 @@
 		<itemDatas>
 			<itemData name="Normal Text" defStyleNum="dsNormal" />
 			<itemData name="common" defStyleNum="dsNormal" />
-			<itemData name="strongemphasis" defStyleNum="dsNormal" italic="true" bold="true"/>
 			<itemData name="emphasis" defStyleNum="dsNormal" italic="true" />
 			<itemData name="strong" defStyleNum="dsNormal" bold="true" />
+			<itemData name="strongemphasis" defStyleNum="dsNormal" italic="true" bold="true"/>
 			<itemData name="ruler" defStyleNum="dsNormal" bold="true" />
 			<itemData name="strikeout" defStyleNum="dsNormal" strikeOut="true" />
 			<itemData name="linebreak" defStyleNum="dsNormal" underline="true" color="#999999"/>
diff --git a/kate/data/update-files.xml b/kate/data/update-files.xml
index 0af937293..004f7dab2 100644
--- a/kate/data/update-files.xml
+++ b/kate/data/update-files.xml
@@ -136,7 +136,7 @@
 <Definition name="Makefile" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/makefile.xml" version="2.1"/>
 <Definition name="Mako" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mako.xml" version="1.0"/>
 <Definition name="Troff Mandoc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mandoc.xml" version="2"/>
-<Definition name="Markdown" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/markdown.xml" version="1.2"/>
+<Definition name="Markdown" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/markdown.xml" version="1.3"/>
 <Definition name="Mason" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mason.xml" version="4"/>
 <Definition name="Mathematica" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mathematica.xml" version="8.1"/>
 <Definition name="Matlab" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/matlab.xml" version="2-2"/>
-- 
cgit v1.2.3