Lilypond, MetaFont, RHTML: Fix missing/unused itemDatas

Test Plan: make test Reviewers: vkrause Reviewed By: vkrause Subscribers: #frameworks Tags: #frameworks Differential Revision: https://phabricator.kde.org/D9375
KDE · Dec 17, 2017 · 6b9c129 · 6b9c129
1 parent 412f5a7
commit 6b9c129
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/data/syntax/lilypond.xml b/data/syntax/lilypond.xml
@@ -56,7 +56,7 @@
 ]>
 <language name="LilyPond" section="Other"
           style="lilypond" indenter="lilypond"
-          version="4" kateversion="3.3"
+          version="6" kateversion="3.3"
           extensions="*.ly;*.LY;*.ily;*.ILY;*.lyi;*.LYI"
           mimetype="text/x-lilypond"
           author="Wilbert Berendsen (info@wilbertberendsen.nl)" license="LGPL">
@@ -1155,7 +1155,7 @@
       <itemData name="Chord" defStyleNum="dsDataType" bold="true"/>
       <itemData name="Beam" defStyleNum="dsDataType" bold="true"/>
       <itemData name="Check" defStyleNum="dsDecVal"/>
-      <itemData name="Repeat" defStyleNum="dsDataType" italic="true"/>
+      <itemData name="Tremolo" defStyleNum="dsOthers"/>
       <itemData name="Keyword" defStyleNum="dsKeyword"/>
       <itemData name="Command" defStyleNum="dsFunction" bold="true"/>
       <itemData name="User Command" defStyleNum="dsFunction"/>

diff --git a/data/syntax/metafont.xml b/data/syntax/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="4" kateversion="2.4"
+<language name="Metapost/Metafont" section="Markup" version="5" kateversion="5.0"
 extensions="*.mp;*.mps;*.mpost;*.mf" mimetype="text/x-metapost" 
 author="Yedvilun (yedvilun@gmail.com)" license="LGPL">
   <highlighting>
@@ -899,7 +899,7 @@ author="Yedvilun (yedvilun@gmail.com)" license="LGPL">
 
       <!--TeX mode : we just define generic TeX commands-->
       <!--syntax from highlighting file latex.xml-->
-      <context name="TeXMode" attribute="Tex" lineEndContext="#stay">
+      <context name="TeXMode" attribute="TeX" lineEndContext="#stay">
         <DetectChar char="\" attribute="Keyword" context="ContrSeq"/>
         <DetectChar char="$" attribute="Math" context="MathMode" beginRegion="mathMode" />
 
@@ -940,8 +940,7 @@ author="Yedvilun (yedvilun@gmail.com)" license="LGPL">
 
       <!-- comment -->
       <context name="Comment" attribute="Comment" lineEndContext="#pop">
-
-        <RegExpr String="(FIXME|TODO):?" attribute="Alert" context="#stay"/>
+        <IncludeRules context="##Alerts" />
         <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
       </context>
 
@@ -956,22 +955,22 @@ author="Yedvilun (yedvilun@gmail.com)" license="LGPL">
       <itemData name="Math" defStyleNum="dsNormal" color="#00A000" selColor="#FF40FF"  bold="0" italic="0"/>
       <itemData name="TeX" defStyleNum="dsNormal"/>
       <itemData name="String" defStyleNum="dsString"/>
-      <itemData name="Alert" defStyleNum="dsAlert"/>
+      <itemData name="Verbatim" defStyleNum="dsVerbatimString"/>
       <itemData name="Macro"  defStyleNum="dsKeyword" color="#770000" selColor="#99FFFF" bold="0" italic="0"/>
-      <itemData name="Operator" defStyleNum="dsKeyword" color="#244CFF" bold="0"/>
+      <itemData name="Operator" defStyleNum="dsOperator"/>
       <itemData name="Special" defStyleNum="dsKeyword" color="#008000" bold="0"/>
       <itemData name="Conditional" defStyleNum="dsKeyword"/>
 
       <itemData name="Statement" defStyleNum="dsNormal" color="#0000FF" selColor="#FFFF00" bold="0" italic="0"/>
       <itemData name="BoolExp" defStyleNum="dsKeyword" italic="1" bold="0" color="#AA00AA" selColor="#FFFF00"/>
       <itemData name="NumExp" defStyleNum="dsFunction"/>
-      <itemData name="Variable" defStyleNum="dsKeyword" color="#550022"/>
+      <itemData name="Variable" defStyleNum="dsVariable"/>
       <itemData name="Identifier" defStyleNum="dsKeyword"/>
       <itemData name="Type" defStyleNum="dsDataType"/>
       <itemData name="Decimal" defStyleNum="dsDecVal"/>
       <itemData name="Octal" defStyleNum="dsBaseN"/>
       <itemData name="Hex" defStyleNum="dsBaseN"/>
-
+      <itemData name="Bullet" defStyleNum="dsExtension"/>
       <itemData name="Float" defStyleNum="dsFloat"/>
  </itemDatas>
   </highlighting>

diff --git a/data/syntax/rhtml.xml b/data/syntax/rhtml.xml
@@ -44,7 +44,7 @@
 -->
 
 <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". -->
-<language name="Ruby/Rails/RHTML" version="7" kateversion="2.4" section="Markup" extensions="*.rhtml;*.RHTML;*.html.erb" mimetype="" author="Richard Dale rdale@foton.es" license="LGPLv2+">
+<language name="Ruby/Rails/RHTML" version="8" kateversion="5.0" section="Markup" extensions="*.rhtml;*.RHTML;*.html.erb" mimetype="" author="Richard Dale rdale@foton.es" license="LGPLv2+">
 
 	<highlighting>
 
@@ -1160,6 +1160,7 @@
 		<itemDatas>
 		<!-- BEGIN Ruby itemData -->
 			<itemData name="Ruby Normal Text" defStyleNum="dsNormal"/>
+			<itemData name="RUBY RAILS ERB Text" defStyleNum="dsExtension"/>
 
 			<itemData name="Keyword" defStyleNum="dsKeyword"/>
 			<itemData name="Attribute Definition" defStyleNum="dsOthers"/>
@@ -1197,15 +1198,13 @@
 
 			<itemData name="Ruby Comment" defStyleNum="dsComment"/>
 			<itemData name="Blockcomment" defStyleNum="dsComment"/>
-			<itemData name="Region Marker" defStyleNum="dsNormal" color="#0000ff"/>
 			<itemData name="RDoc Value" defStyleNum="dsOthers"/>
 
 			<!-- use these to mark errors and alerts things -->
 			<itemData name="Error" defStyleNum="dsError" />
 			<itemData name="Alert" defStyleNum="dsAlert" />
 
 			<itemData name="Delimiter" defStyleNum="dsChar"/>
-			<itemData name="Expression" defStyleNum="dsOthers"/>
 			<itemData name="Operator" defStyleNum="dsChar"/>
 		<!-- END Ruby itemData -->