gtksourceview3 2.2.0-x86-mingw32 → 2.2.1-x86-mingw32

data/vendor/local/share/gtksourceview-3.0/language-specs/html.lang

@@ -3,9 +3,9 @@
 
  This file is part of GtkSourceView
 
- Authors: Marco Barisione, Emanuele Aina
- Copyright (C) 2005-2007 Marco Barisione <barisione@gmail.com>
- Copyright (C) 2005-2007 Emanuele Aina
+ Copyright (C) 2005-2007 - Marco Barisione <barisione@gmail.com>
+ Copyright (C) 2005-2007 - Emanuele Aina
+ Copyright (C) 2014 - Sébastien Wilmet <swilmet@gnome.org>
 
  GtkSourceView is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -23,158 +23,259 @@
 
 -->
 <language id="html" _name="HTML" version="2.0" _section="Markup">
-    <metadata>
-      <property name="mimetypes">text/html</property>
-      <property name="globs">*.html;*.htm</property>
-      <property name="block-comment-start">&lt;!--</property>
-      <property name="block-comment-end">--&gt;</property>
-    </metadata>
-
-    <styles>
-        <style id="comment" _name="Comment" map-to="xml:comment"/>
-        <style id="tag" _name="Tag" map-to="xml:element-name"/>
-        <style id="attrib-name" _name="Attribute Name" map-to="xml:attribute-name"/>
-        <style id="attrib-value" _name="Attribute Value" map-to="xml:attribute-value"/>
-        <style id="dtd" _name="DTD" map-to="xml:doctype"/>
-        <style id="error" _name="Error" map-to="xml:error"/>
-    </styles>
-
-    <default-regex-options case-sensitive="false"/>
-
-    <definitions>
-        <!-- Html comments are more permissive than xml comments -->
-        <context id="comment" style-ref="comment" class="comment">
-            <start>&lt;!--</start>
-            <end>--\s*&gt;</end>
-            <include>
-                <context ref="def:in-comment"/>
-            </include>
-        </context>
+  <metadata>
+    <property name="mimetypes">text/html</property>
+    <property name="globs">*.html;*.htm</property>
+    <property name="block-comment-start">&lt;!--</property>
+    <property name="block-comment-end">--&gt;</property>
+  </metadata>
 
-        <context id="dtd" style-ref="dtd" class="no-spell-check">
-            <start>&lt;!</start>
-            <end>&gt;</end>
-        </context>
+  <styles>
+    <style id="comment" _name="Comment" map-to="xml:comment"/>
+    <style id="tag" _name="Tag" map-to="xml:element-name"/>
+    <style id="attrib-name" _name="Attribute Name" map-to="xml:attribute-name"/>
+    <style id="attrib-value" _name="Attribute Value" map-to="xml:attribute-value"/>
+    <style id="dtd" _name="DTD" map-to="xml:doctype"/>
+    <style id="error" _name="Error" map-to="xml:error"/>
+    <style id="title" _name="Page title" map-to="def:heading0"/>
+    <style id="h1" _name="Heading level 1" map-to="def:heading1"/>
+    <style id="h2" _name="Heading level 2" map-to="def:heading2"/>
+    <style id="h3" _name="Heading level 3" map-to="def:heading3"/>
+    <style id="h4" _name="Heading level 4" map-to="def:heading4"/>
+    <style id="h5" _name="Heading level 5" map-to="def:heading5"/>
+  </styles>
 
-        <!-- This is a placeholder context intended to be <replace>d
-             in languages like php that need to embedd contexts inside
-             html tags and attributes.
-        -->
-        <context id="embedded-lang-hook">
-            <start>\%{def:never-match}</start>
-            <end></end>
-        </context>
+  <default-regex-options case-sensitive="false"/>
 
