#1

MrReSc · Feb 5, 2020 · d133974 · d133974
1 parent 189d320
commit d133974
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/IEC Mate/IEC Mate.csproj b/IEC Mate/IEC Mate.csproj
@@ -28,7 +28,7 @@
     <PrimaryVersionType>AssemblyVersionAttribute</PrimaryVersionType>
     <AssemblyFileVersionSettings>None.None.Increment.DateStamp</AssemblyFileVersionSettings>
     <AssemblyInfoVersionSettings>None.None.Increment.DateStamp</AssemblyInfoVersionSettings>
-    <AssemblyVersion>1.0.1547.20015</AssemblyVersion>
+    <AssemblyVersion>1.0.1548.20036</AssemblyVersion>
     <PublishUrl>C:\Users\r.scheidegger\Downloads\IEC Mate\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -42,7 +42,7 @@
     <ProductName>IEC-Mate</ProductName>
     <PublisherName>Remo Scheidegger</PublisherName>
     <ApplicationRevision>19222</ApplicationRevision>
-    <ApplicationVersion>1.0.1547.20015</ApplicationVersion>
+    <ApplicationVersion>1.0.1548.20036</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/IEC Mate/Properties/AssemblyInfo.cs b/IEC Mate/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1547.20015")]
-[assembly: AssemblyFileVersion("1.0.1547.20015")]
+[assembly: AssemblyVersion("1.0.1548.20036")]
+[assembly: AssemblyFileVersion("1.0.1548.20036")]
diff --git a/IEC Mate/resources/st_syntax.xshd b/IEC Mate/resources/st_syntax.xshd
@@ -9,8 +9,11 @@
 
   <!-- This is the main ruleset. -->
   <RuleSet>
-    <Span color="Comment" begin="//"></Span>
-    <Span color="Comment" multiline="true" begin="\(\*" end="\*\)" />
+    <Span color="Comment" begin="//" ruleSet="SpecialKeywords" />
+    <Span color="Comment" multiline="true" begin="\(\*" end="\*\)" ruleSet="SpecialKeywords" />
+
+    <!-- use rules from other RuleSets -->
+    <Import ruleSet="SpecialKeywords" />
 
     <Span color="String">
       <Begin>"</Begin>
@@ -69,30 +72,27 @@
       <Word>Variable_3</Word>
     </Keywords>
 
-    <!--<Span color="XMLtagB">
-      <Begin>&lt;row</Begin>
+    <Span color="XMLtags">
+      <Begin>&lt;</Begin>
       <End>&gt;</End>
     </Span>
+
+  </RuleSet>
 
-    <Span color="XMLtagB">
-      <Begin>&lt;/row</Begin>
-      <End>&gt;</End>
-    </Span>-->
+  <RuleSet name="SpecialKeywords">
 
-    <!--<Span color="XMLtagB">
-      <Begin>&lt;column</Begin>
-      <End>&gt;</End>
-    </Span>
+    <Keywords foreground="MediumVioletRed">
+      <Word>Variable_1</Word>
+    </Keywords>
 
-    <Span color="XMLtagB">
-      <Begin>&lt;/column</Begin>
-      <End>&gt;</End>
-    </Span>-->
+    <Keywords foreground="OrangeRed">
+      <Word>Variable_2</Word>
+    </Keywords>
 
-    <Span color="XMLtags">
-      <Begin>&lt;</Begin>
-      <End>&gt;</End>
-    </Span>
+    <Keywords foreground="DarkTurquoise">
+      <Word>Variable_3</Word>
+    </Keywords>
 
   </RuleSet>
+
 </SyntaxDefinition>