ver 2009.12.14 → 2010.02

data/ROADMAP.textile

@@ -0,0 +1,187 @@
+h1. VER Roadmap
+
+This roadmap is not sorted in order of importance, it's more like a verbose
+todo- and wish-list.
+
+Features should be removed once they are implemented.
+
+If you have any non-trivial bugs or ideas, add them here.
+
+h2. Sessions
+
+Storing the current state of VER on disk for next startup.
+Right now we (re)store the filenames of open views, the position of the insert
+mark, and any bookmarks.
+Modes are not stored, as they could cause very tricky bugs.
+However, that shouldn't be a big problem for most people, i hope.
+Please suggest other things we can persist.
+
+h2. VCS integration
+
+Mostly shortcuts for various source control systems.
+These could simply open a terminal and execute a command.
+Example can be the git plugin.
+
+h2. org-mode / remember
+
+Something to get things done and be reminded of them.
+
+h2. Code folding
+
+Exapnd sections of code, we can start out by the folding rules specified by the
+tm bundle preferences.
+Eventually this would be useful for other things like Viki.
+
+h2. Notebook tabs
+
+Using ttk::notebook we could implement tabs instead of the tiling view, or
+combine the two.
+
+We did that, but that's not very useful without the ability to see more than one
+tab at a time.
+Next idea is to have a layout that provides a list of notebooks and assigns a
+view to one of them based on some heuristic.
+Then we can wrap all of that into a tiling layout.
+Keybindings for that should be fun... we can use awesome as reference.
+
+h2. Markdown
+
+The current tm syntax simply doesn't compile to a clean oniguruma regexp, try to
+fix it.
+
+h2. Dictionary
+
+Looking up dictionaries... translation.
+Maybe using something like google translate API when online?
+
+h2. Support mirror and mirror transformation for snippets
+
+The most powerful snipets are using mirror and mirror transformations.
+In order to provide full support, we need to implement that.
+
+h2. Improve integration of scope selectors and bundles
+
+Right now we are doing a very simple matching of scope selectors, just to get
+things started.
+I'd like to improve on that by applying correct precedence for matching scopes.
+
+h2. Improve integration of Bundles
+
+Allowing bundles to bind keychains to commands.
+Might be problematic, as the keychains are specific for the TM environment, so
+it's very OSX specific and will conflict with e.g. emacs or vim keymaps.
+
+Maybe we need a separate TM keymap and define a common prefix to the keychains
+in other keymaps.
+
+h2. Update keymaps
+
+All the keymaps (apart from vim) need to be fixed to match current major/minor
+mode structure.
+
+h2. Move queries to the global VER status
+
+The current text status should be more flexible than a simple Entry and it can
+be confusing to be asked for entry in different locations.
+By doing this, we can insert custom widgets into the text status.
+Both vim and emacs do it this way, and it seems to work fine.
+
+h2. Add specs
+
+We should add specs for as many things as possible.
+
+h2. Help system
+
+Using YARD, we could nicely present documentation for every constant and method
+with intelligent linking between them.
+
+bc.. # a short example of how to access YARD docs.
+require 'yard'
+YARD::Registry.load_yardoc
+YARD::Registry.at('VER').docstring
+# "This is the doc for VER"
+
+p. Of course we need to make browsing better than the current HTML browsers.
+
+h2. Equivalent to vim : or emacs M-x
+
+Executor is fun, but it's not powerful enough yet.
+We have <Alt-x> bound to a simple eval query right now, which is also nice, but
+not helping much if you have no idea what to eval.
+So what we need, is a mix of Executor::Method and eval, which is quite a
+challenge.
+What we could do, is go through all the Action instances of the major and minor
+modes for the buffer and make completion based on this.
+I have no idea how that would be best presented, but in the worst case we can
+rip something off.
+
+I also really like the way emacs does the fast-forward completion in a
+not-too-annoying way, that's going to be another tough challenge.
+
+h2. Power to the Modes
+
+Major and minor modes are working out well, they are precise and fast, but still
+lack some power over the buffer outside of events fired by the user.
+It would be nice, for example, to have a minor mode that can act like a wiki
+templating engine, which is needed for org-mode.
+It needs to elide some text, inserting other text instead of that, and keep
+everything sane at the same time, making sure that the right version of the
+buffer is stored to a file can also be tricky...
+
+h2. Dired alike
+
+One common task I always go to the terminal for is creating directories,
+renaming or moving files around, it would be both useful and a testament to the
+power of VER to implement a dired alike.
+I'm still hoping that some day we can get that Finder from lianj, but it's just
+not the same.
+
+h2. Simulatanous file overwrite protection
+
+When two instances of VER edit the same file, there is no mechanism to detect
+that fact.
+This can cause serious problems that VER should be able to handle.
+Emacs protects against it by creating a symlink that points to the emacs
+instance that has the file open.
+
+A link looks like this:
+`lrwxrwxrwx 1 manveru users 36 Jan 30 02:28 .#AUTHORS -> manveru@delta.local.28003:1264265541`
+
+When another instance opens the same file, it can check the symlink and knows
+who's editing.
+It may then replace the symlink to "steal" ownership, ignore the lock, or forbid
+modification.
+
+Another safeguard is to check the file mtime when opening, and see whether it's
+still the same before writing the file to disk again.
+This allows for a small race-condition, but it's still vastly better than
+no protection at all.
+
+h2. A major mode per bundle
+
+Right now, a major mode is a compilation of minor modes plus a keymap of its own.
+What we would like is a major mode that takes responsibility of the
+syntax/snippets/preferences (bundle) being used.
+The hard part about this is that we would have to know which major mode name is
+associated with a bundle.
+We face a bit of a bootstrapping problem, for emacs this is no issue, as lots
+of code monkeys wrote lots of major modes for their favorite languages.
+We don't have that benefit, all we have is a bunch of bundles from TM that we
+can scavange.
+We could create our own kind of Bundle format.
+
+config/bundles/Ruby
+config/bundles/Ruby/keymaps/vim.rb
+config/bundles/Ruby/syntax.rb
+config/bundles/Ruby/preferences.rb
+config/bundles/Ruby/snippets.rb
+
+this way, to share a bundle you can simply tar up the folder and put it somewhere.
+This also makes it easier to keep bundles outside of the VER folder structure,
+in another git repo, for example, and just point VER to that location.
+
+Text => .syntax
+Text => .preferences
+Text => .snippets
+
+WidgetMajorMode(widget, major) => MajorMode(name) => Ruby(Syntax, preferences, snippets)

