ver 2010.02 → 2010.08

data/config/commands/YAML.rb

@@ -0,0 +1,39 @@
+# Encoding: UTF-8
+
+[{beforeRunningCommand: "nop",
+  command: 
+   "#!/usr/bin/env ruby\n\nline = STDIN.read\nTAB = line.match(/^(\\s+)/).to_s\n\n# first check to see if we have a\n# key on the current line, if so indent\nif ENV['TM_CURRENT_LINE'].match /^\\s*.+:/\n  $stdout.write \"\#{line}\\n\#{TAB}\\t- \" \n\n# then to see if it's a one-liner list item,\n# in which case we don't indent\nelsif ENV['TM_CURRENT_LINE'].match /^\\s*- /\n  $stdout.write \"\#{line}\\n\#{TAB}- \"\n\n# otherwise back up indent\nelse \n  $stdout.write \"\#{line}\\n\#{TAB[(0..-3)]}- \"\nend\n",
+  fallbackInput: "line",
+  input: "selection",
+  keyEquivalent: "",
+  name: "Add list item",
+  output: "insertAsSnippet",
+  scope: "source.yaml",
+  uuid: "037242FC-9D77-46A6-94B8-865052595B5A"},
+ {beforeRunningCommand: "nop",
+  command: 
+   "#!/usr/bin/env ruby\n\nrequire \"yaml\"\nrequire \"pp\"\n\nputs \"#!/usr/bin/env ruby\\n\\n\"\nprint \"documents = \"\npp(YAML.load_stream(STDIN).documents)",
+  input: "selection",
+  keyEquivalent: "^H",
+  name: "Convert Document / Selection to Ruby",
+  output: "openAsNewDocument",
+  scope: "source.yaml",
+  uuid: "D73CBC77-1692-4981-8C3E-6DCE63F6E2E2"},
+ {beforeRunningCommand: "nop",
+  command: 
+   "#!/usr/bin/env ruby\nprint (s = STDIN.read).split(/^\#{indent = s.scan(/^(\\s*)\\b/).flatten.first}(?=\\w)/).sort.join(indent)",
+  input: "selection",
+  keyEquivalent: "",
+  name: "Sort Keys Alphabetically",
+  output: "replaceSelectedText",
+  scope: "source.yaml",
+  uuid: "331791FA-7335-45B9-865E-760D52294D01"},
+ {beforeRunningCommand: "nop",
+  command: 
+   ". \"$TM_SUPPORT_PATH/lib/webpreview.sh\"\nhtml_header \"YAML Reference Card\" \"YAML\"\nMarkdown.pl <<'EOF'\n\n<title>YAML Reference Card</title>\n\n\t  Collection indicators:\n\t      '? ' : Key indicator.\n\t      ': ' : Value indicator.\n\t      '- ' : Nested series entry indicator.\n\t      ', ' : Separate in-line branch entries.\n\t      '[]' : Surround in-line series branch.\n\t      '{}' : Surround in-line keyed branch.\n\t  Scalar indicators:\n\t      '''' : Surround in-line unescaped scalar ('' escaped ').\n\t      '\"'  : Surround in-line escaped scalar (see escape codes below).\n\t      '|'  : Block scalar indicator.\n\t      '>'  : Folded scalar indicator.\n\t      '-'  : Strip chomp modifier ('|-' or '>-').\n\t      '+'  : Keep chomp modifier ('|+' or '>+').\n\t      1-9  : Explicit indentation modifier ('|1' or '>2').\n\t             # Modifiers can be combined ('|2-', '>+1').\n\t  Alias indicators:\n\t      '&'  : Anchor property.\n\t      '*'  : Alias indicator.\n\t  Tag property: # Usually unspecified.\n\t      none    : Unspecified tag (automatically resolved by application).\n\t      '!'     : Non-specific tag (by default, \"!!map\"/\"!!seq\"/\"!!str\").\n\t      '!foo'  : Primary (by convention, means a local \"!foo\" tag).\n\t      '!!foo' : Secondary (by convention, means \"tag:yaml.org,2002:foo\").\n\t      '!h!foo': Requires \"%TAG !h! <prefix>\" (and then means \"<prefix>foo\").\n\t      '!<foo>': Verbatim tag (always means \"foo\").\n\t  Document indicators:\n\t      '%'  : Directive indicator.\n\t      '---': Document header.\n\t      '...': Document terminator.\n\t  Misc indicators:\n\t      ' #' : Throwaway comment indicator.\n\t      '`@' : Both reserved for future use.\n\t  Special keys:\n\t      '='  : Default \"value\" mapping key.\n\t      '<<' : Merge keys from another mapping.\n\t  Core types: # Default automatic tags.\n\t      '!!map' : { Hash table, dictionary, mapping }\n\t      '!!seq' : { List, array, tuple, vector, sequence }\n\t      '!!str' : Unicode string\n\t  More types:\n\t      '!!set' : { cherries, plums, apples }\n\t      '!!omap': [ one: 1, two: 2 ]\n\t  Language Independent Scalar types:\n\t      { ~, null }              : Null (no value).\n\t      [ 1234, 0x4D2, 02333 ]   : [ Decimal int, Hexadecimal int, Octal int ]\n\t      [ 1_230.15, 12.3015e+02 ]: [ Fixed float, Exponential float ]\n\t      [ .inf, -.Inf, .NAN ]    : [ Infinity (float), Negative, Not a number ]\n\t      { Y, true, Yes, ON  }    : Boolean true\n\t      { n, FALSE, No, off }    : Boolean false\n\t      ? !!binary >\n\t          R0lG...BADS=\n\t      : >-\n\t          Base 64 binary value.\n\t  Escape codes:\n\t   Numeric   : { \"\\x12\": 8-bit, \"\\u1234\": 16-bit, \"\\U00102030\": 32-bit }\n\t   Protective: { \"\\\\\": '\\', \"\\\"\": '\"', \"\\ \": ' ', \"\\<TAB>\": TAB }\n\t   C         : { \"\\0\": NUL, \"\\a\": BEL, \"\\b\": BS, \"\\f\": FF, \"\\n\": LF,\n\t                 \"\\r\": CR, \"\\t\": TAB, \"\\v\": VTAB }\n\t   Additional: { \"\\e\": ESC, \"\\_\": NBSP, \"\\N\": NEL, \"\\L\": LS, \"\\P\": PS }\nEOF\nhtml_footer\n",
+  input: "none",
+  keyEquivalent: "^h",
+  name: "Syntax Cheat Sheet",
+  output: "showAsHTML",
+  scope: "source.yaml",
+  uuid: "52CDBDBC-91B6-40DD-852A-C92D7D15D6F5"}]

