autocolors 0.0.1 → 0.0.2

data/Rakefile

@@ -57,3 +57,198 @@ task :default => :test
 
 require 'yard'
 YARD::Rake::YardocTask.new
+
+
+
+langs = {#'ActionScript'  =>['as'],
+         'C'             =>['c','h'],
+         'C#'            =>['cs'],
+         'C++'           =>['cpp','hpp'],
+         'Common Lisp'   =>['lisp'],
+         ###'CSS'           =>['css'],
+         'Emacs Lisp'    =>['el'],
+         'Erlang'        =>['erl','hrl'],
+         'Haxe'          =>['hx'],
+         'Haskell'       =>['hs'],
+         ###'HTML'          =>['html'],
+         'Java'          =>['java'],
+         'JavaScript'    =>['js'],
+         'Lua'           =>['lua'],
+         'Objective-C'   =>['m','h'],
+         'Perl'          =>['pl'],
+         'PHP'           =>['php'],
+         'Python'        =>['py'],
+         'Ruby'          =>['rb'],
+         'Scala'         =>['scala'],
+         'Scheme'        =>['scm','ss'],
+         'Shell'         =>['sh']
+         ###'XML'           =>['xml']
+}
+
+
+def friendlyname(str)
+  str.downcase.gsub('#','-sharp').gsub(/\s+/,'_').gsub(/[^a-zA-Z0-9+_-]/,'')
+end
+
+namespace :samples do
+  require 'pp'
+  desc 'Generate html syntax highlighting samples for pieces of popular opensource'
+  task :generate => [:update_repositories, :generate_colorschemes, :generate_html]
+
+  $sample_files = {}
+  task :update_repositories do
+    require 'json'
+    require 'uri'
+    currentd = Dir.pwd
+    mkdir_p './.samples/repos'
+    Dir.chdir './.samples/repos'
+    langs.each do |lang, extensions|
+      puts "\n\n=== Checking popular repositories for:  #{lang} ==="
+      popular = `curl --retry 4 'https://github.com/languages/#{URI.escape(lang)}'`[/Most Forked This Month.*?<\/div>/mui]
+      repos = popular.scan /href="\/([^\/"]+)\/([^"\/]+)"/
+      search_paths = []
+      repos.each do |user, repo|
+        puts "--- #{user} / #{repo} ---"
+        unless File.exists? "#{user}/#{repo}"
+          puts ''
+          info = JSON.parse `curl --retry 2 'https://api.github.com/repos/#{user}/#{repo}'`
+          unless info['clone_url'].nil?
+            mkdir_p "#{user}"
+            `git clone --depth 1 '#{info['clone_url']}' '#{user}/#{repo}'`
+          end
+        end
+        search_paths << "'./#{user}/#{repo}'"
+      end
+      extensions.each do |ext|
+        cmd = "find -x -f #{search_paths.join(' ')} -iregex '.*\\.#{ext}' -type f -size 4"
+        candidate_files = `#{cmd}`.split("\n").map{|fn|fn.strip}
+        randf = candidate_files[rand(candidate_files.size)]
+        unless randf.nil? or randf == ''
+          git_path = randf.split '/'
+          git_path.shift if git_path[0] == '.'
+          user = git_path.shift
+          repo = git_path.shift
+          lang = lang + ' (2)' if $sample_files.has_key? lang
+          $sample_files[lang] = ["https://github.com/#{user}/#{repo}/tree/master/#{git_path.join('/')}", File.expand_path(randf)]
+        end
+      end
+    end
+    pp $sample_files
+    Dir.chdir currentd
+  end
+
+  $sample_colorschemes = []
+  task :generate_colorschemes do
+    currentd = Dir.pwd
+    mkdir_p './.samples/vim/colors'
+    Dir.chdir './.samples/vim/colors'
+    `rm * 2>/dev/null`
+    (1..25).each{ `/bin/bash -c '../../../bin/autocolors'` }
+    $sample_colorschemes = `ls *.vim`.strip.split(/\s+/).map{|c| c.strip[0..-5]}
+    pp $sample_colorschemes
+    Dir.chdir currentd
+  end
+
+  task :generate_html do
+    vimrc = '../../.helper-vimrc'
+    currentd = Dir.pwd
+    mkdir_p  './.samples/html'
+    Dir.chdir './.samples/html'
+    `rm *.html *.pre`
+    prefiles = []
+    $sample_files.each do |lang, locs|
+      gh_loc, f_loc = locs
+      $sample_colorschemes.each do |cs|
+        ['dark','light'].each do |bg|
+          dest_fname = "./#{cs}-#{friendlyname(lang)}-#{bg}.html"
+          precmds  = ["set runtimepath+=../../.samples/vim/",
+                      "set background=#{bg}",
+                      "colorscheme #{cs}"]
+          postcmds = ["TOhtml",
+                      "w #{dest_fname}.pre",
+                      "qa!"]
+          precmds = precmds.map{|c| "--cmd '#{c}'"}.join(' ')
+          postcmds = postcmds.map{|c| "-c '#{c}'"}.join(' ')
+          cmd = "gvim -i NONE -f -n -g -b -N --noplugin #{precmds} -u '#{vimrc}' '#{f_loc}' #{postcmds}"
+          `#{cmd}`
+          prefiles << ["#{dest_fname}.pre", gh_loc, bg, cs]
+
+        end
+      end
+    end
+    prefiles.each do |destf, gh_loc, bg, cs|
+      txt = IO.read(destf)
+      bg_base = '#333'
+      fg_base = '#777'
+      if txt =~ /<body\s*bgcolor="([^"]+)"\s*text="([^"]+)"/
+        bg_base = $1
+        fg_base = $2
+      end
+
+      txt = txt[/<font face.*?<\/font>\s*<\/body>/mui]
+      header = <<-HTML
+        <div class="sample #{bg}" style="background-color: #{bg_base}; color: #{fg_base};">
+          <div class="colorscheme-name">#{cs}/#{bg}</div>
+          <div class="filename">#{gh_loc}</div>
+          <div class="vim">
+      HTML
+      txt = txt.gsub(/\A<[^<]+/mui,header).gsub(/<\/font>\s*<\/body>.*/mui, '</div></div>')
+      File.open(destf[0..-5],'w+'){|f| f.write(txt)}
+      sh "rm #{destf}"
+    end
+    Dir.chdir currentd
+  end
+
+  desc 'Aggregate html samples in .samples/html and style them > quicktest.html'
+  task :combine_html do
+    start = <<-HTML
+      <html>
+      <head><title>Sample colorschemes</title>
+        <style type="text/css">
+          body {
+            background-color: #444;
+          }
+          span {
+            padding-left: 3px;
+          }
+          div.sample {
+            width: 390px;
+            height: 500px;
+            overflow: hidden;
+            border: 4px solid black;
+            margin: 5px;
+            float: left;
+            font-family: Consolas, Inconsolas, Monaco, monotype;
+            font-size: 8pt;
+            white-space: nowrap;
+          }
+          div.colorscheme-name {
+            font-family: sans-serif;
+            background-color: black;
+            color: #cdd;
+            text-decoration: underline;
+            font-size: 12pt;
+          }
+          div.filename {
+            font-family: sans-serif;
+            background-color: black;
+            color: #cdd;
+            font-size: 7pt;
+            padding-bottom: 4px;
+            border-bottom: 4px solid white;
+          }
+          div.vim {
+            height: 450px;
+            overflow: scroll;
+          }
+
+        </style>
+      </head>
+      <body>
+    HTML
+
+    File.open('quicktest.html','w+'){|f| f.write(start) }
+    sh 'ls .samples/html/*.html | grep -v actionscript | grep -v haxe | xargs cat >> quicktest.html'
+    File.open('quicktest.html','a'){|f| f.write("\n</body></html>")}
+  end
+end

data/TODO.md

@@ -0,0 +1,17 @@
+- [ ] A real good sample syntax/document with "common" densities for displaying full colorsheme - both standard and extended.
+- [ ] Autogenerate some vim examples in order to test colorschemes generally for iterating
+- [ ] Fix highlight color so it's more coherent
+- [ ] Fix TODO / etc. so they're more coherent
+- [~] Change mapping a bit so that one tick is very small variation, and more ticks increase but linearly, and use more ticks in most places.
+- [ ] Fix vim "~"-line background color so it's only very slightly different from normal background.
+- [ ] Heroku site for showing it off / generating them online
+- [ ] Indicate frequency and average sizes in mapping - for use in constraints
+- [ ] Constraints - make sure certain groups/mappings end up with colors that are far enough apart, or not too far apart, etc. etc. After first pass colors, modify according to constraints until it's stable.
+- [ ] Fix translation to 256-colorspace
+- [ ] Fix translation to 16-colorspace
+- [ ] Fix overall mapping structure heirarchy
+- [ ] Finish out all vim (esp. ui at this point) groups
+- [ ] Fix commandline interface so it is standard and good
+- [ ] Integrate with http://bashish.sourceforge.net/ ?
+- [ ] Blog entry
+- [ ] Announce

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/autocolors.gemspec

@@ -4,15 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{autocolors}
-  s.version = "0.0.1"
+  s.name = "autocolors"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joseph Wecker"]
-  s.date = %q{2011-09-13}
-  s.default_executable = %q{autocolors}
-  s.description = %q{Inspired by solarized, and lots of work with various colorschemes and syntax highlight files, and driven by a need to have some color variety that doesn't stink. Tries to generate colorschemes with just the right contrast, variety, and coherence.}
-  s.email = %q{joseph.wecker@gmail.com}
+  s.date = "2011-09-20"
+  s.description = "Inspired by solarized, and lots of work with various colorschemes and syntax highlight files, and driven by a need to have some color variety that doesn't stink. Tries to generate colorschemes with just the right contrast, variety, and coherence."
+  s.email = "joseph.wecker@gmail.com"
   s.executables = ["autocolors"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -21,18 +20,53 @@ Gem::Specification.new do |s|
   s.files = [
     ".attic/colors.rb",
     ".attic/colorscheme.rb",
+    ".attic/format-samples/1/Sweyla866607.css",
+    ".attic/format-samples/1/Sweyla866607.tmTheme",
+    ".attic/format-samples/1/Sweyla866607.txt",
+    ".attic/format-samples/1/sweyla866607.el",
+    ".attic/format-samples/1/sweyla866607.vim",
     ".attic/labtest.rb",
     ".attic/sw2.erb",
     ".attic/swatch.erb",
     ".attic/swatch3.erb",
     ".attic/test_swatch.rb",
     ".attic/test_swatch2.rb",
+    ".helper-vimrc",
+    ".samples/vim/colors/aphakia.vim",
+    ".samples/vim/colors/ascian.vim",
+    ".samples/vim/colors/bolognese.vim",
+    ".samples/vim/colors/breeze.vim",
+    ".samples/vim/colors/celemin.vim",
+    ".samples/vim/colors/coquilla.vim",
+    ".samples/vim/colors/filasse.vim",
+    ".samples/vim/colors/gradable.vim",
+    ".samples/vim/colors/harbinger.vim",
+    ".samples/vim/colors/kashima.vim",
+    ".samples/vim/colors/knockdown.vim",
+    ".samples/vim/colors/manful.vim",
+    ".samples/vim/colors/maximal.vim",
+    ".samples/vim/colors/periclase.vim",
+    ".samples/vim/colors/poesis.vim",
+    ".samples/vim/colors/proton.vim",
+    ".samples/vim/colors/recedence.vim",
+    ".samples/vim/colors/scram.vim",
+    ".samples/vim/colors/server.vim",
+    ".samples/vim/colors/shrubbish.vim",
+    ".samples/vim/colors/sultam.vim",
+    ".samples/vim/colors/virtuoso.vim",
+    ".samples/vim/colors/wherrit.vim",
+    ".samples/vim/colors/winsome.vim",
+    ".samples/vim/colors/wirelike.vim",
+    ".samples/vim/syntax/actionscript.vim",
+    ".samples/vim/syntax/erlang.vim",
+    ".samples/vim/syntax/haxe.vim",
     ".yardopts",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
+    "TODO.md",
     "VERSION",
     "analysis/textmate/textmate-in-the-wild.txt",
     "analysis/vim/analyze-commonly-colored.sh",
@@ -43,11 +77,6 @@ Gem::Specification.new do |s|
     "analysis/vim/statements.list",
     "autocolors.gemspec",
     "bin/autocolors",
-    "format-samples/1/Sweyla866607.css",
-    "format-samples/1/Sweyla866607.tmTheme",
-    "format-samples/1/Sweyla866607.txt",
-    "format-samples/1/sweyla866607.el",
-    "format-samples/1/sweyla866607.vim",
     "lib/VERSION",
     "lib/autocolors.rb",
     "lib/autocolors/color.rb",
@@ -57,21 +86,16 @@ Gem::Specification.new do |s|
     "lib/autocolors/mapping.udon",
     "lib/autocolors/templates/colorscheme.erb.vim",
     "notes",
-    "sample-output/canister.vim",
-    "sample-output/chalazal.vim",
-    "sample-output/hello_hello.vim",
-    "sample-output/singsong.vim",
-    "sample-output/unflorid.vim",
-    "sample-output/upbind.vim",
+    "quicktest.html",
     "test/helper.rb",
     "test/swatch.erb",
     "test/test_autocolors.rb"
   ]
-  s.homepage = %q{http://github.com/josephwecker/autocolors}
+  s.homepage = "http://github.com/josephwecker/autocolors"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Automatically generates colorschemes (mostly for editors).}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Automatically generates colorschemes (mostly for editors)."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/bin/autocolors

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
 require 'rubygems'
+libdir = File.join(File.dirname(__FILE__), '..', 'lib')
+if File.exists?(File.join(libdir,'autocolors.rb'))
+  $LOAD_PATH.unshift(libdir)
+end
 require 'autocolors'
 
 colorfile = AutoColors::generate_vim_colors(ARGV[0])

data/lib/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/autocolors/colorscheme.rb

@@ -15,15 +15,16 @@ module AutoColors
     end
 
     def generate
-      bc = nrand(-1,2,-4,5)
+      bc = nrand(-1.0,1.5,-4.0,5.5)
       sat = rand * 2.0
       @contrast = bc    # Value between -4.0 and 5.0 used to contract/spread out intensity values
       @saturation = sat # Value between 0.0 and 2.0 used to contract/intensify color values
 
-      @intensity = [00-(bc*3), 20-(bc*2), 45-bc, 50, 60, 65+bc, 90+(bc*2), 110+(bc*3)]
-      @fcolor = [0.0, 0.1*sat, 0.2*sat, 0.4*sat, 0.8*sat, 1.6*sat, 3.2*sat, 6.4*sat]
+      #@intensity = [0.0-(bc*3.0), 20.0-(bc*2.0), 45.0-bc, 50.0, 60.0, 65.0+bc, 90.0+(bc*2.0), 110.0+(bc*3.0)]
+      @intensity = [[3.0 - (bc*3.0),0].max, 20.0-(bc*2.0), 45.0-bc, 50.0, 60.0, 65.0+bc, 90.0+(bc*2.0), 110.0+(bc*3.0)]
+      @fcolor = [0.0, 0.1*sat, 0.5*sat, 1.0*sat, 1.5*sat, 2.0*sat, 2.5*sat, 3.0*sat]
 
-      @base_colors = (1..10).map{|i| [nrand(0.0, 100.0, -120.0, 120.0), nrand(0.0,100.0,-120.0,120.0), 1]}
+      @base_colors = (1..10).map{|i| [nrand(0.0, 70.0, -120.0, 120.0), nrand(0.0,70.0,-120.0,120.0), 1]}
       do_concrete_mapping
     end
 
@@ -41,10 +42,10 @@ module AutoColors
         ddat = entry.data.dup
         fg_a, fg_b, _ = @base_colors[ldat[:fg_idx]]
         bg_a, bg_b, _ = @base_colors[ldat[:bg_idx]]
-        ldat[:fg] = lab(light_i(ldat[:fg_intensity]), ldat[:fg_saturation], fg_a, fg_b)
-        ldat[:bg] = lab(light_i(ldat[:bg_intensity]), ldat[:bg_saturation], bg_a, bg_b)
-        ddat[:fg] = lab( dark_i(ldat[:fg_intensity]), ldat[:fg_saturation], fg_a, fg_b)
-        ddat[:bg] = lab( dark_i(ldat[:bg_intensity]), ldat[:bg_saturation], bg_a, bg_b)
+        ldat[:fg] = lab(light_i(ldat[:fg_intensity]), light_s(ldat[:fg_saturation]), fg_a, fg_b)
+        ldat[:bg] = lab(light_i(ldat[:bg_intensity]), light_s(ldat[:bg_saturation]), bg_a, bg_b)
+        ddat[:fg] = lab( dark_i(ldat[:fg_intensity]),  dark_s(ldat[:fg_saturation]), fg_a, fg_b)
+        ddat[:bg] = lab( dark_i(ldat[:bg_intensity]),  dark_s(ldat[:bg_saturation]), bg_a, bg_b)
         @dark[name] = ddat
         @light[name] = ldat
       end
@@ -81,29 +82,31 @@ module AutoColors
       c_plus   = entry.data[k].count('+')
       c_minus  = entry.data[k].count('-')
       c_neut   = entry.data[k].count('~')
+      val = 0
       if c_parent == 0
-        entry.data[k] = 3 - c_minus + c_plus
+        val = 3 - c_minus + c_plus
       else
         concrete_lvl(entry.parent, k)
         offset = entry.parent.data[k]
-        entry.data[k] = offset + c_plus - c_minus
+        val = offset + c_plus - c_minus
       end
+      entry.data[k] = [[val,7].min,0].max
     end
 
     def concrete_style(entry)
       entry.data[:styles] = 'NONE'
     end
 
-    def dark_i(idx) idx end
-    def light_i(idx) 7 - idx end
+    def dark_i(idx) @intensity[idx] end
+    def light_i(idx) @intensity[7 - idx] - 0.005  end
+    def dark_s(idx) @fcolor[idx] end
+    def light_s(idx) @fcolor[idx] + 0.01 end
   
-    def lab(intensity, saturation, a, b)
-      Color.new([@intensity[intensity], a * @fcolor[saturation], b * @fcolor[saturation]])
-    end
+    def lab(intensity,saturation,a,b) Color.new([intensity, a * saturation, b * saturation]) end
 
     def new_color(base_idx, diff_level, depth)
       a,b,count = @base_colors[base_idx]
-      base_diff = (diff_level.to_f + 1.0) * 10.0 / ((depth.to_f + 1.0) / 2.0) * count.to_f
+      base_diff = (diff_level.to_f + 1.0) * 4.0 / ((depth.to_f + 1.0) / 2.0) * count.to_f
       a_dir = rand(2) == 1 ? -1.0 : 1.0
       b_dir = rand(2) == 1 ? -1.0 : 1.0
       a_p = a + (base_diff * a_dir)

data/lib/autocolors/mapping.udon

@@ -4,12 +4,13 @@
 | ignore                     | 1  | --- | --  | 1  | --- | --  | V      | Ignore           | markup.ignore *                    | invisible *     | ?
 
 
-| text                       | 1  | ++  | ~   | 1  | --- | --  | N      | Normal           | markup                             | g *             | font-face??
+| text                       | 1  | ++  | -   | 1  | --- | --  | N      | Normal           | markup                             | g *             | font-face??
 | text.whitespace            | <  | <   | <   | <' | <-  | <-  | N      | Whitespace       | markup.whitespace *                | w               | ?
 | text.deleted               | <' | --  | <-  | <  | <   | <   | X      | TextDeleted      | markup.deleted *                   | gd              | ?
 | text.inserted              | <' | <+  | <+  | <  | <   | <   | N      | TextInserted     | markup.inserted *                  | gi              | ?
 | text.emphasis              | <  | <   | <   | <  | <   | <   | I      | TextEmphasis     | markup.italic                      | ge              | ?
 | text.strong                | <  | <   | <   | <  | <   | <   | B      | TextStrong       | markup.bold                        | gs              | ?
+| text.title                 | <' | <   | <   | <  | <   | <   | U'     | Title            | ?????                              | ??????          | ???????
 | text.heading               | <' | <+  | <+  | <  | <   | <   | U'I'B' | TextHeading      | markup.heading                     | gh              | ?
 | text.subheading            | <' | <+  | <   | <  | <   | <   | U'I'B' | TextSubheading   | markup.heading.2                   | gu              | ?
 | text.output                | <' | <   | <   | <  | <   | <   | N      | TextOutput       | markup.output *                    | go              | ?
@@ -27,7 +28,7 @@
 
 
 | lit                        | 2  | ++  | ~   | 1  | --- | --  | N      | ?                | ?                                  | ?               | ?
-| lit.string                 | <' | <   | <   | <  | <   | <   | N      | String           | string                             | s               | string-face
+| lit.string                 | <''| <   | <   | <  | <   | <   | N      | String           | string                             | s               | string-face
 | lit.string.heredoc         | <' | <   | <   | <  | <   | <   | N      | ?                | string.unquoted                    | sh              | ? 
 | lit.string.quoted          | <' | <   | <   | <  | <   | <   | N      | ?                | string.quoted                      | sx              | ? 
 | lit.string.quoted.double   | <' | <   | <   | <  | <   | <   | N      | ?                | string.quoted.double               | s2              | ? 
@@ -35,31 +36,31 @@
 | lit.string.quoted.backtick | <' | <   | <   | <  | <   | <   | N      | ?                | string.quoted.backtick *           | sb              | ? 
 | lit.string.interpolated    | <' | <   | <   | <  | <-  | <+  | N      | ?                | string.interpolated                | si              | ? 
 | lit.string.regexp          | <' | <   | <   | <  | <   | <   | N      | ?                | string.regexp                      | sr              | ? 
-| lit.string.char            | <' | <   | <   | <  | <   | <   | N      | Character        | constant.character                 | sc              | ? 
+| lit.string.char            | <''| <   | <   | <  | <   | <   | N      | Character        | constant.character                 | sc              | ? 
 | lit.string.char.esc        | 2' | <   | <+  | <  | <   | <   | U'     | SpecialChar      | constant.character.escape          | se              | ?
 | lit.string.char.esc.unicode| <' | <   | <   | <  | <   | <   | U'     | ?                | constant.character.escape.unicode *| ?               | ?
 | lit.string.char.esc.hex    | <' | <   | <   | <  | <   | <   | U'     | ?                | constant.character.escape.hex *    | ?               | ?
 | lit.string.char.esc.oct    | <' | <   | <   | <  | <   | <   | U'     | ?                | constant.character.escape.oct *    | ?               | ?
 
 | lit.number                 | 3  | ++  | ~   | 1  | --- | --  | N      | Number           | constant.numeric                   | m               | ?
-| lit.number.int             | <' | <   | <   | <  | <   | <   | N      | ?                | constant.numeric.integer *         | mi              | ?
+| lit.number.int             | <''| <   | <   | <  | <   | <   | N      | ?                | constant.numeric.integer *         | mi              | ?
 #| lit.number.int.hex         | <' | <   | <   | <  | <   | <   | N      | ?                | constant.numeric.integer
 #| lit.number.int.oct         | <' | <   | <   | <  | <   | <   | N      | ?                |
 #| lit.number.int.binary
 | lit.number.int.long        | <' | <   | <   | <  | <   | <   | N      | ?                | constant.numeric.integer.long *    | il              | ?
 | lit.number.float           | <' | <   | <   | <  | <   | <   | N      | Float            | constant.numeric.float *           | mf              | ?
 
-| lit.boolean                | 3' | ++  | ~   | 1  | --- | --  | N      | Boolean          | ???? | ???? | ????
-| lit.constant               | 3' | ++  | -   | 1  | --- | --  | N      | Constant         | ???? | ???? | ????
+| lit.boolean                | 3''| ++  | ~   | 1  | --- | --  | N      | Boolean          | ???? | ???? | ????
+| lit.constant               | 3''| ++  | -   | 1  | --- | --  | N      | Constant         | ???? | ???? | ????
 
 | variable                   | 4  | ++  | ~   | 1  | --- | --  | N      | Identifier       | ???? | ???? | ????
-| function                   | 4' | ++  | ~   | 1  | --- | --  | N      | Function         | ???? | ???? | ????
+| function                   | 4''| ++  | ~   | 1  | --- | --  | N      | Function         | ???? | ???? | ????
 | statement                  | 5  | ++  | ~   | 1  | --- | --  | N      | Statement        | ???? | ???? | ????
-| statement.conditional      | <' | <   | <   | <  | <   | <   | N      | Conditional      | ???? | ???? | ????
-| statement.repeat           | <' | <   | <   | <  | <   | <   | N      | Repeat           | ???? | ???? | ????
-| statement.label            | <' | <   | <   | <  | <   | <   | U'     | Label            | ???? | ???? | ????
-| statement.operator         | <' | <   | <   | <  | <   | <   | N      | Operator         | ???? | ???? | ????
-| statement.keyword          | <' | <   | <   | <  | <   | <   | N      | Keyword          | ???? | ???? | ????
+| statement.conditional      | <''| <   | <   | <  | <   | <   | N      | Conditional      | ???? | ???? | ????
+| statement.repeat           | <''| <   | <   | <  | <   | <   | N      | Repeat           | ???? | ???? | ????
+| statement.label            | <''| <   | <   | <  | <   | <   | U'     | Label            | ???? | ???? | ????
+| statement.operator         | <''| <   | <   | <  | <   | <   | N      | Operator         | ???? | ???? | ????
+| statement.keyword          | <''| <   | <   | <  | <   | <   | N      | Keyword          | ???? | ???? | ????
 
 | control.exception          | 6  | ++  | ~   | 1  | ++  | +   | N      | Exception        | ???? | ???? | ????
 
@@ -71,9 +72,9 @@
 #| preproc.shebang            | 
 
 | type                       | 8  | ++  | ~   | 1  | --- | --  | N      | Type             | ???? | ???? | ????
-| type.storageclass          | <' | <   | <   | <  | <   | <   | N      | StorageClass     | ???? | ???? | ????
-| type.structure             | <' | <   | <   | <  | <   | <   | N      | Structure        | ???? | ???? | ????
-| type.typedef               | <' | <   | <   | <  | <   | <   | N      | Typedef          | ???? | ???? | ????
+| type.storageclass          | <''| <   | <   | <  | <   | <   | N      | StorageClass     | ???? | ???? | ????
+| type.structure             | <''| <   | <   | <  | <   | <   | N      | Structure        | ???? | ???? | ????
+| type.typedef               | <''| <   | <   | <  | <   | <   | N      | Typedef          | ???? | ???? | ????
 
 
 | delimiter                  | 9  | -   | --  | 1  | --- | --  | N      | Delimiter        | ???? | ???? | ????
@@ -89,7 +90,7 @@
 
 | ui                         | 1  | ++  | ~   | 1  | --- | --  | N      | ?                | ???? | ???? | ????
 | ui.linenumbers             | 1  | ~   | --  | 1  | --- | --- | N      | LineNR           | ???? | ???? | ????
-| ui.visual                  | 1' | ++  | ~   | 1' | --  | -   | N      | Visual           | ???? | ???? | ????
+| ui.visual                  | 1  | +++ | +   | 1  | -   | -   | N      | Visual           | ???? | ???? | ????
 
 
 # Special