data/Rakefile

@@ -4,14 +4,16 @@ require 'rake/gempackagetask'
 require 'time'
 require 'date'
 
-PROJECT_SPECS = Dir['spec/**/*.rb']
+PROJECT_SPECS = Dir['spec/ver/**/*.rb']
 PROJECT_MODULE = 'VER'
 PROJECT_README = 'README.textile'
 PROJECT_VERSION = ENV['VERSION'] || Date.today.strftime('%Y.%m.%d')
 
 DEPENDENCIES = {
-  'ffi-tk'       => {:version => '2009.12.14'},
-  'eventmachine' => {:version => '0.12.10'},
+  'ffi-tk'       => {:version => '2010.02'},
+}
+DEVELOPMENT_DEPENDENCIES = {
+  'bacon'        => {:version => '1.1.0'}
 }
 
 GEMSPEC = Gem::Specification.new{|s|
@@ -22,7 +24,7 @@ GEMSPEC = Gem::Specification.new{|s|
   s.email        = 'm.fellinger@gmail.com'
   s.homepage     = 'http://github.com/manveru/ver'
   s.platform     = Gem::Platform::RUBY
-  s.version      = (ENV['PROJECT_VERSION'] || Date.today.strftime("%Y.%m.%d"))
+  s.version      = PROJECT_VERSION
   s.files        = `git ls-files`.split("\n").sort
   s.has_rdoc     = true
   s.require_path = 'lib'

data/bin/ver

@@ -2,23 +2,12 @@
 
 require 'pathname'
 require 'optparse'
-
-# annoying fixes
-class Pathname
-  alias / join
-
-  def cp(dest)
-    FileUtils.copy_file(expand_path.to_s, dest.to_s, preserve = true)
-  end
-
-  def =~(regexp)
-    to_s =~ regexp
-  end
-end
+require 'shellwords'
 
 module VER
   file = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
   ROOT = File.expand_path('../../lib', file).encode(Encoding::UTF_8)
+  require File.join(ROOT, 'ver/vendor/pathname')
 
   module_function
 
@@ -30,61 +19,135 @@ module VER
     run(options)
   end
 
+  # Convert textmate bundles into ruby for use in VER.
+  #
+  # @param [String] path
+  #   points to the root directory, for example './Ruby.tmbundle'
   def install_tm_bundle(path)
     require File.join(ROOT, 'ver/plist')
-    require 'json'
+    require 'pp'
     require 'fileutils'
+    require 'shellwords'
 
+    install_tm_syntax(path)
+    install_tm_preferences(path)
+    install_tm_snippets(path)
+
+    exit 0
+  end
+
+  def install_tm_syntax(path)
     glob = File.expand_path('Syntaxes/*.{plist,tmLanguage}', path)
 
     Dir.glob(glob, File::FNM_CASEFOLD) do |syntax|
+      puts "Parsing #{syntax}" if $DEBUG
       plist = VER::Plist.parse_xml(syntax)
-      name = plist['name'].to_s.gsub(/[\/\u2014]/, '-')
-      puts "Installing #{name}"
-      target = File.expand_path("../config/syntax/#{name}.json", ROOT)
-      json = JSON.pretty_unparse(plist)
-      json.gsub!(/\\x\{(\h+)\}/, '\\\\x\1')
-
-      FileUtils.mkdir_p(File.dirname(target))
-      File.open(target, 'w+'){|io| io.write(json) }
+      name = plist[:name]
+
+      install_rb_source('Syntax', '../config/syntax', name, plist)
     end
+  end
 
+  def install_tm_preferences(path)
     info = Plist.parse_xml(File.join(path, 'info.plist'))
-    info_name = info['name']
+    name = info[:name]
 
     glob = File.expand_path('Preferences/*.{plist,tmPreferences}', path)
-    preferences = {}
+    preferences = []
 
     Dir.glob(glob, File::FNM_CASEFOLD) do |preference|
+      puts "Parsing #{preference}" if $DEBUG
       plist = Plist.parse_xml(preference)
-      name = plist['name'].to_s.gsub(/[\/\u2014]/, '-')
-      puts "Adding #{name}"
-      preferences[plist['uuid']] = plist
+      puts "Adding Preference: #{plist[:name]}" if $DEBUG
+      preferences << plist
     end
 
-    pref = File.expand_path("../config/preferences/#{info_name}.json", ROOT)
-    pref.gsub!(/[\/\u2014]/, '-')
-    FileUtils.mkdir_p(File.dirname(pref))
-    json = JSON.pretty_unparse(preferences)
-    puts "Writing to #{pref}"
-    File.open(pref, 'w+'){|io| io.write(json) }
+    install_rb_source('Preferences', '../config/preferences', name, preferences)
+  end
+
+  def install_tm_snippets(path)
+    info = Plist.parse_xml(File.join(path, 'info.plist'))
+    name = info[:name]
+
+    glob = File.expand_path('Snippets/*.{plist,tmSnippet}', path)
+    snippets = {}
+
+    Dir.glob(glob, File::FNM_CASEFOLD) do |snippet|
+      puts "Parsing #{snippet}" if $DEBUG
+      plist = Plist.parse_xml(snippet)
+      puts "Adding Snippet: #{plist[:name]}" if $DEBUG
+      snippets[plist[:tabTrigger]] = {
+        scope: plist[:scope],
+        name: plist[:name],
+        content: plist[:content],
+      }
+    end
 
+    install_rb_source('Snippets', '../config/snippets', name, snippets)
+  end
+
+  def install_tm_theme(path)
+    require File.join(ROOT, 'ver/plist')
+    require 'pp'
+    require 'fileutils'
+    require 'shellwords'
+
+    path = File.expand_path(path)
+    puts "Parsing #{path}" if $DEBUG
+    plist = Plist.parse_xml(path)
+
+    name = plist[:name]
+    install_rb_source('Theme', '../config/theme', name, plist)
+  ensure
     exit
   end
+
+  def install_rb_source(type, path, name, plist)
+    if plist.empty?
+      puts "#{type} - #{path} - #{name} -- not installing because of empty plist" if $DEBUG
+      return
+    end
+
+    filename = name.gsub(/[\/\u2014]/, '-')
+    target = File.expand_path("#{path}/#{filename}.rb", ROOT)
+
+    dirname = File.dirname(target)
+    FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+    content = plist.pretty_inspect
+
+    puts "Writing #{type} #{name} to #{target}" if $DEBUG
+    File.open(target, 'w+') do |io|
+      io.puts "# Encoding: UTF-8"
+      io.puts
+      io.puts(content)
+    end
+
+    escaped_target = target.shellescape
+    check = `ruby -c #{escaped_target}`
+    fail "#{target}: #{check}" unless $?.exitstatus == 0
+  end
 end
 
-options = { fork: true }
+options = {}
 
+$0 = "#{__FILE__} #{ARGV.join(' ')}"
 op = OptionParser.new{|o|
   o.on('-Eex[:in]', '--encoding EXTERNAL[:INTERNAL]', 'used encoding'){|enc|
     options[:encoding] = enc }
   o.on('--font FONT', 'font family'){|fn| options[:font] = fn }
-  o.on('-f', '--nofork', 'stay attached to terminal'){ options[:fork] = false }
+  o.on('--fork', 'detach from terminal on startup'){ options[:fork] = true }
+  o.on('-f', '--no-fork', 'stay attached to terminal'){ options[:fork] = false }
+  o.on('--eventmachine', "Use EventMachine"){ options[:eventmachine] = true }
+  o.on('--no-eventmachine', "Dont' use EventMachine"){ options[:eventmachine] = false }
   o.on('-k', '--keymap NAME', 'vim or emacs'){|k| options[:keymap] = k }
+  o.on('-s', '--session NAME', 'Keep session called NAME'){|s| options[:session] = s }
   o.separator ' '
   o.on('--install-tm-bundle PATH',
        'Install textmate bundle for use with VER',
        &VER.method(:install_tm_bundle))
+  o.on('--install-tm-theme PATH',
+       'Install textmate theme for use with VER',
+       &VER.method(:install_tm_theme))
   o.separator ' '
   o.on('-h', '--help', 'Show this help'){ puts o; exit }
   o.on('--debug', 'turn $DEBUG on'){ $DEBUG = true }

data/config/detect.rb

@@ -1,18 +1,18 @@
 # Encoding: UTF-8
 
 module VER::Syntax::Detector
-  exts "ANTLR", ["g"]
-  exts "ASP vb.NET", ["vb"]
-  exts "ASP", ["asa"]
   exts "ActionScript", ["as"]
   exts "Active4D Config", ["ini"]
   exts "Active4D Library", ["a4l"]
   exts "Ada", ["adb", "ads"]
   exts "Ant", ["ant.xml", "build.xml"]
   head "Ant", /<\!--\s*ant\s*-->/
+  exts "ANTLR", ["g"]
   exts "Apache", ["conf", "htaccess"]
   exts "AppleScript", ["applescript", "script editor"]
   head "AppleScript", /^#!.*(osascript)/
+  exts "ASP", ["asa"]
+  exts "ASP vb.NET", ["vb"]
   exts "BibTeX", ["bib"]
   exts "Bison", ["y"]
   exts "Blog - HTML", ["blog.html"]
@@ -23,14 +23,17 @@ module VER::Syntax::Detector
   head "Blog - Text", /^Type: Blog Post \(Text\)/
   exts "Blog - Textile", ["blog.textile"]
   head "Blog - Textile", /^Type: Blog Post \(Textile\)/
-  exts "C++", ["cc", "cpp", "cp", "cxx", "c++", "C", "h", "hh", "hpp", "h++"]
-  head "C++", /-\*- C\+\+ -\*-/
+  exts "Bulletin Board", ["bbcode"]
   exts "C", ["c", "h"]
   head "C", /-[*]-( Mode:)? C -[*]-/
+  exts "C++", ["cc", "cpp", "cp", "cxx", "c++", "C", "h", "hh", "hpp", "h++"]
+  head "C++", /-\*- C\+\+ -\*-/
+  head "C++ Qt", /-\*- C\+\+ -\*-/
   exts "CMake Listfile", ["CMakeLists.txt", "cmake"]
+  exts "ColdFusion", ["cfm", "cfml", "cfc"]
+  exts "Context Free", ["cfdg", "context free"]
   exts "CSS", ["css", "css.erb"]
   exts "CSV", ["csv"]
-  exts "ColdFusion", ["cfm", "cfml", "cfc"]
   exts "D", ["d", "di"]
   head "D", /^#!.*\bg?dmd\b./
   exts "Diff", ["diff", "patch"]
@@ -49,78 +52,96 @@ module VER::Syntax::Detector
   exts "Eiffel", ["e"]
   exts "Erlang", ["erl", "hrl"]
   exts "F-Script", ["fscript"]
-  exts "FXScript", ["fxscript"]
   exts "Fortran - Modern", ["f90", "F90", "f95", "F95", "f03", "F03", "f08", "F08"]
   head "Fortran - Modern", /(?i)-[*]- mode: f90 -[*]-/
   exts "Fortran - Punchcard", ["f", "F", "f77", "F77", "for", "FOR", "fpp", "FPP"]
-  exts "GTD", ["gtd"]
-  exts "GTDalt", ["gtd", "gtdlog"]
+  exts "FXScript", ["fxscript"]
   exts "Gettext", ["po", "potx"]
-  exts "Go", ["go"]
   exts "Graphviz (DOT)", ["dot", "DOT"]
   exts "Greasemonkey", ["user.js"]
   head "Greasemonkey", /\/\/ ==UserScript==/
   exts "Gri", ["gri"]
   head "Gri", /-[*]-( Mode:)? Gri -[*]-/
+  exts "GTD", ["gtd"]
+  exts "GTDalt", ["gtd", "gtdlog"]
+  exts "Haskell", ["hs"]
+  exts "HTML", ["html", "htm", "shtml", "xhtml", "phtml", "php", "inc", "tmpl", "tpl", "ctp"]
+  head "HTML", /<!DOCTYPE|<(?i:html)|<\?(?i:php)/
+  exts "HTML (Active4D)", ["a4d", "a4p"]
   exts "HTML (ASP)", ["asp"]
   exts "HTML (ASP.net)", ["aspx", "ascx"]
-  exts "HTML (Active4D)", ["a4d", "a4p"]
   exts "HTML (Erlang)", ["yaws"]
-  exts "HTML (Tcl)", ["adp", "inc"]
-  exts "HTML", ["html", "htm", "shtml", "xhtml", "phtml", "php", "inc", "tmpl", "tpl", "ctp"]
-  head "HTML", /<!DOCTYPE|<(?i:html)|<\?(?i:php)/
-  exts "Haskell", ["hs"]
+  exts "HTML (Mason)", ["mhtml", "autohandler", "dhandler", "md", "mc"]
+  exts "HTML (Rails)", ["rhtml", "erb", "html.erb"]
+  exts "HTML (Tcl)", ["tcl", "adp", "inc"]
+  exts "HTML (Template Toolkit)", ["tt"]
+  head "HTML (Template Toolkit)", /\[%.+?%\]/
+  exts "iCalendar", ["ics", "ifb"]
   exts "Inform", ["inf"]
   exts "Ini", ["ini", "conf"]
   exts "Installer Distribution Script", ["dist"]
   exts "Io", ["io"]
-  exts "JSON", ["json"]
+  exts "Java", ["java", "bsh"]
   exts "Java Properties", ["properties"]
   exts "Java Server Page (JSP)", ["jsp"]
-  exts "Java", ["java", "bsh"]
   exts "JavaScript", ["js", "htc", "jsx"]
+  exts "JavaScript (Rails)", ["js.erb"]
+  exts "JSFL", ["jsfl"]
+  exts "JSON", ["json"]
+  exts "Language Grammar", ["textmate"]
+  head "Language Grammar", /^\{\s*scopeName = .*$/
+  exts "LaTeX", ["tex"]
+  head "LaTeX", /^\\documentclass(?!.*\{beamer\})/
   head "LaTeX Beamer", /^\\documentclass(\[.*\])?\{beamer\}/
   head "LaTeX Log", /This is (pdf|pdfe)?TeXk?, Version/
   head "LaTeX Memoir", /^\\documentclass(\[.*\])?\{memoir\}/
-  exts "LaTeX", ["tex"]
-  head "LaTeX", /^\\documentclass(?!.*\{beamer\})/
+  head "LaTeX Rdaemon", /^\\documentclass(?!.*\{beamer\})/
   exts "Lex-Flex", ["l"]
   exts "LilyPond", ["ly", "lily", "ily"]
   exts "Lisp", ["lisp", "cl", "l", "mud", "el"]
   exts "Literate Haskell", ["lhs"]
-  exts "Logtalk", ["lgt", "config"]
+  exts "Logtalk", ["lgt"]
   exts "Lua", ["lua"]
-  exts "MEL", ["as"]
-  exts "MIPS Assembler", ["s", "mips", "spim", "asm"]
   exts "MacPorts Portfile", ["Portfile"]
   exts "Mail", ["mail"]
   head "Mail", /^From: .*(?=\w+@[\w-]+\.\w+)/
   exts "Makefile", ["GNUmakefile", "makefile", "Makefile", "OCamlMakefile"]
-  exts "Markdown", ["mdown", "markdown", "markdn", "md"]
+  exts "Man", ["man"]
   exts "Maven POM", ["pom.xml"]
   exts "Mediawiki", ["mediawiki", "wikipedia", "wiki"]
+  exts "MEL", ["as"]
+  exts "MIPS Assembler", ["s", "mips", "spim", "asm"]
   exts "Modula-3", ["m3", "cm3"]
   exts "MoinMoin", ["moinmoin"]
-  head "MultiMarkdown", /^Format:\s*(?i:complete)\s*$/
+  exts "Movable Type", ["mtml"]
+  head "Movable Type", /<\$?[Mm][Tt]/
+  exts "Movable Type (MT only)", ["mtml"]
+  head "Movable Type (MT only)", /<\$?[Mm][Tt]/
   exts "Nemerle", ["n"]
+  exts "newLisp", ["lsp", "qwerty"]
+  exts "Objective-C", ["m", "h"]
+  exts "Objective-C++", ["mm", "M", "h"]
+  exts "Objective-J", ["j", "J"]
   exts "OCaml", ["ml", "mli"]
   exts "OCamllex", ["mll"]
   exts "OCamlyacc", ["mly"]
-  exts "Objective-C++", ["mm", "M", "h"]
-  exts "Objective-C", ["m", "h"]
-  head "PHP", /^#!.*(?<!-)php[0-9]{0,1}\b/
   exts "Pascal", ["pas", "p"]
   exts "Perl", ["pl", "pm", "pod", "t", "PL"]
   head "Perl", /^#!.*\bperl\b/
+  exts "Perl HTML-Template", ["tmpl"]
+  head "Perl HTML-Template", /<(?i:TMPL)_.+?>/
   exts "Plain Text", ["txt"]
-  exts "PmWiki", ["pmwiki"]
   exts "Postscript", ["ps", "eps"]
   head "Postscript", /^%!PS/
   exts "Processing", ["pde"]
+  exts "Property List", ["plist", "dict", "tmCommand", "tmDelta", "tmDragCommand", "tmLanguage", "tmMacro", "tmPreferences", "tmSnippet", "tmTheme", "scriptSuite", "scriptTerminology", "savedSearch"]
   exts "Python", ["py", "rpy", "pyw", "cpy", "SConstruct", "Sconstruct", "sconstruct", "SConscript"]
   head "Python", /^#!\/.*\bpython\b/
+  exts "qmake Project file", ["pro", "pri"]
   exts "Quake Style .cfg", ["cfg"]
   exts "R", ["R", "r", "s", "S", "Rprofile"]
+  exts "R Console (Rdaemon)", ["Rcon"]
+  exts "R Console (Rdaemon) Plain", ["Rcon"]
   exts "Ragel", ["rl", "ragel"]
   exts "Rd (R Documentation)", ["rd", "Rd"]
   exts "Regular Expressions (Oniguruma)", ["re"]
@@ -128,34 +149,41 @@ module VER::Syntax::Detector
   exts "Release Notes", ["tmReleaseNotes"]
   exts "Remind", ["defs.rem", "REM*.txt", ".reminders"]
   head "Remind", /^REM*/
+  exts "reStructuredText", ["rst", "rest"]
   exts "Rez", ["r"]
+  exts "RJS", ["rjs"]
+  exts "RSpec", ["spec.rb"]
   exts "Ruby", ["rb", "rbx", "rjs", "Rakefile", "rake", "cgi", "fcgi", "gemspec", "irbrc", "capfile"]
   head "Ruby", /^#!\/.*\bruby\b/
+  exts "Ruby Haml", ["haml", "sass"]
+  exts "Ruby on Rails", ["rxml", "builder"]
   exts "S5 Slide Show", ["s5"]
-  exts "SQL", ["sql", "ddl", "dml"]
-  exts "SSH Config", ["ssh_config", ".ssh/config", "sshd_config"]
-  exts "SWIG", ["i", "swg"]
-  exts "SWeave", ["Snw", "Rnw", "snw", "rnw"]
   exts "Scheme", ["scm", "sch"]
   exts "Scilab", ["sce", "sci", "tst", "dem"]
   exts "Setext", ["etx", "etx.txt"]
   head "Setext", /setext/
   exts "Shell Script (Bash)", ["sh", "ss", "bashrc", "bash_profile", "bash_login", "profile", "bash_logout", ".textmate_init"]
-  head "Shell Script (Bash)", /^#!.*(bash|zsh|sh|tcsh)/
+  head "Shell Script (Bash)", /^#!.*\b(bash|zsh|sh|tcsh)/
   exts "Slate", ["slate"]
+  exts "SQL", ["sql", "ddl", "dml"]
+  exts "SQL (Rails)", ["erbsql", "sql.erb"]
+  exts "SSH Config", ["ssh_config", ".ssh/config", "sshd_config"]
+  exts "Standard ML", ["sml", "sig"]
+  exts "Standard ML - CM", ["cm"]
   exts "Strings File", ["strings"]
-  exts "TSV", ["tsv"]
+  exts "svn-commit.tmp", ["svn-commit.tmp", "svn-commit.2.tmp"]
+  exts "SWeave", ["Snw", "Rnw", "snw", "rnw"]
+  exts "SWIG", ["i", "swg"]
   exts "Tcl", ["tcl"]
+  head "Tcl", /^#!\/.*\btclsh\b/
   exts "TeX", ["sty", "cls"]
   exts "Textile", ["textile"]
   head "Textile", /textile/
   exts "Thrift", ["thrift"]
+  exts "TSV", ["tsv"]
   exts "Txt2tags", ["t2t"]
   exts "Vectorscript", ["vss"]
   exts "XML", ["xml", "tld", "jsp", "pt", "cpt", "dtml", "rss", "opml"]
   exts "XSL", ["xsl", "xslt"]
   exts "YAML", ["yaml", "yml"]
-  exts "iCalendar", ["ics", "ifb"]
-  exts "reStructuredText", ["rst", "rest"]
-  exts "svn-commit.tmp", ["svn-commit.tmp", "svn-commit.2.tmp"]
 end