data/config/commands/YARD.rb

@@ -0,0 +1,12 @@
+# Encoding: UTF-8
+
+[{beforeRunningCommand: "nop",
+  command: 
+   "#!/usr/bin/ruby\n\ncomments = <<-\"end-comment\"\n##\n# $0\n# \n# @author $USER\nend-comment\nprint comments.chomp",
+  fallbackInput: "none",
+  input: "none",
+  name: "Start Comments",
+  output: "insertAsSnippet",
+  scope: "source.ruby",
+  tabTrigger: "##",
+  uuid: "11314DEC-DEC2-4F8C-BC58-C5484D9651B9"}]

data/config/commands/iTerm.rb

@@ -0,0 +1,26 @@
+# Encoding: UTF-8
+
+[{beforeRunningCommand: "nop",
+  command: 
+   "# Start a new shell if needed, otherwise show the one with the right name.\nexport SHELL_NAME=${SHELL_NAME:=\"TextMate Shell\"}\n\"$TM_BUNDLE_SUPPORT/new.sh\"\n",
+  input: "none",
+  keyEquivalent: "^I",
+  name: "Interactive Shell",
+  output: "discard",
+  uuid: "E7E68111-54E4-4C01-8DBA-9D9FFD38FF2C"},
+ {beforeRunningCommand: "nop",
+  command: 
+   "export SHELL_NAME=${SHELL_NAME:=\"TextMate Shell\"}\n\"$TM_BUNDLE_SUPPORT/new.sh\"\nPASTE=$(echo \"$TM_FILEPATH\" | sed s/\\\"/\\\\\\\\\\\"/g)\nosascript << END\ntell application \"iTerm\"\n\ttell first terminal\n\t\ttell session named \"$SHELL_NAME\"\n\t\t\twrite text \"$PASTE\"\n\t\tend tell\n\tend tell\nend tell\nEND\n",
+  input: "none",
+  keyEquivalent: "^I",
+  name: "Paste Filepath",
+  output: "discard",
+  uuid: "BED3AE43-7F29-4F92-B2F1-3361B4ACC71A"},
+ {beforeRunningCommand: "nop",
+  command: 
+   "export SHELL_NAME=${SHELL_NAME:=\"TextMate Shell\"}\n\"$TM_BUNDLE_SUPPORT/new.sh\"\nPASTE=$(echo \"$TM_SELECTED_TEXT\" | sed s/\\\"/\\\\\\\\\\\"/g)\nosascript << END\ntell application \"iTerm\"\n\ttell first terminal\n\t\ttell session named \"$SHELL_NAME\"\n\t\t\twrite text \"$PASTE\"\n\t\tend tell\n\tend tell\nend tell\nEND\n",
+  input: "none",
+  keyEquivalent: "^I",
+  name: "Paste Selection",
+  output: "discard",
+  uuid: "02E5581D-BCC8-4479-A9A9-A5E7CEE8293E"}]

data/config/commands/reStructuredText.rb

