From ddacb54a1ed6a8e048c79064171ef9a4d7ecf570 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sun, 3 Mar 2019 21:48:37 +0900
Subject: Update Kate syntax highlight files from
 http://kate-editor.org/syntax/2.5/ sources.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit b956734b51a178ba083848672b006aa325217381)
---
 kate/data/metafont.xml | 36 +++++++-----------------------------
 1 file changed, 7 insertions(+), 29 deletions(-)

(limited to 'kate/data/metafont.xml')

diff --git a/kate/data/metafont.xml b/kate/data/metafont.xml
index 4ce1e1412..7cb1e8afa 100644
--- a/kate/data/metafont.xml
+++ b/kate/data/metafont.xml
@@ -6,7 +6,7 @@ We have moved some keywords for consistency
 -->
 
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Metapost/Metafont" section="Markup" version="1" kateversion="2.4"
+<language name="Metapost/Metafont" section="Markup" version="4" kateversion="2.4"
 extensions="*.mp;*.mps;*.mpost;*.mf" mimetype="text/x-metapost" 
 author="Yedvilun (yedvilun@gmail.com)" license="LGPL">
   <highlighting>
@@ -240,6 +240,7 @@ author="Yedvilun (yedvilun@gmail.com)" license="LGPL">
 
     <!--Page 155: 'grouping'-->
 
+<!--     commented out, since these keywords are in RegExpr rules-->
 <!--     <list name="mfStatement"> -->
 <!--       <item>begingroup</item> -->
 <!--       <item>endgroup</item> -->
@@ -548,27 +549,6 @@ author="Yedvilun (yedvilun@gmail.com)" license="LGPL">
       <item>withcolor</item>
     </list>
 
-    <!--Metafont primitives not found in MetaPost-->
-    <list name="notDefined">
-      <item>autorounding</item>
-      <item>chardx</item>
-
-      <item>chardy</item>
-      <item>fillin</item>
-      <item>granularity</item>
-      <item>hppp</item>
-      <item>proofing</item>
-      <item>smoothing</item>
-
-      <item>tracingedges</item>
-      <item>tracingpens</item>
-      <item>turningcheck</item>
-      <item>vppp</item>
-      <item>xoffset</item>
-      <item>yoffset</item>
-
-    </list>
-
     <!--Keywords defined by plain.mp-->
     <list name="mpMacro">
       <item>ahangle</item>
@@ -826,8 +806,9 @@ author="Yedvilun (yedvilun@gmail.com)" license="LGPL">
 
     </list>
 
-    <!--We put all the delimiters here. They will be treated apart, for code folding-->
-    <list name="EnvDelimiters">
+    <!--We put all the delimiters here. They will be treated apart, for code folding.
+        Commented out, since these keywords are already matched by RegExpr rules.-->
+<!--    <list name="EnvDelimiters">
       <item>beginchar</item>
       <item>endchar</item>
       <item>extra_beginchar</item>
@@ -838,7 +819,7 @@ author="Yedvilun (yedvilun@gmail.com)" license="LGPL">
       <item>endfig</item>
       <item>extra_beginfig</item>
       <item>extra_endfig</item>
-    </list>
+    </list>-->
 
     <contexts>
       <context name="Normal Text"    attribute="Normal Text" lineEndContext="#stay">
@@ -853,7 +834,7 @@ author="Yedvilun (yedvilun@gmail.com)" license="LGPL">
         <keyword String="mfStringExp" attribute="Statement" context="#stay"/>
         <keyword String="mfCommand"  attribute="Statement" context="#stay"/>
         <keyword String="mfType"     attribute="Type" context="#stay"/>
-        <keyword String="mfStatement" attribute="Statement" context="#stay"/>
+<!--         <keyword String="mfStatement" attribute="Statement" context="#stay"/> -->
         <keyword String="mfDefinition" attribute="Statement" context="#stay"/>
         <keyword String="mfCondition" attribute="Conditional" context="#stay"/>
         <keyword String="mfPrimitive" attribute="Statement" context="#stay"/>
@@ -931,9 +912,6 @@ author="Yedvilun (yedvilun@gmail.com)" license="LGPL">
         <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
         <RegExpr String="[a-zA-Z]+(\+?|\*{0,3})" attribute="Keyword" context="#pop"/>
         <RegExpr String="[^a-zA-Z]" attribute="Keyword" context="#pop" />
-
-      </context>
-      <context name="ToEndOfLine" attribute="Normal Text" lineEndContext="#pop">
       </context>
       <context name="Verb" attribute="Verbatim" lineEndContext="#pop#pop" >
         <RegExpr String="(.)" attribute="Normal Text" dynamic="true" context="VerbEnd" />
-- 
cgit v1.2.1