ultraviolet 0.10.0 → 0.10.1

data/render/xhtml/files/css/cobalt.css

@@ -36,7 +36,7 @@ pre.cobalt .Punctuation {
    color: #E1EFFF;
 }
 pre.cobalt .RawMarkup {
-   background-color: #1A4562;
+   background-color: #74B9D3;
 }
 pre.cobalt .CssConstructorArgument {
    color: #EB939A;
@@ -48,8 +48,8 @@ pre.cobalt .Storage {
    color: #FFEE80;
 }
 pre.cobalt .line-numbers {
-   background-color: #85533A;
-   color: #FFFFFF;
+   background-color: #B36539;
+   color: #000000;
 }
 pre.cobalt .CssClass {
    color: #5FE461;

data/render/xhtml/files/css/dawn.css

@@ -11,7 +11,7 @@ pre.dawn .Constant {
    color: #811F24;
 }
 pre.dawn .EmbeddedSource {
-   background-color: #E1E5EC;
+   background-color: #829AC2;
 }
 pre.dawn .StringRegexpConstantCharacterEscape {
    font-weight: bold;
@@ -28,8 +28,8 @@ pre.dawn .Storage {
    font-style: italic;
 }
 pre.dawn .line-numbers {
-   background-color: #CED8E9;
-   color: #080808;
+   background-color: #7496CF;
+   color: #000000;
 }
 pre.dawn .StringConstant {
    font-weight: bold;
@@ -47,7 +47,7 @@ pre.dawn .SupportConstant {
    color: #B4371F;
 }
 pre.dawn .MarkupQuote {
-   background-color: #EAEAEA;
+   background-color: #C5C5C5;
    color: #0B6125;
    font-style: italic;
 }
@@ -64,7 +64,7 @@ pre.dawn .MarkupDeleted {
    color: #B52A1D;
 }
 pre.dawn .MarkupRaw {
-   background-color: #EAEAEA;
+   background-color: #C5C5C5;
    color: #234A97;
 }
 pre.dawn .SupportFunction {
@@ -77,7 +77,7 @@ pre.dawn .StringRegexp {
    color: #CF5628;
 }
 pre.dawn .StringEmbeddedSource {
-   background-color: #E1E5EC;
+   background-color: #829AC2;
    color: #080808;
 }
 pre.dawn .MarkupLink {

data/render/xhtml/files/css/eiffel.css

@@ -1,5 +1,5 @@
 pre.eiffel .EmbeddedSource {
-   background-color: #DBE7FD;
+   background-color: #6597F6;
 }
 pre.eiffel .LibraryObject {
    font-weight: bold;

data/render/xhtml/files/css/espresso_libre.css

@@ -1,5 +1,5 @@
 pre.espresso_libre .EmbeddedSource {
-   background-color: #503A2D;
+   background-color: #CE9065;
 }
 pre.espresso_libre .LibraryObject {
    font-weight: bold;
@@ -30,7 +30,7 @@ pre.espresso_libre .LibraryVariable {
 }
 pre.espresso_libre .line-numbers {
    background-color: #C3DCFF;
-   color: #BDAE9D;
+   color: #000000;
 }
 pre.espresso_libre .FunctionParameter {
    font-style: italic;

data/render/xhtml/files/css/iplastic.css

@@ -32,7 +32,7 @@ pre.iplastic .line-numbers {
    color: #000000;
 }
 pre.iplastic {
-   background-color: #EEEEED;
+   background-color: #EEEEEE;
    color: #000000;
 }
 pre.iplastic .FrameTitle {
@@ -52,14 +52,14 @@ pre.iplastic .XmlDeclaration {
    color: #333333;
 }
 pre.iplastic .TrailingWhitespace {
-   background-color: #EEEEEB;
+   background-color: #EEEEEE;
 }
 pre.iplastic .TagAttribute {
    color: #3366CC;
    font-style: italic;
 }
 pre.iplastic .Invalid {
-   background-color: #EBAEA9;
+   background-color: #E7342D;
    color: #FF0000;
 }
 pre.iplastic .Keyword {

data/render/xhtml/files/css/mac_classic.css

@@ -1,5 +1,5 @@
 pre.mac_classic .EmbeddedSource {
-   background-color: #F2F2F2;
+   background-color: #0C0C0C;
 }
 pre.mac_classic .LibraryObject {
    font-weight: bold;
@@ -32,7 +32,7 @@ pre.mac_classic .LibraryVariable {
    color: #21439C;
 }
 pre.mac_classic .line-numbers {
-   background-color: #C4DCFF;
+   background-color: #4D97FF;
    color: #000000;
 }
 pre.mac_classic .FunctionParameter {
@@ -72,7 +72,7 @@ pre.mac_classic .MarkupXmlDeclaration {
    color: #68685B;
 }
 pre.mac_classic .EmbeddedEmbeddedSource {
-   background-color: #F0F0F0;
+   background-color: #0E0E0E;
 }
 pre.mac_classic .PreprocessorDirective {
    font-weight: bold;

data/render/xhtml/files/css/magicwb_amiga.css

@@ -29,10 +29,10 @@ pre.magicwb_amiga .IncludeUser {
    color: #FFA995;
 }
 pre.magicwb_amiga .ObjectiveCMethodCall {
-   font-style: italic;
+   color: #000000;
 }
 pre.magicwb_amiga .ConstantUserDefined {
-   background-color: #7878AA;
+   background-color: #1D1DEA;
    color: #FFA995;
 }
 pre.magicwb_amiga .LibraryConstant {
@@ -56,6 +56,9 @@ pre.magicwb_amiga .MarkupListItem {
 pre.magicwb_amiga .FunctionArgument {
    font-style: italic;
 }
+pre.magicwb_amiga .ObjectiveCMethodCall1 {
+   font-style: italic;
+}
 pre.magicwb_amiga .MarkupQuoteDoubleEmail {
    color: #4C457E;
 }
@@ -82,7 +85,7 @@ pre.magicwb_amiga .Keyword {
    font-weight: bold;
 }
 pre.magicwb_amiga .String {
-   background-color: #AA7878;
+   background-color: #EA1D1D;
    color: #FFFFFF;
 }
 pre.magicwb_amiga {

data/render/xhtml/files/css/pastels_on_dark.css

@@ -40,8 +40,8 @@ pre.pastels_on_dark .Comments {
    color: #555555;
 }
 pre.pastels_on_dark .line-numbers {
-   background-color: #4A3B4E;
-   color: #DADADA;
+   background-color: #73597E;
+   color: #FFFFFF;
 }
 pre.pastels_on_dark .PhpVariablesGlobals {
    color: #B72E1D;

data/render/xhtml/files/css/spacecadet.css

@@ -14,7 +14,7 @@ pre.spacecadet .Storage {
 }
 pre.spacecadet .line-numbers {
    background-color: #40002F;
-   color: #DDE6CF;
+   color: #FFFFFF;
 }
 pre.spacecadet {
    background-color: #0D0D0D;

data/render/xhtml/files/css/sunburst.css

@@ -33,8 +33,8 @@ pre.sunburst .Storage {
    color: #99CF50;
 }
 pre.sunburst .line-numbers {
-   background-color: #2C2F32;
-   color: #F8F8F8;
+   background-color: #DDF0FF;
+   color: #000000;
 }
 pre.sunburst .CssClass {
    color: #9B703F;
@@ -73,7 +73,7 @@ pre.sunburst .SupportConstant {
    color: #CF6A4C;
 }
 pre.sunburst .MarkupQuote {
-   background-color: #110F0A;
+   background-color: #ECD091;
    color: #E1D4B9;
    font-style: italic;
 }
@@ -88,14 +88,14 @@ pre.sunburst .StringRegexpSpecial {
    color: #CF7D34;
 }
 pre.sunburst .EmbeddedSourceBright {
-   background-color: #050505;
+   background-color: #ABADB4;
 }
 pre.sunburst .InvalidIllegal {
-   background-color: #402140;
+   background-color: #150B15;
    color: #FD5FF1;
 }
 pre.sunburst .MarkupRaw {
-   background-color: #050505;
+   background-color: #ABADB4;
    color: #578BB3;
 }
 pre.sunburst .SupportFunction {
@@ -149,7 +149,7 @@ pre.sunburst {
    color: #F8F8F8;
 }
 pre.sunburst .LogEntry {
-   background-color: #262626;
+   background-color: #C7C7C7;
 }
 pre.sunburst .MarkupItalic {
    color: #E9C062;

data/render/xhtml/files/css/twilight.css

@@ -21,7 +21,7 @@ pre.twilight .DiffChanged {
    color: #F8F8F8;
 }
 pre.twilight .EmbeddedSource {
-   background-color: #202020;
+   background-color: #A3A6AD;
 }
 pre.twilight .Support {
    color: #9B859D;
@@ -36,8 +36,8 @@ pre.twilight .Storage {
    color: #F9EE98;
 }
 pre.twilight .line-numbers {
-   background-color: #3C3F42;
-   color: #F8F8F8;
+   background-color: #DDF0FF;
+   color: #000000;
 }
 pre.twilight .CssClass {
    color: #9B703F;
@@ -71,10 +71,10 @@ pre.twilight .StringRegexpSpecial {
    color: #CF7D34;
 }
 pre.twilight .EmbeddedSourceBright {
-   background-color: #282829;
+   background-color: #9C9EA4;
 }
 pre.twilight .InvalidIllegal {
-   background-color: #452645;
+   background-color: #241A24;
    color: #F8F8F8;
 }
 pre.twilight .SupportFunction {

data/render/xhtml/files/css/zenburnesque.css

@@ -1,7 +1,7 @@
 pre.zenburnesque .InheritedClass {
 }
 pre.zenburnesque .TypeName {
-   color: #FFE000;
+   color: #F09040;
 }
 pre.zenburnesque .FloatingPointPrefixOperators {
    text-decoration: underline;
@@ -18,7 +18,7 @@ pre.zenburnesque .Storage {
 }
 pre.zenburnesque .line-numbers {
    background-color: #A0A0C0;
-   color: #DEDEDE;
+   color: #000000;
 }
 pre.zenburnesque .LineNumberDirectives {
    text-decoration: underline;
@@ -56,6 +56,9 @@ pre.zenburnesque .FloatingPointNumbers {
 pre.zenburnesque .ClassTypeName {
    color: #F4A020;
 }
+pre.zenburnesque .TypeName1 {
+   color: #FFE000;
+}
 pre.zenburnesque .ModuleKeyword {
    font-weight: bold;
    color: #FF8000;

data/render/xhtml/mac_classic.render

@@ -36,7 +36,7 @@ tags:
   selector: keyword.control.import
 - begin: <span class="FunctionName">
   end: </span>
-  selector: entity.name.function, keyword.other.name-of-parameter.objc
+  selector: entity.name.function, support.function.any-method
 - begin: <span class="TypeName">
   end: </span>
   selector: entity.name.type

data/render/xhtml/magicwb_amiga.render

@@ -52,7 +52,7 @@ tags:
 - begin: <span class="ObjectiveCMethodCall">
   end: </span>
   selector: support.function.any-method
-- begin: <span class="ObjectiveCMethodCall">
+- begin: <span class="ObjectiveCMethodCall1">
   end: </span>
   selector: support.function.any-method - punctuation
 - begin: <span class="LibraryConstant">

data/render/xhtml/zenburnesque.render

@@ -67,7 +67,7 @@ tags:
 - begin: <span class="FunctionName">
   end: </span>
   selector: entity.name.function
-- begin: <span class="TypeName">
+- begin: <span class="TypeName1">
   end: </span>
   selector: storage.type.user-defined
 - begin: <span class="ClassTypeName">

data/syntax/antlr.syntax

@@ -5,14 +5,25 @@ fileTypes:
 scopeName: source.antlr
 repository: 
   nested-curly: 
+    name: source.embedded.java-or-c.antlr
+    captures: 
+      "0": 
+        name: punctuation.section.group.antlr
+    begin: \{
+    end: \}
     patterns: 
-    - captures: 
-        "0": 
-          name: punctuation.section.group.antlr
-      begin: \{
-      end: \}
-      patterns: 
-      - include: "#nested-curly"
+    - name: keyword.control.java-or-c
+      match: \b(break|case|continue|default|do|else|for|goto|if|_Pragma|return|switch|while)\b
+    - name: storage.type.java-or-c
+      match: \b(asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\b
+    - name: storage.modifier.java-or-c
+      match: \b(const|extern|register|restrict|static|volatile|inline)\b
+    - name: constant.language.java-or-c
+      match: \b(NULL|true|false|TRUE|FALSE)\b
+    - name: keyword.operator.sizeof.java-or-c
+      match: \b(sizeof)\b
+    - name: constant.numeric.java-or-c
+      match: \b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f|ll|LL|ull|ULL)?\b
     - name: string.quoted.double.java-or-c
       endCaptures: 
         "0": 
@@ -39,6 +50,7 @@ repository:
         match: \\.
     - name: support.constant.eof-char.antlr
       match: \bEOF_CHAR\b
+    - include: "#comments"
   comments: 
     patterns: 
     - name: comment.block.antlr
@@ -104,25 +116,36 @@ patterns:
       match: \b(k|charVocabulary|filter|greedy|paraphrase|exportVocab|buildAST|defaultErrorHandler|language|namespace|namespaceStd|namespaceAntlr|genHashLines)\b
     - name: constant.language.boolean.antlr
       match: \b(true|false)\b
-- name: keyword.control.label.antlr
-  match: ^\w+\s*(:|\s*$)
+- name: meta.definition.class.antlr
+  captures: 
+    "1": 
+      name: storage.type.antlr
+    "2": 
+      name: entity.name.type.class.antlr
+  begin: ^(class)\b\s+(\w+)
+  end: ;
+  patterns: 
+  - name: meta.definition.class.extends.antlr
+    captures: 
+      "1": 
+        name: storage.modifier.antlr
+    begin: \b(extends)\b\s+
+    end: (?=;)
+    patterns: 
+    - name: support.class.antlr
+      match: \b(Parser|Lexer|TreeWalker)\b
+- name: storage.modifier.antlr
+  match: ^protected\b
+- name: entity.name.type.token.antlr
+  match: ^[[:upper:]_][[:upper:][:digit:]_]*\b
+- name: meta.rule.antlr
+  captures: 
+    "1": 
+      name: entity.name.function.rule.antlr
+    "2": 
+      name: keyword.control.antlr
+  match: ^(\w+)(?:\s+(returns\b))?
 - name: constant.other.token.antlr
   match: \b[[:upper:]_][[:upper:][:digit:]_]*\b
-- name: source.embedded.java-or-c.antlr
-  endCaptures: 
-    "0": 
-      name: punctuation.section.embedded.end.antlr
-  begin: \{
-  beginCaptures: 
-    "0": 
-      name: punctuation.section.embedded.begin.antlr
-  end: \}
-  patterns: 
-  - include: "#nested-curly"
-- name: storage.type.class.antlr
-  match: \bclass\b
-- name: storage.modifier.extends.antlr
-  match: \bextends\b
-- name: support.class.antlr
-  match: \b(Parser|Lexer|TreeWalker)\b
+- include: "#nested-curly"
 keyEquivalent: ^~A

data/syntax/apache.syntax

@@ -27,6 +27,21 @@ patterns:
     "1": 
       name: punctuation.definition.comment.apache-config
   match: (#).*$\n?
+- name: meta.tag.any.html
+  captures: 
+    "6": 
+      name: punctuation.definition.tag.apache-config
+    "1": 
+      name: punctuation.definition.tag.apache-config
+    "2": 
+      name: entity.name.tag.apache-config
+    "3": 
+      name: punctuation.definition.tag.apache-config
+    "4": 
+      name: meta.scope.between-tag-pair.apache-config
+    "5": 
+      name: entity.name.tag.apache-config
+  match: ^[ ]*(<)([a-zA-Z0-9:]+)[^>]*(>(<)/)(\2)(>)
 - name: meta.vhost.apache-config
   endCaptures: 
     "1": 
@@ -71,7 +86,7 @@ patterns:
     "3": 
       name: entity.name.tag.apache-config
     "4": 
-      name: meta.toc-list.virtual-host.apache-config
+      name: meta.toc-list.directory.apache-config
     "5": 
       name: punctuation.definition.tag.apache-config
   end: ^[ ]*((</)(Directory(?:Match)?)[^>]*(>))
@@ -96,7 +111,7 @@ patterns:
     "3": 
       name: entity.name.tag.apache-config
     "4": 
-      name: meta.toc-list.virtual-host.apache-config
+      name: meta.toc-list.location.apache-config
     "5": 
       name: punctuation.definition.tag.apache-config
   end: ^[ ]*((</)(Location(?:Match)?)[^>]*(>))