@@ -0,0 +1,126 @@
+# Encoding: UTF-8
+
+[{beforeRunningCommand: "nop",
+  command: 
+   "#!/usr/bin/env ruby\n$: << ENV['TM_SUPPORT_PATH'] + '/lib'\nrequire 'escape'\ndef esc(str)\n  e_sn(str).gsub(/\\}/, '\\\\}') # escaping inside a placeholder\nend\n\ns = STDIN.read\nif s.empty? then\n  print \"**$1**\"\nelsif s =~ /^\\*{2}(.*)\\*{2}$/ then\n  print \"${1:\#{esc $1}}\"\nelsif ENV.has_key? 'TM_SELECTED_TEXT'\n  print \"${1:**\#{esc s}**}\"\nelse\n  print \"**\#{e_sn s}**\"\nend",
+  fallbackInput: "word",
+  input: "selection",
+  keyEquivalent: "@b",
+  name: "Bold",
+  output: "insertAsSnippet",
+  scope: "text.restructuredtext",
+  uuid: "898151BC-D897-47DC-AF8A-9E2DB6A25AF6"},
+ {beforeRunningCommand: "nop",
+  command: 
+   "TRST=${TM_RST2HTML:=rst2html.py}\n\nrequire_cmd \"$TRST\" \"You can either set the <tt>TM_RST2HTML</tt> variable to the full path of your docutils (docutils.sourceforge.net) installation (e.g. <tt>/Library/Frameworks/Python.framework/Versions/2.4/bin/rst2html.py</tt> or set the <tt>PATH</tt> variable to include the path of the docutils converters.\"\n\n# Send the current file through rst2html.py\n$TRST \"$TM_FILEPATH\"",
+  input: "document",
+  keyEquivalent: "^H",
+  name: "Convert Document to HTML",
+  output: "replaceDocument",
+  scope: "text.restructuredtext",
+  uuid: "43F50126-B6DE-4B92-84DC-8600C0772CDB"},
+ {beforeRunningCommand: "nop",
+  command: 
+   "TRST=${TM_RST2HTML:=rst2html.py}\n\nrequire_cmd \"$TRST\" \"You can either set the <tt>TM_RST2HTML</tt> variable to the full path of your docutils (docutils.sourceforge.net) installation (e.g. <tt>/Library/Frameworks/Python.framework/Versions/2.4/bin/rst2html.py</tt> or set the <tt>PATH</tt> variable to include the path of the docutils converters.\"\n\n# Send the current file through rst2html.py\n$TRST \"$TM_FILEPATH\"",
+  input: "selection",
+  keyEquivalent: "@r",
+  name: "Create HTML Document",
+  output: "openAsNewDocument",
+  scope: "text.restructuredtext",
+  uuid: "F4B2F9D2-09E8-4A8D-876B-0163A9AF3653"},
+ {beforeRunningCommand: "saveActiveFile",
+  command: 
+   "TRST=${TM_RST2LATEX:=rst2newlatex.py}\n\nrequire_cmd \"$TRST\" \"You can either set the <tt>TM_RST2LATEX</tt> variable to the full path of your docutils (docutils.sourceforge.net) installation (e.g. <tt>/Library/Frameworks/Python.framework/Versions/2.4/bin/rst2html.py</tt> or set the <tt>PATH</tt> variable to include the path of the docutils converters.\"\n\n$TRST \"$TM_FILEPATH\"",
+  input: "selection",
+  keyEquivalent: "@r",
+  name: "Create LaTeX Document",
+  output: "openAsNewDocument",
+  scope: "text.restructuredtext",
+  uuid: "87617D0E-E9E1-42EB-BBD6-CCB890C7DF8C"},
+ {beforeRunningCommand: "nop",
+  command: 
+   "TRST=${TM_RST2S5:=rst2s5.py}\n\nrequire_cmd \"$TRST\" \"You can either set the <tt>TM_RST2S5</tt> variable to the full path of your docutils (docutils.sourceforge.net) installation (e.g. <tt>/Library/Frameworks/Python.framework/Versions/2.4/bin/rst2html.py</tt> or set the <tt>PATH</tt> variable to include the path of the docutils converters.\"\n\n$TRST \"$TM_FILEPATH\"",
+  input: "selection",
+  keyEquivalent: "@r",
+  name: "Create S5 Document",
+  output: "openAsNewDocument",
+  scope: "text.restructuredtext",
+  uuid: "E54E0D99-5558-4168-9DDA-963F066FBA58"},
+ {beforeRunningCommand: "nop",
+  command: 
+   "TRST=${TM_RST2XML:=rst2xml.py}\n\nrequire_cmd \"$TRST\" \"You can either set the <tt>TM_RST2XML</tt> variable to the full path of your docutils (docutils.sourceforge.net) installation (e.g. <tt>/Library/Frameworks/Python.framework/Versions/2.4/bin/rst2html.py</tt> or set the <tt>PATH</tt> variable to include the path of the docutils converters.\"\n\n$TRST \"$TM_FILEPATH\"",
+  input: "selection",
+  keyEquivalent: "@r",
+  name: "Create XML Document",
+  output: "openAsNewDocument",
+  scope: "text.restructuredtext",
+  uuid: "756B8E3C-9928-4552-A15E-17320BBC2E91"},
+ {beforeRunningCommand: "nop",
+  command: 
+   "TPY=${TM_PYTHON:-pythonw}\n\"$TPY\" \"$TM_BUNDLE_SUPPORT/extend_title.py\"",
+  fallbackInput: "scope",
+  input: "selection",
+  keyEquivalent: "^T",
+  name: "Extend Title",
+  output: "insertAsSnippet",
+  scope: "meta.paragraph.restructuredtext ",
+  uuid: "D2EF8647-6586-464B-B759-6F2A8A50E542"},
+ {beforeRunningCommand: "nop",
+  command: 
+   ". \"$TM_SUPPORT_PATH/lib/webpreview.sh\"\nhtml_header \"reStructeredText Bundle Help\" \"reStructeredText\"\nMarkdown.pl <<'EOF'\n\n## What is it\nDocutils is an open-source text processing system for processing plaintext documentation into useful formats, such as HTML or LaTeX. It includes reStructuredText, the easy to read, easy to use, what-you-see-is-what-you-get plaintext markup language.\n\n## Requirements\nTo install using Mac Ports:\n\n    sudo port install py-docutils\n\n## Syntax\nInformation about RST can be found [here](http://docutils.sourceforge.net/rst.html)\n\n## Using it\nThis bundle includes the standard text processing commands: Preview, Preview in Browser, Convert Document to HTML (in place), and Validate.\n\nEOF\nhtml_footer",
+  input: "none",
+  name: "Help",
+  output: "showAsHTML",
+  scope: "text.restructuredtext",
+  uuid: "481BD550-B156-4FA0-B14C-265BF74EFBFE"},
+ {beforeRunningCommand: "nop",
+  command: 
+   "#!/usr/bin/env ruby\n$: << ENV['TM_SUPPORT_PATH'] + '/lib'\nrequire 'escape'\ndef esc(str)\n  e_sn(str).gsub(/\\}/, '\\\\}') # escaping inside a placeholder\nend\n\ns = STDIN.read\nif s.empty? then\n  print \"*$1*\"\nelsif s =~ /^(\\*+)(.*[^\\*])\\*+$/ then\n  m, s = $1, $2\n  case m.length\n    when 1 then print \"${1:\#{esc s}}\"\n    when 2 then print \"${1:***\#{esc s}***}\"\n    else print \"${1:**\#{esc s}**}\"\n  end\nelsif ENV.has_key? 'TM_SELECTED_TEXT'\n  print \"${1:*\#{esc s}*}\"\nelse\n  print \"*\#{e_sn s}*\"\nend",
+  fallbackInput: "word",
+  input: "selection",
+  keyEquivalent: "@i",
+  name: "Italic",
+  output: "insertAsSnippet",
+  scope: "text.restructuredtext",
+  uuid: "B0266484-FC3B-412B-8469-F0A8E3092345"},
+ {beforeRunningCommand: "saveActiveFile",
+  command: 
+   "TRST=${TM_RST2HTML:=rst2html.py}\nrequire_cmd \"$TRST\" \"You can either set the <tt>TM_RST2HTML</tt> variable to the full path of your docutils (docutils.sourceforge.net) installation (e.g. <tt>/Library/Frameworks/Python.framework/Versions/2.4/bin/rst2html.py</tt> or set the <tt>PATH</tt> variable to include the path of the docutils converters.\"\n\n\nif [[ -f \"$TM_DIRECTORY/default.css\" ]]\n\tthen stylesheet=\"$TM_DIRECTORY/default.css\"\nelif [[ -f \"$TM_PROJECT_DIRECTORY/default.css\" ]]\n\tthen stylesheet=\"$TM_PROJECT_DIRECTORY/default.css\"\nelse\n\tcss=`mktemp -t /tmp`\n\techo 'body {\t\n\t\tbackground-color: #eee;\n\t}\n\t.document {\n\t\tbackground: white;\n\t\tfont-family: Georgia, serif;\n\t\tfont-size: 13px;\n\t\tborder: 1px #888 solid;\n\t\tpadding: 0 1em;\n\t}' > $css\n\tstylesheet=$css\n\ttmpCreated=\"yes\"\nfi\n\nif [[ -n $stylesheet ]]\n\tthen flags=\"--embed-stylesheet --stylesheet=$stylesheet\"\n\telse flags=\"\"\nfi\n\n$TRST $flags \"$TM_FILEPATH\"\n\nif [[ -n $css ]]\n\tthen rm $css\nfi",
+  input: "document",
+  keyEquivalent: "^~@p",
+  name: "Preview",
+  output: "showAsHTML",
+  scope: "text.restructuredtext",
+  uuid: "7A099026-D785-48D9-ACAD-318ECF2A3BE4"},
+ {beforeRunningCommand: "saveActiveFile",
+  command: 
+   "TRST=${TM_RST2HTML:=rst2html.py}\n\nrequire_cmd \"$TRST\" \"You can either set the <tt>TM_RST2HTML</tt> variable to the full path of your docutils (docutils.sourceforge.net) installation (e.g. <tt>/Library/Frameworks/Python.framework/Versions/2.4/bin/rst2html.py</tt> or set the <tt>PATH</tt> variable to include the path of the docutils converters.\"\n\n# Send the current file through rst2html.py\n\nif [[ -f \"$TM_DIRECTORY/default.css\" ]]\n\tthen stylesheet=\"$TM_DIRECTORY/default.css\"\nelif [[ -f \"$TM_PROJECT_DIRECTORY/default.css\" ]]\n\tthen stylesheet=\"$TM_PROJECT_DIRECTORY/default.css\"\nelse\n\tcss=`mktemp -t /tmp`\n\techo 'body {\t\n\t\tbackground-color: #eee;\n\t}\n\t.document {\n\t\tbackground: white;\n\t\tfont-family: Georgia, serif;\n\t\tfont-size: 13px;\n\t\tborder: 1px #888 solid;\n\t\tpadding: 0 1em;\n\t}' > $css\n\tstylesheet=$css\nfi\n\nif [[ -n $stylesheet ]]\n\tthen flags=\"--embed-stylesheet --stylesheet=$stylesheet\"\n\telse flags=\"\"\nfi\n\nout=`mktemp -t /tmp`\necho \"Running: $TRST $flags \\\"$TM_FILEPATH\\\" \\\"$out.html\\\"\"\n$TRST $flags \"$TM_FILEPATH\" \"$out.html\"\nopen \"$out.html\"\n\n#rm \"$out.html\"\nif [[ -n $css ]]\n\tthen rm $css\nfi\n\n\n",
+  input: "document",
+  keyEquivalent: "^@p",
+  name: "Preview in Browser",
+  output: "showAsTooltip",
+  scope: "text.restructuredtext",
+  uuid: "065700E0-FE74-43E9-867E-019FF0D1487B"},
+ {beforeRunningCommand: "nop",
+  command: 
+   "#!/usr/bin/env ruby\n$: << ENV['TM_SUPPORT_PATH'] + '/lib'\nrequire 'escape'\ndef esc(str)\n  e_sn(str).gsub(/\\}/, '\\\\}') # escaping inside a placeholder\nend\n\ns = STDIN.read\nif s.empty? then\n  print \"\\\\`\\\\`$1\\\\`\\\\`\"\nelsif s =~ /^\\\\`(.*)\\\\`$/ then\n  print \"${1:\#{esc $1}}\"\nelsif ENV.has_key? 'TM_SELECTED_TEXT'\n  print \"${1:\\\\`\\\\`\#{esc s}\\\\`\\\\`}\"\nelse\n  print \"\\\\`\\\\`\#{e_sn s}\\\\`\\\\`\"\nend",
+  fallbackInput: "word",
+  input: "selection",
+  keyEquivalent: "@k",
+  name: "Typewriter",
+  output: "insertAsSnippet",
+  scope: "text.restructuredtext",
+  uuid: "4C8AB52A-5C88-4786-9FCE-28777DBB02B5"},
+ {beforeRunningCommand: "saveActiveFile",
+  captureFormatString: "Line: $2 Error: \"$3\"",
+  capturePattern: "^(.+):(\\d+): (.+)",
+  command: 
+   "TRST=${TM_RST2HTML:=rst2html.py}\n# TRST = \"/System/Library/Frameworks/Python.framework/Versions/2.3/bin/rst2html.py\"\n# Send the current file through rst2html.py\n\"$TRST\" \"$TM_FILEPATH\" 1>/dev/null|pre",
+  fileCaptureRegister: "1",
+  input: "none",
+  keyEquivalent: "^V",
+  lineCaptureRegister: "2",
+  name: "Validate Syntax",
+  output: "showAsHTML",
+  scope: "text.restructuredtext",
+  uuid: "10B4E8D0-91DC-4764-9237-64009560BF3B"}]