-        <context id="generic-tag">
-            <include>
-
-                <!-- Attribute in the form: name="value" -->
-                <context id="attrib-quoted" style-ref="attrib-name" class="no-spell-check">
-                    <start extended="true">
-                        [A-Za-z0-9:_-]+ # attribute name
-                        \s*=\s*         # "="
-                        (\")            # string beginning
-                    </start>
-                    <end>\"</end>
-                    <include>
-                        <context sub-pattern="1" where="start" style-ref="attrib-value"/>
-                        <context sub-pattern="0" where="end" style-ref="attrib-value"/>
-                        <context id="string" extend-parent="false" end-at-line-end="true" style-ref="attrib-value" class="string" class-disabled="no-spell-check">
-                            <start>\%{def:always-match}</start>
-                            <include>
-                                <context ref="xml:entity"/>
-                                <context ref="xml:character-reference"/>
-                                <context ref="embedded-lang-hook"/>
-                            </include>
-                        </context>
-                    </include>
-                </context>
-
-                <!-- Attribute in the form: name=value -->
-                <context id="attrib-unquoted" style-ref="attrib-value" class="no-spell-check">
-                    <start extended="true">
-                        [a-z0-9:_-]+ # attribute name
-                        \s*=\s*      # "="
-                    </start>
-                    <end>(?=&gt;|\s)</end>
-                    <include>
-                        <context sub-pattern="0" where="start" style-ref="attrib-name"/>
-                        <context ref="xml:entity"/>
-                        <context ref="xml:character-reference"/>
-                    </include>
-                </context>
-
-                <!-- Attribute in the form: name -->
-                <context id="attrib-no-value" style-ref="attrib-name" class="no-spell-check">
-                    <match extended="true">
-                        [a-z0-9:_-]+  # attribute name
-                    </match>
-                </context>
+  <definitions>
+    <!-- Html comments are more permissive than xml comments -->
+    <context id="comment" style-ref="comment" class="comment">
+      <start>&lt;!--</start>
+      <end>--\s*&gt;</end>
+      <include>
+        <context ref="def:in-comment"/>
+      </include>
+    </context>
 
-                <context ref="embedded-lang-hook"/>
+    <context id="dtd" style-ref="dtd" class="no-spell-check">
+      <start>&lt;!</start>
+      <end>&gt;</end>
+    </context>
 
-            </include>
-        </context>
+    <!-- This is a placeholder context intended to be <replace>d
+         in languages like php that need to embedd contexts inside
+         html tags and attributes.
+    -->
+    <context id="embedded-lang-hook">
+      <start>\%{def:never-match}</start>
+      <end></end>
+    </context>
 
-        <context id="style" class="no-spell-check">
-            <start>&lt;\s*style\%]</start>
-            <end>/&gt;|&lt;\s*/\s*style\s*&gt;</end>
-
-            <include>
+    <context id="headings">
+      <include>
+        <context id="title" style-inside="true" style-ref="title" end-at-line-end="true">
+          <start>&lt;title&gt;</start>
+          <end>&lt;/title&gt;</end>
+          <include>
+            <context sub-pattern="0" where="start" style-ref="tag"/>
+            <context sub-pattern="0" where="end" style-ref="tag"/>
+          </include>
+        </context>
+        <context id="h1" end-at-line-end="true">
+          <start>&lt;\s*h1</start>
+          <include>
+            <context sub-pattern="0" where="start" style-ref="tag"/>
+            <context ref="generic-tag"/>
+            <context id="h1-inside" style-inside="true" style-ref="h1" end-at-line-end="true" end-parent="true">
+              <start>&gt;</start>
+              <end>&lt;\s*/h1\s*&gt;</end>
+              <include>
                 <context sub-pattern="0" where="start" style-ref="tag"/>
                 <context sub-pattern="0" where="end" style-ref="tag"/>
-                <context ref="generic-tag"/>
-                <context id="style-code" extend-parent="false">
-                    <start>&gt;</start>
-                    <include>
-                        <context sub-pattern="0" where="start" style-ref="tag"/>
-                        <context ref="css:css"/>
-                    </include>
-                </context>
-            </include>
+                <!-- We cannot match any further here, because matching to tag will override our end-match -->
+              </include>
+            </context>
+          </include>
         </context>
-
-        <context id="script" class="no-spell-check">
-            <start>&lt;\s*script\%]</start>
-            <end>/&gt;|&lt;\s*/\s*script\s*&gt;</end>
-
-            <include>
+        <context id="h2" end-at-line-end="true">
+          <start>&lt;\s*h2</start>
+          <include>
+            <context sub-pattern="0" where="start" style-ref="tag"/>
+            <context ref="generic-tag"/>
+            <context id="h2-inside" style-inside="true" style-ref="h2" end-at-line-end="true" end-parent="true">
+              <start>&gt;</start>
+              <end>&lt;\s*/h2\s*&gt;</end>
+              <include>
                 <context sub-pattern="0" where="start" style-ref="tag"/>
                 <context sub-pattern="0" where="end" style-ref="tag"/>
-                <context ref="generic-tag"/>
-                <context id="js-code" extend-parent="false">
-                    <start>&gt;</start>
-                    <include>
-                        <context sub-pattern="0" where="start" style-ref="tag"/>
-                        <context ref="js:js"/>
-                    </include>
-                </context>
-            </include>
+                <!-- We cannot match any further here, because matching to tag will override our end-match -->
+              </include>
+            </context>
+          </include>
         </context>