data/config/detect.rb

@@ -11,6 +11,7 @@ module VER::Syntax::Detector
   exts "Apache", ["conf", "htaccess"]
   exts "AppleScript", ["applescript", "script editor"]
   head "AppleScript", /^#!.*(osascript)/
+  exts "AsciiDoc", ["txt", "asciidoc"]
   exts "ASP", ["asa"]
   exts "ASP vb.NET", ["vb"]
   exts "BibTeX", ["bib"]
@@ -30,10 +31,12 @@ module VER::Syntax::Detector
   head "C++", /-\*- C\+\+ -\*-/
   head "C++ Qt", /-\*- C\+\+ -\*-/
   exts "CMake Listfile", ["CMakeLists.txt", "cmake"]
+  exts "CoffeeScript", ["coffee", "Cakefile"]
   exts "ColdFusion", ["cfm", "cfml", "cfc"]
   exts "Context Free", ["cfdg", "context free"]
   exts "CSS", ["css", "css.erb"]
   exts "CSV", ["csv"]
+  exts "Cucumber Steps", ["steps.rb"]
   exts "D", ["d", "di"]
   head "D", /^#!.*\bg?dmd\b./
   exts "Diff", ["diff", "patch"]
@@ -57,11 +60,17 @@ module VER::Syntax::Detector
   exts "Fortran - Punchcard", ["f", "F", "f77", "F77", "for", "FOR", "fpp", "FPP"]
   exts "FXScript", ["fxscript"]
   exts "Gettext", ["po", "potx"]
+  exts "Gherkin", ["feature"]
+  head "Gherkin", /기능|機能|功能|フィーチャ|خاصية|תכונה|Функціонал|Функционалност|Функционал|Особина|Могућност|Özellik|Właściwość|Tính năng|Savybė|Požiadavka|Požadavek|Osobina|Ominaisuus|Omadus|OH HAI|Mogućnost|Mogucnost|Jellemző|Fīča|Funzionalità|Funktionalität|Funkcionalnost|Funkcionalitāte|Funcționalitate|Functionaliteit|Functionalitate|Funcionalitat|Funcionalidade|Fonctionnalité|Fitur|Feature|Egenskap|Egenskab|Crikey|Característica|Arwedd(.*)/
+  exts "Go", ["go"]
+  head "Go", /-[*]-( Mode:)? Go -[*]-/
+  exts "Grails Server Page", ["gsp"]
   exts "Graphviz (DOT)", ["dot", "DOT"]
   exts "Greasemonkey", ["user.js"]
   head "Greasemonkey", /\/\/ ==UserScript==/
   exts "Gri", ["gri"]
   head "Gri", /-[*]-( Mode:)? Gri -[*]-/
+  exts "Groovy", ["groovy", "gvy"]
   exts "GTD", ["gtd"]
   exts "GTDalt", ["gtd", "gtdlog"]
   exts "Haskell", ["hs"]