-
-        <context id="tag" class="no-spell-check">
-            <start>&lt;\s*/?\s*[a-z0-9_-]+</start>
-            <end>/?\s*&gt;</end>
-            <include>
+        <context id="h3" end-at-line-end="true">
+          <start>&lt;\s*h3</start>
+          <include>
+            <context sub-pattern="0" where="start" style-ref="tag"/>
+            <context ref="generic-tag"/>
+            <context id="h3-inside" style-inside="true" style-ref="h3" end-at-line-end="true" end-parent="true">
+              <start>&gt;</start>
+              <end>&lt;\s*/h3\s*&gt;</end>
+              <include>
+                <context sub-pattern="0" where="start" style-ref="tag"/>
+                <context sub-pattern="0" where="end" style-ref="tag"/>
+                <!-- We cannot match any further here, because matching to tag will override our end-match -->
+              </include>
+            </context>
+          </include>
+        </context>
+        <context id="h4" end-at-line-end="true">
+          <start>&lt;\s*h4</start>
+          <include>
+            <context sub-pattern="0" where="start" style-ref="tag"/>
+            <context ref="generic-tag"/>
+            <context id="h4-inside" style-inside="true" style-ref="h4" end-at-line-end="true" end-parent="true">
+              <start>&gt;</start>
+              <end>&lt;\s*/h4\s*&gt;</end>
+              <include>
                 <context sub-pattern="0" where="start" style-ref="tag"/>
                 <context sub-pattern="0" where="end" style-ref="tag"/>
-                <context ref="generic-tag"/>
-            </include>
+                <!-- We cannot match any further here, because matching to tag will override our end-match -->
+              </include>
+            </context>
+          </include>
         </context>
+        <context id="h5" end-at-line-end="true">
+          <start>&lt;\s*h5</start>
+          <include>
+            <context sub-pattern="0" where="start" style-ref="tag"/>
+            <context ref="generic-tag"/>
+            <context id="h5-inside" style-inside="true" style-ref="h5" end-at-line-end="true" end-parent="true">
+              <start>&gt;</start>
+              <end>&lt;\s*/h5\s*&gt;</end>
+              <include>
+                <context sub-pattern="0" where="start" style-ref="tag"/>
+                <context sub-pattern="0" where="end" style-ref="tag"/>
+                <!-- We cannot match any further here, because matching to tag will override our end-match -->
+              </include>
+            </context>
+          </include>
+        </context>
+      </include>
+    </context>
+
+    <define-regex id="attribute-name">[a-z0-9:_-]+</define-regex>
 
-        <context id="html">
-            <include>
-                <context ref="xml:doctype"/>
+    <context id="generic-tag">
+      <include>
+        <!-- Attribute in the form: name="value" -->
+        <context id="attrib-quoted" class="no-spell-check">
+          <start>(\%{attribute-name}\s*=\s*)(\")</start>
+          <include>
+            <context sub-pattern="1" where="start" style-ref="attrib-name"/>
+            <context sub-pattern="2" where="start" style-ref="attrib-value"/>
+            <context id="string" end-parent="true" end-at-line-end="true" style-ref="attrib-value" class="string" class-disabled="no-spell-check">
+              <start>\%{def:always-match}</start>
+              <end>\"</end>
+              <include>
                 <context ref="xml:entity"/>
                 <context ref="xml:character-reference"/>
-                <context ref="xml:cdata"/>
-                <context ref="comment"/>
-                <context ref="dtd"/>
-                <context ref="style"/>
-                <context ref="script"/>
-                <context ref="tag"/>
-            </include>
+                <context ref="embedded-lang-hook"/>
+              </include>
+            </context>
+          </include>
+        </context>
+
+        <!-- Attribute in the form: name=value -->
+        <context id="attrib-unquoted" style-ref="attrib-value" class="no-spell-check">
+          <start>\%{attribute-name}\s*=\s*</start>
+          <end>(?=&gt;|\s)</end>
+          <include>
+            <context sub-pattern="0" where="start" style-ref="attrib-name"/>
+            <context ref="xml:entity"/>
+            <context ref="xml:character-reference"/>
+            <context ref="embedded-lang-hook"/>
+          </include>
+        </context>
+
+        <!-- Attribute in the form: name -->
+        <context id="attrib-no-value" style-ref="attrib-name" class="no-spell-check">
+          <match>\%{attribute-name}</match>
+        </context>
+
+        <context ref="embedded-lang-hook"/>
+      </include>
+    </context>
+
+    <context id="style" class="no-spell-check">
+      <start>&lt;\s*style\%]</start>
+      <include>
+        <context sub-pattern="0" where="start" style-ref="tag"/>
+        <context ref="generic-tag"/>
+
+        <context end-parent="true" style-ref="tag">
+          <match>/\s*&gt;</match>
         </context>
 