@@ -107,6 +116,7 @@ module VER::Syntax::Detector
   head "Mail", /^From: .*(?=\w+@[\w-]+\.\w+)/
   exts "Makefile", ["GNUmakefile", "makefile", "Makefile", "OCamlMakefile"]
   exts "Man", ["man"]
+  exts "Markdown", ["mdown", "markdown", "markdn", "md"]
   exts "Maven POM", ["pom.xml"]
   exts "Mediawiki", ["mediawiki", "wikipedia", "wiki"]
   exts "MEL", ["as"]
@@ -117,6 +127,7 @@ module VER::Syntax::Detector
   head "Movable Type", /<\$?[Mm][Tt]/
   exts "Movable Type (MT only)", ["mtml"]
   head "Movable Type (MT only)", /<\$?[Mm][Tt]/
+  head "MultiMarkdown", /^Format:\s*(?i:complete)\s*$/
   exts "Nemerle", ["n"]
   exts "newLisp", ["lsp", "qwerty"]
   exts "Objective-C", ["m", "h"]
@@ -130,6 +141,7 @@ module VER::Syntax::Detector
   head "Perl", /^#!.*\bperl\b/
   exts "Perl HTML-Template", ["tmpl"]
   head "Perl HTML-Template", /<(?i:TMPL)_.+?>/
+  head "PHP", /^#!.*(?<!-)php[0-9]{0,1}\b/
   exts "Plain Text", ["txt"]
   exts "Postscript", ["ps", "eps"]
   head "Postscript", /^%!PS/
@@ -154,7 +166,7 @@ module VER::Syntax::Detector
   exts "RJS", ["rjs"]
   exts "RSpec", ["spec.rb"]
   exts "Ruby", ["rb", "rbx", "rjs", "Rakefile", "rake", "cgi", "fcgi", "gemspec", "irbrc", "capfile"]
-  head "Ruby", /^#!\/.*\bruby\b/
+  head "Ruby", /^#!\/.*\bruby/
   exts "Ruby Haml", ["haml", "sass"]
   exts "Ruby on Rails", ["rxml", "builder"]
   exts "S5 Slide Show", ["s5"]

data/config/keymap/diakonos.rb

@@ -1,7 +1,4 @@
 module VER
-  PanedLayout::OPTIONS[:slaves] = 0
-  layout.options[:slaves] = 0
-
   major_mode :Fundamental do
     use :control
   end
@@ -9,137 +6,144 @@ module VER
   major_mode :MiniBuffer do
     use :basic, :readline
 
-    map :abort,          %w[Escape], %w[Control-c]
-    map :attempt,        %w[Return]
-    map :complete_large, %w[Double-Tab]
-    map :complete_small, %w[Tab]
+    map :abort,          '<Escape>', '<Control-c>'
+    map :attempt,        '<Return>'
+    map :complete_large, '<Control-d>'
+    map :complete_small, '<Tab>'
   end
 
   major_mode :HoverCompletion do
     use :basic
 
-    map :cancel,              %w[Escape], %w[BackSpace]
-    map :continue_completion, %w[Right], %w[Tab]
-    map :go_down,             %w[Down], %w[Control-p]
-    map :go_up,               %w[Up], %w[Control-n]
-    map :submit,              %w[Return]
+    map :cancel,              '<Escape>', '<BackSpace>'
+    map :continue_completion, '<Right>', '<Tab>'
+    map :go_down,             '<Down>', '<Control-p>'
+    map :go_up,               '<Up>', '<Control-n>'
+    map :submit,              '<Return>'
   end
 
   minor_mode :basic do
     handler Methods::Basic
-    map :quit, %w[Control-q]
+    map :quit, '<Control-q>'
   end
 
   minor_mode :move do
-    handler Methods::Move
-    map :ask_go_line,     %w[Control-g]
-    map :end_of_line,     %w[End], %w[Control-e]
-    map :end_of_text,     %w[Alt-greater]
-    map :next_char,       %w[Right], %w[Control-f]
-    map :next_line,       %w[Down], %w[Control-n]
-    map :next_page,       %w[Next]
-    map :next_word,       %w[Shift-Right], %w[Alt-f]
-    map :prev_char,       %w[Left], %w[Control-b]
-    map :prev_line,       %w[Up], %w[Control-p]
-    map :prev_page,       %w[Prior]
-    map :prev_word,       %w[Shift-Left], %w[Alt-b]
-    map :start_of_line,   %w[Home], %w[Control-a]
-    map :start_of_text,   %w[Alt-less]
-    map :forward_scroll,  %w[Alt-n]
-    map :backward_scroll, %w[Alt-p]
+    handler :at_insert
+    map :ask_go_line,     '<Control-g>'
+    map :backward_scroll, '<Alt-p>'
+    map :end_of_buffer,   '<Alt-greater>'
+    map :last_char,       '<End>', '<Control-e>'
+    map :forward_scroll,  '<Alt-n>'
+    map :next_char,       '<Right>'
+    map :next_line,       '<Down>'
+    map :next_page,       '<Next>'
+    map :next_word,       '<Shift-Right>'
+    map :prev_char,       '<Left>'
+    map :prev_line,       '<Up>'
+    map :prev_page,       '<Prior>'
+    map :prev_word,       '<Shift-Left>'
+    map :start_of_buffer, '<Alt-less>'
+    map :start_of_line,   '<Home>'
   end
 
   minor_mode :control do
     inherits :basic, :move
 
-    become :select_char, %w[Control-space]
-    become :select_line, %w[Escape Control-space], %w[Control-Alt-space]
+    become :select_char, '<Control-space>'
+    become :select_line, '<Escape><Control-space>', '<Control-Alt-space>'
+
+    map :save,    '<Control-s>'
+    map :save_as, '<Alt-S>'
+    map :undo,    '<Control-z>'
+    map :redo,    '<Control-y>'
 
-    handler Methods::Save
-    map :save,    %w[Control-s]
-    map :save_as, %w[Alt-S]
+    handler Methods::Open
+    map :file_open_ask, '<Control-o>'
 
     handler Methods::Layout
-    map :close, %w[Control-w]
-    1.upto(9){|n|
-      map([:focus, n], ["Alt-KeyPress-#{n}"], ["Escape", n.to_s]) }
+    map :close, '<Control-w>'
+    1.upto 9 do |n|
+      map [:focus, n], "<Alt-Key-#{n}>", "<Escape><Key-#{n}>"
+    end
 
-    handler Methods::Insert
-    map :newline,    %w[Return]
-    map :selection,  %w[Shift-Insert]
-    map :tab,        %w[Control-t]
-    missing :string
+    handler :at_insert
+    map :insert_newline,    '<Return>'
+    map :insert_selection,  '<Shift-Insert>'
+    map :insert_tab,        '<Control-t>'
 
     handler Methods::Control
-    map :indent_line,                   %w[Alt-i], %w[Escape i]
-    map :unindent_line,                 %w[Alt-I], %w[Escape I]
-    map :exec_into_new,                 %w[F2]
-    map :exec_into_void,                %w[F8]
-    map [:exec_into_new, 'ruby -c $f'], %w[Control-Alt-c]
-    map :cursor_vertical_top,           %w[Alt-comma], %w[Escape comma]
-    map :cursor_vertical_bottom,        %w[Alt-period], %w[Escape period]
-    map :join_line_forward,             %w[Alt-j], %w[Escape j]
-    map :join_line_backward,            %w[Alt-J], %w[Escape J]
+    map :indent_line,                   '<Alt-i>', '<Escape>i'
+    map :unindent_line,                 '<Alt-I>', '<Escape>I'
+    map :exec_into_new,                 '<F2>'
+    map :exec_into_void,                '<F8>'
+    map [:exec_into_new, 'ruby -c $f'], '<Control-Alt-c>'
+    map :cursor_vertical_top,           '<Alt-comma>', '<Escape>,'
+    map :cursor_vertical_bottom,        '<Alt-period>', '<Escape>.'
+    map :join_forward,                  '<Alt-j>', '<Escape>j'
+    map :join_backward,                 '<Alt-J>', '<Escape>J'
 
     handler Methods::Completion
-    map :word, %w[Alt-e], %w[Escape e]
+    map :word, '<Alt-e>', '<Escape>e'
 
     handler Methods::Clipboard
-    map :paste, %w[Control-v]
-
-    handler Methods::Undo
-    map :undo, %w[Control-z]
-    map :redo, %w[Control-y]
+    map :paste, '<Control-v>'
 
-    handler Methods::Delete
-    map :kill_line,                      %w[Control-k], %w[Control-d Control-d]
-    map [:delete_motion, :end_of_line],  %w[Control-Alt-k], %w[Control-d dollar]
-    map [:delete_motion, :prev_char],    %w[BackSpace]
-    map [:delete_motion, :next_char],    %w[Delete]
+    handler :at_insert
+    map :kill_line,                 '<Control-k>', '<Control-d><Control-d>'
+    map [:deleting, :last_char],    '<Control-Alt-k>', '<Control-d>$'
+    map [:deleting, :prev_char],    '<BackSpace>'
+    map [:deleting, :next_char],    '<Delete>'
 
     handler Methods::Bookmark
-    map :add_named,    %w[Alt-b Alt-a]
-    map :next,         %w[Alt-b Alt-n]
-    map :prev,         %w[Alt-b Alt-p]
-    map :remove_named, %w[Alt-b Alt-r]
-    map :toggle,       %w[Alt-b Alt-b]
-    map :visit_named,  %w[Alt-b Alt-g]
+    map :add_named,    '<Alt-b><Alt-a>'
+    map :next,         '<Alt-b><Alt-n>'
+    map :prev,         '<Alt-b><Alt-p>'
+    map :remove_named, '<Alt-b><Alt-r>'
+    map :toggle,       '<Alt-b><Alt-b>'
+    map :visit_named,  '<Alt-b><Alt-g>'
     # these are only valid on US keymap, don't know a better way.