-    </definitions>
+        <context id="style-code" end-parent="true">
+          <start>&gt;</start>
+          <end>&lt;\s*/\s*style\s*&gt;</end>
+          <include>
+            <context sub-pattern="0" where="start" style-ref="tag"/>
+            <context sub-pattern="0" where="end" style-ref="tag"/>
+            <context ref="embedded-lang-hook"/>
+            <context ref="css:css"/>
+          </include>
+        </context>
+      </include>
+    </context>
+
+    <context id="script" class="no-spell-check">
+      <start>&lt;\s*script\%]</start>
+      <include>
+        <context sub-pattern="0" where="start" style-ref="tag"/>
+        <context ref="generic-tag"/>
+
+        <context end-parent="true" style-ref="tag">
+          <match>/\s*&gt;</match>
+        </context>
+
+        <context id="js-code" end-parent="true">
+          <start>&gt;</start>
+          <end>&lt;\s*/\s*script\s*&gt;</end>
+          <include>
+            <context sub-pattern="0" where="start" style-ref="tag"/>
+            <context sub-pattern="0" where="end" style-ref="tag"/>
+            <context ref="embedded-lang-hook"/>
+            <context ref="js:js"/>
+          </include>
+        </context>
+      </include>
+    </context>
+
+    <context id="tag" class="no-spell-check">
+      <start>&lt;\s*/?\s*[a-z0-9_-]+</start>
+      <end>/?\s*&gt;</end>
+      <include>
+        <context sub-pattern="0" where="start" style-ref="tag"/>
+        <context sub-pattern="0" where="end" style-ref="tag"/>
+        <context ref="generic-tag"/>
+      </include>
+    </context>
+
+    <context id="html">
+      <include>
+        <context ref="xml:doctype"/>
+        <context ref="xml:entity"/>
+        <context ref="xml:character-reference"/>
+        <context ref="xml:cdata"/>
+        <context ref="comment"/>
+        <context ref="dtd"/>
+        <context ref="headings"/>
+        <context ref="style"/>
+        <context ref="script"/>
+        <context ref="tag"/>
+      </include>
+    </context>
+  </definitions>
 </language>

data/vendor/local/share/gtksourceview-3.0/language-specs/idl.lang

@@ -21,7 +21,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 -->
-<language id="idl" _name="IDL" version="2.0" _section="Sources">
+<language id="idl" _name="IDL" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-idl</property>
     <property name="globs">*.idl</property>

data/vendor/local/share/gtksourceview-3.0/language-specs/ini.lang

@@ -20,7 +20,7 @@
  License along with this library; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 -->
-<language id="ini" _name=".ini" version="2.0" _section="Others">
+<language id="ini" _name=".ini" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/x-ini-file;application/x-ini-file</property>
     <property name="globs">*.ini</property>
@@ -40,7 +40,7 @@
 
   <definitions>
     <context id="line-comment" style-ref="comment" end-at-line-end="true" class="comment" class-disabled="no-spell-check">
-      <start>;</start>
+      <start>;|#</start>
     </context>
     <context id="group" style-ref="keyword">
       <start>^\[</start>

data/vendor/local/share/gtksourceview-3.0/language-specs/j.lang

@@ -21,7 +21,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 -->
-<language id="j" _name="J" version="2.0" _section="Sources">
+<language id="j" _name="J" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.ijs</property>
     <property name="line-comment-start">NB\.</property>

data/vendor/local/share/gtksourceview-3.0/language-specs/java.lang

@@ -22,7 +22,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 -->
-<language id="java" _name="Java" version="2.0" _section="Sources">
+<language id="java" _name="Java" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-java</property>
     <property name="globs">*.java</property>

data/vendor/local/share/gtksourceview-3.0/language-specs/javascript.lang

@@ -24,7 +24,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 -->
-<language id="js" _name="JavaScript" version="2.0" _section="Scripts">
+<language id="js" _name="JavaScript" version="2.0" _section="Script">
   <metadata>
     <property name="mimetypes">application/javascript;application/x-javascript;text/x-javascript;text/javascript;text/x-js</property>
     <property name="globs">*.js;*.node</property>

data/vendor/local/share/gtksourceview-3.0/language-specs/json.lang

@@ -26,7 +26,7 @@
   value in the doc, after a key, and between each comma in an array. Also
   I'd be able to add support for displaying an error for trailing commas.
 -->
-<language id="json" name="JSON" version="2.0" _section="Others">
+<language id="json" name="JSON" version="2.0" _section="Other">
   <metadata>
     <property name="globs">*.json</property>
   </metadata>