-    map [:add_named, '1'],   %w[Alt-b Alt-exclam]
-    map [:add_named, '2'],   %w[Alt-b Alt-at]
-    map [:add_named, '3'],   %w[Alt-b Alt-numbersign]
-    map [:add_named, '4'],   %w[Alt-b Alt-dollar]
-    map [:add_named, '5'],   %w[Alt-b Alt-percent]
-    map [:visit_named, '1'], %w[Alt-b Alt-1]
-    map [:visit_named, '2'], %w[Alt-b Alt-2]
-    map [:visit_named, '3'], %w[Alt-b Alt-3]
-    map [:visit_named, '4'], %w[Alt-b Alt-4]
-    map [:visit_named, '5'], %w[Alt-b Alt-5]
+    map [:add_named,   '1'], '<Alt-b><Alt-exclam>'
+    map [:add_named,   '2'], '<Alt-b><Alt-at>'
+    map [:add_named,   '3'], '<Alt-b><Alt-numbersign>'
+    map [:add_named,   '4'], '<Alt-b><Alt-dollar>'
+    map [:add_named,   '5'], '<Alt-b><Alt-percent>'
+    map [:visit_named, '1'], '<Alt-b><Alt-Key-1>'
+    map [:visit_named, '2'], '<Alt-b><Alt-Key-2>'
+    map [:visit_named, '3'], '<Alt-b><Alt-Key-3>'
+    map [:visit_named, '4'], '<Alt-b><Alt-Key-4>'
+    map [:visit_named, '5'], '<Alt-b><Alt-Key-5>'
 
     handler Methods::CTags
-    map :go,           %w[Alt-t]
-    map :find_current, %w[Alt-parenright]
-    map :prev,         %w[Alt-parenleft]
+    map :go,           '<Alt-t>'
+    map :find_current, '<Alt-parenright>'
+    map :prev,         '<Alt-parenleft>'
 
     handler Methods::Search
-    map :status_next, %w[Control-f]
-    map :next,        %w[F3]
-    map :clear,       %w[Control-Alt-u]
-    # TODO: this doesn't work, investiate.
-    map :prev,        %w[Shift-F3]
+    map :status_next, '<Control-f>'
+    map :next,        '<F3>'
+    map :clear,       '<Control-Alt-u>'
+
+    if x11?
+      map :prev, '<XF86_Switch_VT_3>'
+    else
+      map :prev, '<Shift-F3>'
+    end
+
+    handler Methods::Insert
+    missing :string
   end
 
   minor_mode :select do
     handler Methods::Selection
-    map :copy,                   %w[Control-c]
-    map :kill,                   %w[Control-x]
-    map :delete,                 %w[BackSpace], %w[Delete]
-    map :replace_with_clipboard, %w[Control-v]
+    map :copy,                   '<Control-c>'
+    map :kill,                   '<Control-x>'
+    map :delete,                 '<BackSpace>', '<Delete>'
+    map :replace_with_clipboard, '<Control-v>'
   end
 
   minor_mode :select_char do
     inherits :move, :select
-    become :control, %w[Escape]
+    become :control, '<Escape>'
     handler Methods::Selection
     enter :enter
     leave :leave
@@ -147,36 +151,30 @@ module VER
 
   minor_mode :select_line do
     inherits :move, :select
-    become :control, %w[Escape]
+    become :control, '<Escape>'
     handler Methods::Selection
     enter :enter
     leave :leave
   end
 
   minor_mode :readline do
-    map :accept_line,       %w[Return]
-
-    map :end_of_line,       %w[End], %w[Control-e]
-    map :insert_selection,  %w[Shift-Insert]
-    map :insert_tab,        %w[Control-v Tab]
-    map :kill_end_of_line,  %w[Control-k]
-    map :kill_next_char,    %w[Control-d], %w[Delete]
-    map :kill_next_word,    %w[Alt-d]
-    map :kill_prev_char,    %w[BackSpace]
-    map :kill_prev_word,    %w[Control-w]
-    map :next_char,         %w[Right], %w[Control-f]
-    map :next_word,         %w[Shift-Right], %w[Alt-f]
-    map :prev_char,         %w[Left], %w[Control-b]
-    map :prev_word,         %w[Shift-Left], %w[Alt-b]
-    map :start_of_line,     %w[Home], %w[Control-a]
-    map :transpose_chars,   %w[Control-t]
-
-    map :sel_prev_char,     %w[Shift-Left]
-    map :sel_next_char,     %w[Shift-Right]
-    map :sel_prev_word,     %w[Shift-Control-Left]
-    map :sel_next_word,     %w[Shift-Control-Right]
-    map :sel_start_of_line, %w[Shift-Home]
-    map :sel_end_of_line,   %w[Shift-End]
+    map :accept_line,       '<Return>'
+
+    map :last_char,         '<End>', '<Control-e>'
+    map :insert_selection,  '<Shift-Insert>'
+    map :insert_tab,        '<Control-v><Tab>'
+    map :kill_end_of_line,  '<Control-k>'
+    map :kill_next_char,    '<Control-d>', '<Delete>'
+    map :kill_next_word,    '<Alt-d>'
+    map :kill_prev_char,    '<BackSpace>'
+    map :kill_prev_word,    '<Control-w>'
+    map :next_char,         '<Right>', '<Control-f>'
+    map :next_word,         '<Shift-Right>', '<Alt-f>'
+    map :prev_char,         '<Left>', '<Control-b>'
+    map :prev_word,         '<Shift-Left>', '<Alt-b>'
+    map :start_of_line,     '<Home>', '<Control-a>'
+    map :transpose_chars,   '<Control-t>'
+    map :paste, '<Control-y>'
 
     missing :insert_string
   end