Merge pull request #3214 from pchaigno/remove-sublime-syntax

Remove support for .sublime-syntax
2025-10-29 17:50:22 +00:00 · 2016-09-14 15:21:54 -07:00 · 2016-09-14 23:09:22 +02:00 · 2016-09-13 13:02:13 -07:00 · 2016-09-13 11:37:42 -07:00 · 2016-09-13 11:33:20 -07:00
74 changed files with 3396 additions and 2508 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,7 +12,7 @@
 	url = https://github.com/Drako/SublimeBrainfuck
 [submodule "vendor/grammars/awk-sublime"]
 	path = vendor/grammars/awk-sublime
-	url = https://github.com/JohnNilsson/awk-sublime
+	url = https://github.com/github-linguist/awk-sublime
 [submodule "vendor/grammars/Sublime-SQF-Language"]
 	path = vendor/grammars/Sublime-SQF-Language
 	url = https://github.com/JonBons/Sublime-SQF-Language
@@ -30,7 +30,7 @@
 	url = https://github.com/SublimeText/ColdFusion
 [submodule "vendor/grammars/NSIS"]
 	path = vendor/grammars/NSIS
-	url = https://github.com/SublimeText/NSIS
+	url = https://github.com/github-linguist/NSIS
 [submodule "vendor/grammars/NimLime"]
 	path = vendor/grammars/NimLime
 	url = https://github.com/Varriount/NimLime
@@ -412,9 +412,9 @@
 [submodule "vendor/grammars/oz-tmbundle"]
 	path = vendor/grammars/oz-tmbundle
 	url = https://github.com/eregon/oz-tmbundle
-[submodule "vendor/grammars/ebundles"]
-	path = vendor/grammars/ebundles
-	url = https://github.com/ericzou/ebundles
+[submodule "vendor/grammars/language-batchfile"]
+	path = vendor/grammars/language-batchfile
+	url = https://github.com/mmims/language-batchfile
 [submodule "vendor/grammars/sublime-mask"]
 	path = vendor/grammars/sublime-mask
 	url = https://github.com/tenbits/sublime-mask
@@ -559,7 +559,7 @@
 	url = https://github.com/ShaneWilton/sublime-smali
 [submodule "vendor/grammars/language-jsoniq"]
 	path = vendor/grammars/language-jsoniq
-	url = http://github.com/wcandillon/language-jsoniq
+	url = https://github.com/wcandillon/language-jsoniq
 [submodule "vendor/grammars/atom-fsharp"]
 	path = vendor/grammars/atom-fsharp
 	url = https://github.com/fsprojects/atom-fsharp
@@ -602,9 +602,6 @@
 [submodule "vendor/grammars/X10"]
 	path = vendor/grammars/X10
 	url = https://github.com/x10-lang/x10-highlighting
-[submodule "vendor/grammars/language-babel"]
-	path = vendor/grammars/language-babel
-	url = https://github.com/gandm/language-babel
 [submodule "vendor/grammars/UrWeb-Language-Definition"]
 	path = vendor/grammars/UrWeb-Language-Definition
 	url = https://github.com/gwalborn/UrWeb-Language-Definition.git
@@ -669,8 +666,8 @@
 	path = vendor/grammars/pig-latin
 	url = https://github.com/goblindegook/sublime-text-pig-latin
 [submodule "vendor/grammars/sourcepawn"]
-path = vendor/grammars/sourcepawn
-url = https://github.com/austinwagner/sublime-sourcepawn
+	path = vendor/grammars/sourcepawn
+	url = https://github.com/github-linguist/sublime-sourcepawn
 [submodule "vendor/grammars/gdscript"]
 	path = vendor/grammars/gdscript
 	url = https://github.com/beefsack/GDScript-sublime
@@ -785,3 +782,12 @@ url = https://github.com/austinwagner/sublime-sourcepawn
 [submodule "vendor/grammars/xquery"]
 	path = vendor/grammars/xquery
 	url = https://github.com/textmate/xquery.tmbundle
+[submodule "vendor/grammars/language-rpm-spec"]
+	path = vendor/grammars/language-rpm-spec
+	url = https://github.com/waveclaw/language-rpm-spec
+[submodule "vendor/grammars/language-emacs-lisp"]
+	path = vendor/grammars/language-emacs-lisp
+	url = https://github.com/Alhadis/language-emacs-lisp
+[submodule "vendor/grammars/language-babel"]
+	path = vendor/grammars/language-babel
+	url = https://github.com/github-linguist/language-babel
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,6 +33,7 @@ To add support for a new language:
  0. Add your grammar to [`grammars.yml`][grammars] by running `script/convert-grammars --add vendor/grammars/MyGrammar`.
  0. Download the license for the grammar: `script/licensed`. Be careful to only commit the file for the new grammar, as this script may update licenses for other grammars as well.
 0. Add samples for your language to the [samples directory][samples] in the correct subdirectory.
+0. Add a `language_id` for your language. See `script/set-language-ids` for more information. **You should only ever need to run `script/set-language-ids --update`. Anything other than this risks breaking GitHub search :cry:**
 0. Open a pull request, linking to a [GitHub search result](https://github.com/search?utf8=%E2%9C%93&q=extension%3Aboot+NOT+nothack&type=Code&ref=searchresults) showing in-the-wild usage.

 In addition, if your new language defines an extension that's already listed in [`languages.yml`][languages] (such as `.foo`) then sometimes a few more steps will need to be taken:
@@ -84,7 +85,7 @@ Linguist is maintained with :heart: by:
 - @arfon (GitHub Staff)
 - @larsbrinkhoff
 - @pchaigno
- 
+
 As Linguist is a production dependency for GitHub we have a couple of workflow restrictions:

 - Anyone with commit rights can merge Pull Requests provided that there is a :+1: from a GitHub member of staff
--- a/bin/git-linguist
+++ b/bin/git-linguist
@@ -23,7 +23,7 @@ class GitLinguist
    if @incremental && stats = load_language_stats
      old_commit_oid, old_stats = stats

-      # A cache with NULL oid means that we want to froze
+      # A cache with NULL oid means that we want to freeze
      # these language stats in place and stop computing
      # them (for performance reasons)
      return old_stats if old_commit_oid == NULL_OID
@@ -111,7 +111,7 @@ def git_linguist(args)
  parser.parse!(args)

  git_dir = `git rev-parse --git-dir`.strip
-  raise "git-linguist must be ran in a Git repository (#{Dir.pwd})" unless $?.success?
+  raise "git-linguist must be run in a Git repository (#{Dir.pwd})" unless $?.success?
  wrapper = GitLinguist.new(git_dir, commit, incremental)

  case args.pop
--- a/grammars.yml
+++ b/grammars.yml
@@ -8,9 +8,9 @@ vendor/grammars/Agda.tmbundle:
 - source.agda
 vendor/grammars/Alloy.tmbundle:
 - source.alloy
-vendor/grammars/AutoHotkey/:
+vendor/grammars/AutoHotkey:
 - source.ahk
-vendor/grammars/BrightScript.tmbundle/:
+vendor/grammars/BrightScript.tmbundle:
 - source.brightauthorproject
 - source.brightscript
 vendor/grammars/ColdFusion:
@@ -20,11 +20,13 @@ vendor/grammars/ColdFusion:
 - text.html.cfm
 vendor/grammars/Docker.tmbundle:
 - source.dockerfile
-vendor/grammars/Elm/:
+vendor/grammars/Elm/Syntaxes:
 - source.elm
+- text.html.mediawiki.elm-build-output
+- text.html.mediawiki.elm-documentation
 vendor/grammars/FreeMarker.tmbundle:
 - text.html.ftl
-vendor/grammars/G-Code/:
+vendor/grammars/G-Code:
 - source.LS
 - source.MCPOST
 - source.MOD
@@ -37,7 +39,7 @@ vendor/grammars/IDL-Syntax:
 vendor/grammars/Isabelle.tmbundle:
 - source.isabelle.root
 - source.isabelle.theory
-vendor/grammars/JSyntax/:
+vendor/grammars/JSyntax:
 - source.j
 vendor/grammars/Julia.tmbundle:
 - source.julia
@@ -48,7 +50,7 @@ vendor/grammars/LiveScript.tmbundle:
 vendor/grammars/MagicPython:
 - source.python
 - source.regexp.python
-vendor/grammars/Modelica/:
+vendor/grammars/Modelica:
 - source.modelica
 vendor/grammars/NSIS:
 - source.nsis
@@ -58,7 +60,7 @@ vendor/grammars/NimLime:
 - source.nimcfg
 vendor/grammars/PHP-Twig.tmbundle:
 - text.html.twig
-vendor/grammars/PogoScript.tmbundle/:
+vendor/grammars/PogoScript.tmbundle:
 - source.pogoscript
 vendor/grammars/RDoc.tmbundle:
 - text.rdoc
@@ -73,10 +75,10 @@ vendor/grammars/Scalate.tmbundle:
 - text.html.ssp
 vendor/grammars/Slash.tmbundle:
 - text.html.slash
-vendor/grammars/Stata.tmbundle/:
+vendor/grammars/Stata.tmbundle:
 - source.mata
 - source.stata
-vendor/grammars/Stylus/:
+vendor/grammars/Stylus:
 - source.stylus
 vendor/grammars/Sublime-Coq:
 - source.coq
@@ -86,7 +88,7 @@ vendor/grammars/Sublime-Lasso:
 - file.lasso
 vendor/grammars/Sublime-Loom:
 - source.loomscript
-vendor/grammars/Sublime-Modula-2/:
+vendor/grammars/Sublime-Modula-2:
 - source.modula2
 vendor/grammars/Sublime-Nit:
 - source.nit
@@ -105,22 +107,22 @@ vendor/grammars/Sublime-VimL:
 - source.viml
 vendor/grammars/SublimeBrainfuck:
 - source.bf
-vendor/grammars/SublimeClarion/:
+vendor/grammars/SublimeClarion:
 - source.clarion
-vendor/grammars/SublimeGDB/:
+vendor/grammars/SublimeGDB:
 - source.disasm
 - source.gdb
 - source.gdb.session
 - source.gdbregs
-vendor/grammars/SublimePapyrus/:
+vendor/grammars/SublimePapyrus:
 - source.papyrus.skyrim
-vendor/grammars/SublimePuppet/:
+vendor/grammars/SublimePuppet:
 - source.puppet
 vendor/grammars/SublimeXtend:
 - source.xtend
 vendor/grammars/TLA:
 - source.tla
-vendor/grammars/TXL/:
+vendor/grammars/TXL:
 - source.txl
 vendor/grammars/Textmate-Gosu-Bundle:
 - source.gosu.2
@@ -149,20 +151,20 @@ vendor/grammars/antlr.tmbundle:
 vendor/grammars/apache.tmbundle:
 - source.apache-config
 - source.apache-config.mod_perl
-vendor/grammars/api-blueprint-sublime-plugin/:
+vendor/grammars/api-blueprint-sublime-plugin:
 - text.html.markdown.source.gfm.apib
 - text.html.markdown.source.gfm.mson
 vendor/grammars/applescript.tmbundle:
 - source.applescript
-vendor/grammars/asciidoc.tmbundle/:
+vendor/grammars/asciidoc.tmbundle:
 - text.html.asciidoc
 vendor/grammars/asp.tmbundle:
 - source.asp
 - text.html.asp
-vendor/grammars/assembly/:
+vendor/grammars/assembly:
 - objdump.x86asm
 - source.x86asm
-vendor/grammars/atom-fsharp/:
+vendor/grammars/atom-fsharp:
 - source.fsharp
 - source.fsharp.fsi
 - source.fsharp.fsl
@@ -172,16 +174,16 @@ vendor/grammars/atom-language-1c-bsl:
 - source.sdbl
 vendor/grammars/atom-language-clean:
 - source.clean
-vendor/grammars/atom-language-purescript/:
+vendor/grammars/atom-language-purescript:
 - source.purescript
 vendor/grammars/atom-language-srt:
 - text.srt
-vendor/grammars/atom-language-stan/:
+vendor/grammars/atom-language-stan:
 - source.stan
 vendor/grammars/atom-salt:
 - source.python.salt
 - source.yaml.salt
-vendor/grammars/atomic-dreams/:
+vendor/grammars/atomic-dreams:
 - source.dm
 - source.dmf
 vendor/grammars/ats:
@@ -192,7 +194,7 @@ vendor/grammars/bison.tmbundle:
 - source.bison
 vendor/grammars/blitzmax:
 - source.blitzmax
-vendor/grammars/boo/:
+vendor/grammars/boo:
 - source.boo
 vendor/grammars/bro-sublime:
 - source.bro
@@ -217,7 +219,7 @@ vendor/grammars/cool-tmbundle:
 vendor/grammars/cpp-qt.tmbundle:
 - source.c++.qt
 - source.qmake
-vendor/grammars/creole/:
+vendor/grammars/creole:
 - text.html.creole
 vendor/grammars/css.tmbundle:
 - source.css
@@ -241,9 +243,7 @@ vendor/grammars/dylan.tmbundle:
 - source.dylan
 - source.lid
 - source.makegen
-vendor/grammars/ebundles/Bundles/MSDOS batch file.tmbundle:
- source.dosbatch
-vendor/grammars/ec.tmbundle/:
+vendor/grammars/ec.tmbundle:
 - source.c.ec
 vendor/grammars/eiffel.tmbundle:
 - source.eiffel
@@ -268,9 +268,9 @@ vendor/grammars/forth:
 vendor/grammars/fortran.tmbundle:
 - source.fortran
 - source.fortran.modern
-vendor/grammars/gap-tmbundle/:
+vendor/grammars/gap-tmbundle:
 - source.gap
-vendor/grammars/gdscript/:
+vendor/grammars/gdscript:
 - source.gdscript
 vendor/grammars/gettext.tmbundle:
 - source.po
@@ -298,7 +298,7 @@ vendor/grammars/idl.tmbundle:
 - source.idl
 - source.idl-dlm
 - text.idl-idldoc
-vendor/grammars/idris/:
+vendor/grammars/idris:
 - source.idris
 vendor/grammars/ini.tmbundle:
 - source.ini
@@ -330,12 +330,14 @@ vendor/grammars/language-apl:
 - source.apl
 vendor/grammars/language-asn1:
 - source.asn
-vendor/grammars/language-babel/:
+vendor/grammars/language-babel:
 - source.js.jsx
 - source.regexp.babel
-vendor/grammars/language-blade/:
+vendor/grammars/language-batchfile:
+- source.batchfile
+vendor/grammars/language-blade:
 - text.html.php.blade
-vendor/grammars/language-click/:
+vendor/grammars/language-click:
 - source.click
 vendor/grammars/language-clojure:
 - source.clojure
@@ -354,6 +356,8 @@ vendor/grammars/language-csound:
 - source.csound
 - source.csound-document
 - source.csound-score
+vendor/grammars/language-emacs-lisp:
+- source.emacs.lisp
 vendor/grammars/language-gfm:
 - source.gfm
 vendor/grammars/language-graphql:
@@ -375,10 +379,10 @@ vendor/grammars/language-javascript:
 - source.js
 - source.js.regexp
 - source.js.regexp.replacement
-vendor/grammars/language-jsoniq/:
+vendor/grammars/language-jsoniq:
 - source.jq
 - source.xq
-vendor/grammars/language-less/:
+vendor/grammars/language-less:
 - source.css.less
 vendor/grammars/language-maxscript:
 - source.maxscript
@@ -398,6 +402,9 @@ vendor/grammars/language-roff:
 - source.pic
 - text.roff
 - text.runoff
+vendor/grammars/language-rpm-spec:
+- source.changelogs.rpm-spec
+- source.rpm-spec
 vendor/grammars/language-shellscript:
 - source.shell
 - text.shell-session
@@ -414,7 +421,7 @@ vendor/grammars/language-xbase:
 - source.harbour
 vendor/grammars/language-yaml:
 - source.yaml
-vendor/grammars/language-yang/:
+vendor/grammars/language-yang:
 - source.yang
 vendor/grammars/latex.tmbundle:
 - text.bibtex
@@ -448,11 +455,11 @@ vendor/grammars/matlab.tmbundle:
 - source.octave
 vendor/grammars/maven.tmbundle:
 - text.xml.pom
-vendor/grammars/mediawiki.tmbundle/:
+vendor/grammars/mediawiki.tmbundle:
 - text.html.mediawiki
 vendor/grammars/mercury-tmlanguage:
 - source.mercury
-vendor/grammars/monkey/:
+vendor/grammars/monkey:
 - source.monkey
 vendor/grammars/moonscript-tmbundle:
 - source.moonscript
@@ -486,9 +493,9 @@ vendor/grammars/parrot:
 - source.parrot.pir
 vendor/grammars/pascal.tmbundle:
 - source.pascal
-vendor/grammars/pawn-sublime-language/:
+vendor/grammars/pawn-sublime-language:
 - source.pawn
-vendor/grammars/perl.tmbundle/:
+vendor/grammars/perl.tmbundle:
 - source.perl
 - source.perl.6
 vendor/grammars/perl6fe:
@@ -499,7 +506,7 @@ vendor/grammars/php-smarty.tmbundle:
 - text.html.smarty
 vendor/grammars/php.tmbundle:
 - text.html.php
-vendor/grammars/pig-latin/:
+vendor/grammars/pig-latin:
 - source.pig_latin
 vendor/grammars/pike-textmate:
 - source.pike
@@ -538,11 +545,11 @@ vendor/grammars/scilab.tmbundle:
 - source.scilab
 vendor/grammars/secondlife-lsl:
 - source.lsl
-vendor/grammars/smali-sublime/smali.tmLanguage:
+vendor/grammars/smali-sublime:
 - source.smali
 vendor/grammars/smalltalk-tmbundle:
 - source.smalltalk
-vendor/grammars/sourcepawn/:
+vendor/grammars/sourcepawn:
 - source.sp
 vendor/grammars/sql.tmbundle:
 - source.sql
@@ -553,9 +560,9 @@ vendor/grammars/standard-ml.tmbundle:
 - source.ml
 vendor/grammars/sublime-MuPAD:
 - source.mupad
-vendor/grammars/sublime-aspectj/:
+vendor/grammars/sublime-aspectj:
 - source.aspectj
-vendor/grammars/sublime-autoit/:
+vendor/grammars/sublime-autoit:
 - source.autoit
 vendor/grammars/sublime-befunge:
 - source.befunge
@@ -563,12 +570,12 @@ vendor/grammars/sublime-bsv:
 - source.bsv
 vendor/grammars/sublime-cirru:
 - source.cirru
-vendor/grammars/sublime-clips/:
+vendor/grammars/sublime-clips:
 - source.clips
 vendor/grammars/sublime-glsl:
 - source.essl
 - source.glsl
-vendor/grammars/sublime-golo/:
+vendor/grammars/sublime-golo:
 - source.golo
 vendor/grammars/sublime-mask:
 - source.mask
@@ -577,29 +584,31 @@ vendor/grammars/sublime-netlinx:
 - source.netlinx.erb
 vendor/grammars/sublime-nginx:
 - source.nginx
-vendor/grammars/sublime-opal/:
+vendor/grammars/sublime-opal:
 - source.opal
 - source.opalsysdefs
 vendor/grammars/sublime-pony:
 - source.pony
-vendor/grammars/sublime-rexx/:
+vendor/grammars/sublime-rexx:
 - source.rexx
 vendor/grammars/sublime-robot-plugin:
 - text.robot
 vendor/grammars/sublime-rust:
 - source.rust
-vendor/grammars/sublime-spintools/:
+vendor/grammars/sublime-spintools:
 - source.regexp.spin
 - source.spin
 vendor/grammars/sublime-tea:
 - source.tea
 vendor/grammars/sublime-terra:
 - source.terra
-vendor/grammars/sublime-text-ox/:
+vendor/grammars/sublime-text-ox:
 - source.ox
-vendor/grammars/sublime-typescript/:
+vendor/grammars/sublime-typescript:
 - source.ts
 - source.tsx
+- text.error-list
+- text.find-refs
 vendor/grammars/sublime-varnish:
 - source.varnish.vcl
 vendor/grammars/sublime_cobol:
@@ -607,9 +616,9 @@ vendor/grammars/sublime_cobol:
 - source.cobol
 - source.jcl
 - source.opencobol
-vendor/grammars/sublimeassembly/:
+vendor/grammars/sublimeassembly:
 - source.assembly
-vendor/grammars/sublimeprolog/:
+vendor/grammars/sublimeprolog:
 - source.prolog
 - source.prolog.eclipse
 vendor/grammars/sublimetext-cuda-cpp:
@@ -632,7 +641,7 @@ vendor/grammars/vhdl:
 - source.vhdl
 vendor/grammars/vue-syntax-highlight:
 - text.html.vue
-vendor/grammars/xc.tmbundle/:
+vendor/grammars/xc.tmbundle:
 - source.xc
 vendor/grammars/xml.tmbundle:
 - text.xml
--- a/lib/linguist/heuristics.rb
+++ b/lib/linguist/heuristics.rb
@@ -144,10 +144,22 @@ module Linguist
      end
    end

-    disambiguate ".for", ".f" do |data|
+    fortran_rx = /^([c*][^abd-z]|      (subroutine|program|end)\s|\s*!)/i
+
+    disambiguate ".f" do |data|
      if /^: /.match(data)
        Language["Forth"]
-      elsif /^([c*][^abd-z]|      (subroutine|program|end)\s|\s*!)/i.match(data)
+      elsif data.include?("flowop")
+        Language["Filebench WML"]
+      elsif fortran_rx.match(data)
+        Language["FORTRAN"]
+      end
+    end
+
+    disambiguate ".for" do |data|
+      if /^: /.match(data)
+        Language["Forth"]
+      elsif fortran_rx.match(data)
        Language["FORTRAN"]
      end
    end
@@ -354,7 +366,7 @@ module Linguist
    disambiguate ".r" do |data|
      if /\bRebol\b/i.match(data)
        Language["Rebol"]
-      elsif data.include?("<-")
+      elsif /<-|^\s*#/.match(data)
        Language["R"]
      end
    end
@@ -430,7 +442,7 @@ module Linguist
    end

    disambiguate ".ts" do |data|
-      if data.include?("</TS>")
+      if data.include?("<TS")
        Language["XML"]
      else
        Language["TypeScript"]
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -20,10 +20,11 @@ module Linguist
  #
  # Languages are defined in `lib/linguist/languages.yml`.
  class Language
-    @languages       = []
-    @index           = {}
-    @name_index      = {}
-    @alias_index     = {}
+    @languages          = []
+    @index              = {}
+    @name_index         = {}
+    @alias_index        = {}
+    @language_id_index  = {}

    @extension_index          = Hash.new { |h,k| h[k] = [] }
    @interpreter_index        = Hash.new { |h,k| h[k] = [] }
@@ -84,6 +85,8 @@ module Linguist
        @filename_index[filename] << language
      end

+      @language_id_index[language.language_id] = language
+
      language
    end

@@ -193,6 +196,19 @@ module Linguist
      @interpreter_index[interpreter]
    end

+    # Public: Look up Languages by its language_id.
+    #
+    # language_id - Integer of language_id
+    #
+    # Examples
+    #
+    #   Language.find_by_id(100)
+    #   # => [#<Language name="Elixir">]
+    #
+    # Returns the matching Language
+    def self.find_by_id(language_id)
+      @language_id_index[language_id.to_i]
+    end

    # Public: Look up Language by its name.
    #
@@ -289,6 +305,9 @@ module Linguist
      # Set legacy search term
      @search_term = attributes[:search_term] || default_alias_name

+      # Set the language_id 
+      @language_id = attributes[:language_id]
+
      # Set extensions or default to [].
      @extensions = attributes[:extensions] || []
      @interpreters = attributes[:interpreters]   || []
@@ -351,6 +370,17 @@ module Linguist
    # Returns the name String
    attr_reader :search_term

+    # Public: Get language_id (used in GitHub search)
+    #
+    # Examples
+    #
+    #   # => "1"
+    #   # => "2"
+    #   # => "3"
+    #
+    # Returns the integer language_id
+    attr_reader :language_id
+
    # Public: Get the name of a TextMate-compatible scope
    #
    # Returns the scope
@@ -547,6 +577,7 @@ module Linguist
      :group_name        => options['group'],
      :searchable        => options.fetch('searchable', true),
      :search_term       => options['search_term'],
+      :language_id       => options['language_id'],
      :extensions        => Array(options['extensions']),
      :interpreters      => options['interpreters'].sort,
      :filenames         => options['filenames'],
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
--- a/lib/linguist/version.rb
+++ b/lib/linguist/version.rb
@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "4.8.9"
+  VERSION = "4.8.11"
 end
--- a/Lisp/filenames/.spacemacs
+++ b/Lisp/filenames/.spacemacs
@@ -0,0 +1,197 @@
+;; -*- mode: emacs-lisp -*-
+;; This file is loaded by Spacemacs at startup.
+;; It must be stored in your home directory.
+
+(defun dotspacemacs/layers ()
+  "Configuration Layers declaration."
+  (setq-default
+   ;; List of additional paths where to look for configuration layers.
+   ;; Paths must have a trailing slash (i.e. `~/.mycontribs/')
+   dotspacemacs-configuration-layer-path '()
+   ;; List of configuration layers to load. If it is the symbol `all' instead
+   ;; of a list then all discovered layers will be installed.
+   dotspacemacs-configuration-layers
+   '(
+     ;; ----------------------------------------------------------------
+     ;; Example of useful layers you may want to use right away.
+     ;; Uncomment some layer names and press <SPC f e R> (Vim style) or
+     ;; <M-m f e R> (Emacs style) to install them.
+     ;; ----------------------------------------------------------------
+     emacs-lisp
+     charlock_holmes
+     escape_utils
+     mime-types
+     rugged
+     minitest
+     mocha
+     plist
+     pry
+     rake
+     yajl-ruby
+     colour-proximity
+     licensed
+     licensee
+   ;; List of additional packages that will be installed without being
+   ;; wrapped in a layer. If you need some configuration for these
+   ;; packages then consider to create a layer, you can also put the
+   ;; configuration in `dotspacemacs/config'.
+   dotspacemacs-additional-packages '()
+   ;; A list of packages and/or extensions that will not be install and loaded.
+   dotspacemacs-excluded-packages '()
+   ;; If non-nil spacemacs will delete any orphan packages, i.e. packages that
+   ;; are declared in a layer which is not a member of
+   ;; the list `dotspacemacs-configuration-layers'
+   dotspacemacs-delete-orphan-packages t))
+
+(defun dotspacemacs/init ()
+  "Initialization function.
+This function is called at the very startup of Spacemacs initialization
+before layers configuration."
+  ;; This setq-default sexp is an exhaustive list of all the supported
+  ;; spacemacs settings.
+  (setq-default
+   ;; Either `vim' or `emacs'. Evil is always enabled but if the variable
+   ;; is `emacs' then the `holy-mode' is enabled at startup.
+   dotspacemacs-editing-style 'vim
+   ;; If non nil output loading progress in `*Messages*' buffer.
+   dotspacemacs-verbose-loading nil
+   ;; Specify the startup banner. Default value is `official', it displays
+   ;; the official spacemacs logo. An integer value is the index of text
+   ;; banner, `random' chooses a random text banner in `core/banners'
+   ;; directory. A string value must be a path to an image format supported
+   ;; by your Emacs build.
+   ;; If the value is nil then no banner is displayed.
+   dotspacemacs-startup-banner 'official
+   ;; List of items to show in the startup buffer. If nil it is disabled.
+   ;; Possible values are: `recents' `bookmarks' `projects'."
+   dotspacemacs-startup-lists '(bookmarks projects recents)
+   ;; List of themes, the first of the list is loaded when spacemacs starts.
+   ;; Press <SPC> T n to cycle to the next theme in the list (works great
+   ;; with 2 themes variants, one dark and one light)
+   dotspacemacs-themes '(
+                         spacemacs-dark
+                         spacemacs-light
+                         solarized-dark
+                         solarized-light
+                         atom-light-ui
+                         atom-dark-ui
+                         atom-material-ui
+                         zenburn
+   ;; If non nil the cursor colour matches the state colour.
+   dotspacemacs-colorize-cursor-according-to-state t
+   ;; Default font. `powerline-scale' allows to quickly tweak the mode-line
+   ;; size to make separators look not too crappy.
+   dotspacemacs-default-font '("Menloco"
+                               :size 11
+                               :weight normal
+                               :width normal
+                               :powerline-scale 1.1)
+   ;; The leader key
+   dotspacemacs-leader-key "SPC"
+   ;; The leader key accessible in `emacs state' and `insert state'
+   dotspacemacs-emacs-leader-key "M-m"
+   ;; Major mode leader key is a shortcut key which is the equivalent of
+   ;; pressing `<leader> m`. Set it to `nil` to disable it.
+   dotspacemacs-major-mode-leader-key ","
+   ;; Major mode leader key accessible in `emacs state' and `insert state'
+   dotspacemacs-major-mode-emacs-leader-key "C-M-m"
+   ;; The command key used for Evil commands (ex-commands) and
+   ;; Emacs commands (M-x).
+   ;; By default the command key is `:' so ex-commands are executed like in Vim
+   ;; with `:' and Emacs commands are executed with `<leader> :'.
+   dotspacemacs-command-key ":"
+   ;; Location where to auto-save files. Possible values are `original' to
+   ;; auto-save the file in-place, `cache' to auto-save the file to another
+   ;; file stored in the cache directory and `nil' to disable auto-saving.
+   ;; Default value is `cache'.
+   dotspacemacs-auto-save-file-location 'cache
+   ;; If non nil then `ido' replaces `helm' for some commands. For now only
+   ;; `find-files' (SPC f f) is replaced.
+   dotspacemacs-use-ido nil
+   ;; If non nil the paste micro-state is enabled. When enabled pressing `p`
+   ;; several times cycle between the kill ring content.
+   dotspacemacs-enable-paste-micro-state nil
+   ;; Guide-key delay in seconds. The Guide-key is the popup buffer listing
+   ;; the commands bound to the current keystrokes.
+   dotspacemacs-guide-key-delay 0.4
+   ;; If non nil a progress bar is displayed when spacemacs is loading. This
+   ;; may increase the boot time on some systems and emacs builds, set it to
+   ;; nil ;; to boost the loading time.
+   dotspacemacs-loading-progress-bar t
+   ;; If non nil the frame is fullscreen when Emacs starts up.
+   ;; (Emacs 24.4+ only)
+   dotspacemacs-fullscreen-at-startup nil
+   ;; If non nil `spacemacs/toggle-fullscreen' will not use native fullscreen.
+   ;; Use to disable fullscreen animations in OSX."
+   dotspacemacs-fullscreen-use-non-native nil
+   ;; If non nil the frame is maximized when Emacs starts up.
+   ;; Takes effect only if `dotspacemacs-fullscreen-at-startup' is nil.
+   ;; (Emacs 24.4+ only)
+   dotspacemacs-maximized-at-startup nil
+   ;; A value from the range (0..100), in increasing opacity, which describes
+   ;; the transparency level of a frame when it's active or selected.
+   ;; Transparency can be toggled through `toggle-transparency'.
+   dotspacemacs-active-transparency 90
+   ;; A value from the range (0..100), in increasing opacity, which describes
+   ;; the transparency level of a frame when it's inactive or deselected.
+   ;; Transparency can be toggled through `toggle-transparency'.
+   dotspacemacs-inactive-transparency 90
+   ;; If non nil unicode symbols are displayed in the mode line.
+   dotspacemacs-mode-line-unicode-symbols t
+   ;; If non nil smooth scrolling (native-scrolling) is enabled. Smooth
+   ;; scrolling overrides the default behavior of Emacs which recenters the
+   ;; point when it reaches the top or bottom of the screen.
+   dotspacemacs-smooth-scrolling t
+   ;; If non-nil smartparens-strict-mode will be enabled in programming modes.
+   dotspacemacs-smartparens-strict-mode nil
+   ;; Select a scope to highlight delimiters. Possible value is `all',
+   ;; `current' or `nil'. Default is `all'
+   dotspacemacs-highlight-delimiters 'all
+   ;; If non nil advises quit functions to keep server open when quitting.
+   dotspacemacs-persistent-server nil
+   ;; List of search tool executable names. Spacemacs uses the first installed
+   ;; tool of the list. Supported tools are `ag', `pt', `ack' and `grep'.
+   dotspacemacs-search-tools '("ag" "pt" "ack" "grep")
+   ;; The default package repository used if no explicit repository has been
+   ;; specified with an installed package.
+   ;; Not used for now.
+   dotspacemacs-default-package-repository nil
+
+   ;; If non nil line numbers are turned on in all `prog-mode' and `text-mode'
+   ;; derivatives. If set to `relative', also turns on relative line numbers.
+   ;; (default nil)
+   dotspacemacs-line-numbers 'relative
+
+   ;; Delete whitespace while saving buffer. Possible values are `all',
+   ;; `trailing', `changed' or `nil'. Default is `changed' (cleanup whitespace
+   ;; on changed lines) (default 'changed)
+   dotspacemacs-whitespace-cleanup 'changed
+   )
+  ;; User initialization goes here
+  )
+
+(defun dotspacemacs/user-config ()
+  "Configuration function.
+ This function is called at the very end of Spacemacs initialization after
+layers configuration."
+  (add-hook 'alchemist-mode-hook 'company-mode)
+
+  (add-hook 'projectile-mode-hook 'projectile-rails-on)
+  (setq ruby-insert-encoding-magic-comment nil)
+
+  (setq web-mode-markup-indent-offset 2)
+  (setq web-mode-code-indent-offset 2)
+
+  (spacemacs/toggle-golden-ratio-on)
+  (spacemacs/toggle-indent-guide-globally-on)
+  (spacemacs/toggle-centered-point-globally-on)
+)
+
+;; Do not write anything past this comment. This is where Emacs will
+;; auto-generate custom variable definitions.
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+)
--- a/samples/Filebench
+++ b/samples/Filebench
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+set $dir=/tmp
+set $nfiles=1000
+set $meandirwidth=20
+set $meanfilesize=16k
+set $iosize=1m
+set $nthreads=1
+
+set mode quit firstdone
+
+define fileset name=bigfileset,path=$dir,size=$meanfilesize,entries=$nfiles,dirwidth=$meandirwidth,prealloc=100,paralloc
+define fileset name=destfiles,path=$dir,size=$meanfilesize,entries=$nfiles,dirwidth=$meandirwidth
+
+define process name=filereader,instances=1
+{
+  thread name=filereaderthread,memsize=10m,instances=$nthreads
+  {
+    flowop openfile name=openfile1,filesetname=bigfileset,fd=1
+    flowop readwholefile name=readfile1,fd=1,iosize=$iosize
+    flowop createfile name=createfile2,filesetname=destfiles,fd=2
+    flowop writewholefile name=writefile2,fd=2,srcfd=1,iosize=$iosize
+    flowop closefile name=closefile1,fd=1
+    flowop closefile name=closefile2,fd=2
+  }
+}
+
+echo  "Copyfiles Version 3.0 personality successfully loaded"
--- a/samples/Python/spec.linux.spec
+++ b/samples/Python/spec.linux.spec
@@ -0,0 +1,22 @@
+a = Analysis(['portablizer.pyqt4.py'],
+             hiddenimports=[],
+             hookspath=None,
+             runtime_hooks=None)
+pyz = PYZ(a.pure)
+exe = EXE(pyz,
+          a.scripts,
+          exclude_binaries=True,
+          name='Portablizer',
+          debug=False,
+          strip=None,
+          upx=True,
+          console=False)
+node = Tree('node', prefix='node')
+collect = COLLECT(exe,
+                  a.binaries,
+                  a.zipfiles,
+                  a.datas,
+                  node,
+                  strip=None,
+                  upx=True,
+                  name='Portablizer')
--- a/Spec/apache.spec
+++ b/Spec/apache.spec
@@ -0,0 +1,673 @@
+%define _prefix /usr/local
+%define _mandir /usr/local/man
+%define _sysconfdir /etc
+
+%define apache_ver      1.3.42
+%define mod_ssl_ver     2.8.31
+%define	mod_perl_ver    1.31
+%define	libapreq_ver    1.34
+
+
+%define aname           apache
+%define pname           httpd13
+%define contentdir      %{_var}/www
+%define suexec_caller   apache
+
+Summary:       The 1.x Apache webserver (with static mod_perl, mod_ssl)
+Name:          apache
+Version:       %{apache_ver}
+Release:       4%{?dist}
+License:       Apache Software License 2.0
+URL:           http://httpd.apache.org/
+Group:         System Environment/Daemons
+
+Requires:      initscripts >= 3.25
+Requires:      openssl >= 0.9.6
+
+BuildRequires: openssl-devel mm-devel krb5-devel pkgconfig 
+BuildRequires: perl-ExtUtils-MakeMaker perl-libwww-perl perl-HTML-Parser perl-ExtUtils-Embed
+BuildRequires: gdbm-devel flex 
+Requires:      /sbin/chkconfig /bin/mktemp /usr/sbin/useradd
+Requires:      findutils procps
+
+Provides:      webserver
+Provides:      mod_perl = %{mod_perl_ver}
+Provides:      perl(mod_perl) = %{mod_perl_ver}
+Provides:      mod_ssl = %{mod_ssl_ver}
+Provides:      apache = %{apache_ver}
+
+Source0:       http://httpd.apache.org/dist/apache_%{apache_ver}.tar.bz2
+Source1:       http://www.modssl.org/source/mod_ssl-%{mod_ssl_ver}-%{apache_ver}.tar.gz
+Source2:       http://perl.apache.org/dist/mod_perl-%{mod_perl_ver}.tar.gz
+Source3:       httpd.init
+Source4:       apache.logrotate
+Source5:       SSL-Certificate-Creation
+Source6:       ftp://ftp.cpan.org/authors/id/J/JO/JOESUF/libapreq-%{libapreq_ver}.tar.gz
+
+Patch0:        sslcfg.patch
+Patch1:        apache_1.3.39-config.patch
+Patch3:        apache_1.3.39-Makefile.patch
+Patch5:        apache_1.3.20-apachectl-init.patch
+Patch11:       mod_ssl-2.8.4-openssl.patch
+Patch12:       apache_1.3.42-db.patch
+Patch13:       apache-1.3.39-gcc44.patch
+Patch14:       mod_ssl-2.8.31-STACK.patch
+Patch15:       apache_1.3.39-ap_getline.patch
+Patch16:       mod_ssl-openssl-x86_64.patch
+Patch17:       mp1+perl5.14.diff
+Patch18:       apache_1.3.42-64bits.patch
+
+
+%description
+This package contains a powerful, full-featured, efficient, and
+freely-available Web server based on work done by the Apache Software
+Foundation. It is also the most popular Web server on the Internet.
+
+------------------------------------------------------------------------------
+This package is a custom release containing the httpd server (v%{apache_ver})
+bundled with: mod_perl v.%{mod_ssl_ver},
+and mod_ssl v%{mod_ssl_ver}, all BUILT-IN.
+------------------------------------------------------------------------------
+
+	The Apache/Perl integration project brings together the full power
+of the Perl programming language and the Apache HTTP server.
+	With mod_perl it is possible to write Apache modules entirely in Perl.
+In addition, the persistent interpreter embedded in the server avoids the
+overhead of starting an external interpreter and the penalty of Perl
+start-up time.
+	Mod_SSL provides strong cryptography for the Apache 1.3 webserver
+via the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security
+(TLSv1) protocols by the help of the Open Source SSL/TLS toolkit OpenSSL.
+
+
+%package devel
+Group:         Development/Libraries
+Summary:       Module development tools for apache-mod_ssl
+Provides:      eapi = %{mod_ssl_ver}
+Requires:      %{name} = %{version}
+Provides:      mod_perl-devel = %{mod_perl_ver}
+Provides:      mod_ssl-devel = %{mod_ssl_ver}
+Provides:      apache-devel = %{apache_ver}
+
+%description devel
+The apache-devel package contains the APXS binary and other files
+that you need to build Dynamic Shared Objects (DSOs) for Apache.
+If you are installing the Apache Web server and you want to be able
+to compile or develop additional modules for Apache, you need to install
+this package.
+
+
+%package manual
+Group:         Documentation
+Summary:       Documentation for the Apache Web server
+
+%description manual
+The apache-manual package contains the complete manual and reference
+guide for the Apache Web server.
+It also contains the basic web content (icons, default welcome messages,
+etc) provided with Apache's HTTPD distribution.
+
+
+%prep 
+%setup -q -c -T -n %{name}-%{version} -a 0
+%setup -q -c -T -D -n %{name}-%{version} -a 1
+%setup -q -c -T -D -n %{name}-%{version} -a 2
+%setup -q -c -T -D -n %{name}-%{version} -a 6
+
+pushd %{aname}_%{apache_ver}
+%patch0 -p0 -b .sslcfg
+%patch1 -p1 -b .config
+%patch3 -p0 -b .make
+%patch5 -p1 -b .apachectl-init
+%ifarch x86_64
+%patch18 -p1 -b .apache-x86_64
+%endif
+
+#patch12 -p1 -b .dbmdb
+%patch13 -p1 -b .compile
+%patch15 -p0 -b .ap_getline
+
+
+patch -p0 < ../libapreq-%{libapreq_ver}/patches/apache-1.3+apreq.patch
+cp ../libapreq-%{libapreq_ver}/c/*.[ch] src/lib/apreq/
+popd
+
+pushd mod_ssl-%{mod_ssl_ver}-%{apache_ver}
+%patch11 -p1 -b .openssl
+%patch14 -p0 -b .stack
+%ifarch x86_64
+%patch16 -p1 -b .openssl-x86_64
+%endif
+popd
+
+pushd mod_perl-%{mod_perl_ver}
+%patch17 -p1 -b .mp1+perl5.14.diff
+popd
+
+# Substitute values to match the configuration.  The first two are
+# for the default httpd.conf file, the rest is for the mod_ssl
+# additions.
+pushd %{aname}_%{apache_ver}
+sed -e 's,@@ServerRoot@@,%{_sysconfdir}/%{pname},g' \
+    -e 's,@@ContentRoot@@,%{contentdir},g' \
+    -e 's,^DocumentRoot "@@ContentRoot@@",#DocumentRoot "%{_sysconfdir}/%{pname}/htdocs",g' \
+    -e 's,^<Directory "@@ContentRoot@@/cgi-bin">,<Directory "%{contentdir}/cgi-bin">,g' \
+    -e 's,^ServerName new.host.name,#ServerName new.host.name,g' \
+    -e 's,^ServerAdmin you@your.address,#ServerAdmin you@your.address,g' \
+    -e 's,^SSLCipherSuite,#SSLCipherSuite,g' \
+    -e 's,^SSLLogLevel info,SSLLogLevel error,g' \
+    -e 's,^SSLSessionCache         dbm:logs/ssl_scache,SSLSessionCache         shm:logs/ssl_scache(512000),g' \
+    conf/httpd.conf-dist > conf/httpd.conf
+popd
+
+cp %{SOURCE5} .
+
+#cp %{_tmppath}/rpm-tmp* /tmp/01prep.sh
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS -fPIC $(pkg-config --cflags openssl)"
+export LIBS="-lpthread"
+export EAPI_MM=SYSTEM
+
+###############################################
+echo mod_perl ...
+pushd mod_perl-%{mod_perl_ver}
+  perl Makefile.PL CCFLAGS="$RPM_OPT_FLAGS -fPIC" \
+    APACHE_SRC=../%{aname}_%{apache_ver}/src \
+    DO_HTTPD=1 USE_APACI=1 PREP_HTTPD=1 EVERYTHING=1
+  make %{?_smp_mflags}
+  ## put mod_perl docs in a safe place ;-]~
+  mkdir mod_perl-doc
+  cp -a eg/ faq/ mod_perl-doc/
+  cp {CREDITS,LICENSE,README,SUPPORT,STATUS,Changes,INSTALL*} mod_perl-doc/
+  cp *.{pod,html,gif} mod_perl-doc/
+  find mod_perl-doc -type f -exec chmod 644 {} \;
+popd
+
+###############################################
+echo mod_ssl ...
+export SSL_COMPAT=yes
+export SSL_EXPERIMENTAL=yes
+pushd mod_ssl-%{mod_ssl_ver}-%{apache_ver}
+  ./configure --with-apache=../apache_%{apache_ver} \
+    --with-mm=SYSTEM --force
+popd
+
+###############################################
+echo apache ...
+pushd %{aname}_%{apache_ver}
+  ./configure \
+ 	--prefix=%{_prefix} \
+ 	--exec-prefix=%{_prefix} \
+ 	--bindir=%{_bindir} \
+ 	--sbindir=%{_sbindir} \
+ 	--mandir=%{_mandir} \
+	--sysconfdir=%{_sysconfdir}/%{pname}/conf \
+	--libexecdir=%{_libdir}/apache \
+	--datadir=%{contentdir} \
+	--iconsdir=%{contentdir}/icons \
+	--htdocsdir=%{contentdir}/html \
+	--manualdir=%{contentdir}/html/manual \
+	--cgidir=%{contentdir}/cgi-bin \
+ 	--localstatedir=%{_localstatedir} \
+	--runtimedir=%{_sysconfdir}/%{pname}/run \
+	--logfiledir=logs \
+	--proxycachedir=%{_localstatedir}/cache/%{pname} \
+	--with-perl=%{__perl} \
+	--enable-rule=EAPI \
+	--enable-rule=SSL_COMPAT \
+	--enable-rule=SSL_EXPERIMENTAL \
+	--disable-rule=SSL_VENDOR \
+	--disable-rule=WANTHSREGEX \
+	--disable-rule=EXPAT \
+	%{?_with_backtrace:--activate-module=src/modules/experimental/mod_backtrace.c} \
+	%{?_with_whatkilledus:--activate-module=src/modules/experimental/mod_whatkilledus.c} \
+	--activate-module=src/modules/perl/libperl.a \
+	--enable-module=auth_dbm \
+	--enable-module=ssl \
+	--enable-module=all \
+	--enable-shared=max \
+	--disable-shared=perl \
+	--disable-shared=ssl \
+	--disable-module=example \
+	--disable-module=auth_db \
+	--without-execstrip \
+	%{?_with_suexec:--enable-suexec --suexec-docroot=%{contentdir}} \
+	%{?_with_suexec:--suexec-uidmin=300 --suexec-gidmin=300} \
+	%{?_with_suexec:--suexec-umask=022 --suexec-caller=%{suexec_caller}}
+
+  make %{?_smp_mflags}
+
+popd
+#cp %{_tmppath}/rpm-tmp* /tmp/02build.sh
+
+%install
+###############################################################################
+### install basic apache stuff
+pushd apache_%{apache_ver}
+  make install root="$RPM_BUILD_ROOT"
+popd
+
+### rename 
+mv $RPM_BUILD_ROOT%{_sbindir}/httpd $RPM_BUILD_ROOT%{_sbindir}/%{pname}
+
+### install SYSV init stuff
+mkdir -p $RPM_BUILD_ROOT%{_initrddir}
+install -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/%{pname}
+
+### install log rotation stuff
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
+install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/apache
+
+### default rootdir links
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{pname}
+pushd $RPM_BUILD_ROOT%{_sysconfdir}/%{pname}
+	ln -s %{_localstatedir}/log/%{pname} logs
+	ln -s %{_libdir}/%{aname} modules
+	ln -s %{_localstatedir}/run run
+popd
+
+### replace Apache's default config file with our patched version
+install -m644 apache_%{apache_ver}/conf/httpd.conf \
+	$RPM_BUILD_ROOT%{_sysconfdir}/%{pname}/conf/httpd.conf
+
+# fix up apxs so that it doesn't think it's in the build root
+perl -pi -e "s^$RPM_BUILD_ROOT^^g" $RPM_BUILD_ROOT%{_sbindir}/apxs
+
+# fixup the documentation file naming
+find $RPM_BUILD_ROOT%{contentdir} -name "*.html.html" | xargs rename .html.html .html
+
+###############################################################################
+### install mod_perl files
+pushd mod_perl-%{mod_perl_ver}
+  export PERL_INSTALL_ROOT=$RPM_BUILD_ROOT 
+  make pure_install PREFIX=/usr INSTALLDIRS=vendor
+
+  # convert man pages to UTF-8
+  recode() {
+    iconv -f "$2" -t utf-8 < "$1" > "${1}_"
+    %{__mv} -f "${1}_" "$1"
+  }
+  pushd $RPM_BUILD_ROOT/usr/share/man/man3/
+	for i in * ; do
+		recode "${i}" iso-8859-1
+	done
+  popd
+
+  # fix files mod
+  find $RPM_BUILD_ROOT%{perl_vendorarch} -iname '*.pm' -exec chmod 0644 {} \;
+
+  # bake web docs...
+  mkdir -p $RPM_BUILD_ROOT%{contentdir}/html/manual/mod/mod_perl
+  install -c -m 644 htdocs/manual/mod/mod_perl.html \
+        $RPM_BUILD_ROOT%{contentdir}/html/manual/mod/mod_perl/
+  make -C faq
+  rm -f faq/pod2htm*
+  install -m644 faq/*.html \
+    $RPM_BUILD_ROOT%{contentdir}/html/manual/mod/mod_perl/
+
+popd
+
+# remove special perl files this is specific for rpms , already have in own .packlist
+find $RPM_BUILD_ROOT%{perl_vendorarch}/.. -name perllocal.pod -o -name .packlist \
+    -o -name '*.bs' | xargs -r -i rm -f {}
+
+### ssl leftovers
+# point to the right makefile.
+ln -sf ../../../etc/pki/tls/certs/Makefile $RPM_BUILD_ROOT%{_sysconfdir}/%{pname}/conf
+# create a prototype session cache
+touch $RPM_BUILD_ROOT%{_localstatedir}/cache/ssl_gcache_data.{dir,pag,sem}
+
+# drop shellbang from .exp files
+for exp in $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Apache/mod_perl.exp $RPM_BUILD_ROOT%{_libdir}/%{aname}/httpd.exp
+do
+	sed -i '/^#!/ d' $exp
+done
+
+#cp %{_tmppath}/rpm-tmp* /tmp/03install.sh
+
+%post
+/sbin/chkconfig --add %{pname}
+/sbin/ldconfig
+
+# safely build a test certificate
+umask 077
+if [ ! -f %{_sysconfdir}/%{pname}/conf/ssl.key/server.key ] ; then
+openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024 > %{_sysconfdir}/%{pname}/conf/ssl.key/server.key 2> /dev/null
+fi
+
+if [ ! -f %{_sysconfdir}/%{pname}/conf/ssl.crt/server.crt ] ; then
+cat << EOF | openssl req -new -key %{_sysconfdir}/%{pname}/conf/ssl.key/server.key -x509 -days 365 -out %{_sysconfdir}/%{pname}/conf/ssl.crt/server.crt 2>/dev/null
+--
+SomeState
+SomeCity
+SomeOrganization
+SomeOrganizationalUnit
+localhost.localdomain
+root@localhost.localdomain
+EOF
+fi
+
+# safely add .htm to mime types if it is not already there
+[ -f %{_sysconfdir}/mime.types ] || exit 0
+TEMPTYPES=`/bin/mktemp /tmp/mimetypes.XXXXXX`
+[ -z "$TEMPTYPES" ] && {
+  echo "could not make temporary file, htm not added to %{_sysconfdir}/mime.types" >&2
+  exit 1
+}
+( grep -v "^text/html"  %{_sysconfdir}/mime.types
+  types=$(grep "^text/html" %{_sysconfdir}/mime.types | cut -f2-)
+  echo -en "text/html\t\t\t"
+  for val in $types ; do
+      if [ "$val" = "htm" ] ; then
+          continue
+      fi
+      echo -n "$val "
+  done
+  echo "htm"
+) > $TEMPTYPES
+cat $TEMPTYPES > %{_sysconfdir}/mime.types && /bin/rm -f $TEMPTYPES
+
+cp %{_tmppath}/rpm-tmp* /tmp/04post.sh
+
+%pre
+# Add the "apache" user
+/usr/sbin/useradd -c "Apache" -u 48 \
+	-s /sbin/nologin -r -d "%{contentdir}" apache 2> /dev/null || :
+
+%preun
+if [ $1 = 0 ]; then
+	if [ -f /var/lock/subsys/%{pname} ]; then
+		%{_initrddir}/%{pname} stop
+	fi
+	if [ -f %{_initrddir}/%{pname} ]; then
+		/sbin/chkconfig --del %{pname}
+	fi
+fi
+
+%files
+%defattr(-,root,root)
+%dir %{_sysconfdir}/%{pname}
+%dir %{_sysconfdir}/%{pname}/conf
+%config(noreplace) %{_sysconfdir}/%{pname}/conf/*.conf
+%config(noreplace) %{_sysconfdir}/%{pname}/conf/Makefile
+%config(noreplace) %{_sysconfdir}/%{pname}/conf/magic
+%config(noreplace) %{_sysconfdir}/%{pname}/conf/mime.types
+%config(noreplace) %{_sysconfdir}/logrotate.d/*
+%config(noreplace) %{_sysconfdir}/%{pname}/conf/ssl.*
+%doc %{_sysconfdir}/%{pname}/conf/*.default
+%attr(755,root,root) %{_initrddir}/*
+%{_sysconfdir}/%{pname}/logs
+%{_sysconfdir}/%{pname}/modules
+%{_sysconfdir}/%{pname}/run
+%{_libdir}/%{aname}
+%{perl_vendorarch}/Apache
+%{perl_vendorarch}/Bundle
+%{perl_vendorarch}/*.pm
+%{perl_vendorarch}/*.PL
+%dir %{perl_vendorarch}/auto/Apache
+%{perl_vendorarch}/auto/Apache/Leak
+%{perl_vendorarch}/auto/Apache/Symbol
+%{perl_vendorarch}/auto/Apache/mod_perl.exp
+%{perl_vendorarch}/auto/Apache/typemap
+%attr(0755,root,root) %{_bindir}/*
+%attr(0755,root,root) %{_sbindir}/ab
+%attr(0755,root,root) %{_sbindir}/apachectl
+%attr(0755,root,root) %{_sbindir}/httpd13
+%attr(0755,root,root) %{_sbindir}/logresolve
+%attr(0755,root,root) %{_sbindir}/rotatelogs
+%{?_with_suexec:%attr(4710,root,%{suexec_caller}) %{_sbindir}/suexec}
+%{_mandir}/man1*/*
+%{_mandir}/man8/ab.8*
+%{_mandir}/man8/apachectl.8*
+%{_mandir}/man8/httpd.8*
+%{_mandir}/man8/logresolve.8*
+%{_mandir}/man8/rotatelogs.8*
+%{?_with_suexec:%{_mandir}/man8/suexec.8*}
+%attr(0755,apache,root) %dir %{_localstatedir}/cache/%{pname}
+%attr(0640,apache,root) %{_localstatedir}/cache/ssl_*
+%attr(0750,root,apache) %dir %{_localstatedir}/log/%{pname}
+
+
+%files devel
+%defattr(-,root,root)
+%{_includedir}
+%attr(0755,root,root) %{_sbindir}/apxs
+%{_mandir}/man8/apxs.8*
+%doc %{perl_vendorarch}/*.pod
+%{perl_vendorarch}/auto/Apache/include
+
+%files manual
+%defattr(-,root,root)
+%doc apache_%{apache_ver}/cgi-bin
+%dir %{contentdir}
+%dir %{contentdir}/cgi-bin
+%config(noreplace) %{contentdir}/cgi-bin/*
+%dir %{contentdir}/html
+%config(noreplace) %{contentdir}/html/*.html*
+%config(noreplace) %{contentdir}/html/*.gif
+%dir %{contentdir}/icons
+%dir %{contentdir}/icons/small
+%config(noreplace) %{contentdir}/icons/*.*
+%config(noreplace) %{contentdir}/icons/small/*.*
+%doc %{contentdir}/icons/README
+
+%doc apache_%{apache_ver}/{ABOUT_APACHE,LICENSE*,NOTICE,README*,cgi-bin}
+%doc apache_%{apache_ver}/src/{CHANGES,README}*
+%doc mod_ssl-%{mod_ssl_ver}-%{apache_ver}/README.*
+%doc mod_ssl-%{mod_ssl_ver}-%{apache_ver}/NEWS
+%doc mod_perl-%{mod_perl_ver}/mod_perl-doc
+%doc SSL-Certificate-Creation
+
+%doc %{contentdir}/html/manual
+%exclude %{contentdir}/html/manual/mod/mod_ssl/ssl_cover.wml
+#man3 conflicts with mod_perl2
+/usr/share/man/man3*/*
+
+
+%changelog
+* Sun May 13 2012 Sérgio Basto <sergio@serjux.com> - 1.3.42-4
+- Many improvements on defaults directories 
+- Separate libapreq in other package, to compile libapreq is need other sources installed. 
+- more cleanups.
+
+* Wed Nov 16 2011 Sérgio Basto <sergio@serjux.com>
+- build for F16
+- mp1+perl5.14.diff (mod_perl1 + perl5.14)
+- many improvents.
+
+* Sat Oct 29 2011 Sérgio Basto <sergio@serjux.com>
+- mock build add many buildrequires
+- many improvemts on confs 
+
+* Tue Oct 16 2007 Sérgio Basto <sergio@serjux.com>
+- UNDROPPED CONFIGURATION COMPLETELY: rpm it suposed do all alone.
+- rename httpd to http13 to work independently of apache 2.2
+- add patch to Makefile.tmp, resolve all problems at once
+- change server port number to run out of the box.
+- Update link to certs/Makefile.
+
+* Tue Sep 11 2007 Marius FERARU <altblue@n0i.net> - 1.3.39-1.n0i.23.MPSSL
+- apache 1.3.39
+- mod_ssl 2.8.29
+
+* Mon Apr 02 2007 Marius FERARU <altblue@n0i.net> - 1.3.37-3.n0i.22.MPSSL
+- mod_perl 1.30
+- initscript: use a "$pidfile" variable for all operations
+- initscript: added a dummy "alias" for "reload" (will do a 'restart'!)
+- initscript: added missing "fullstatus" option (will run through "apachectl")
+- dropped shellbang from .exp files
+- dropped 2 explicit provides (mod_perl and Apache::Constants)
+
+* Fri Sep 08 2006 Marius FERARU <altblue@n0i.net> - 1.3.37-2.n0i.21.MPSSL
+- BR: gdbm-devel, db4-devel
+
+* Mon Aug 21 2006 Marius FERARU <altblue@n0i.net> - 1.3.37-1.n0i.20.MPSSL
+- apache 1.3.37
+- mod_ssl 2.8.28
+- Dist macro
+- URL update
+- updated description
+- spec cleanups
+- use "--with backtrace" to activate "mod_backtrace"
+- use "--with whatkilledus" to activate "mod_whatkilledus"
+- use "--with suexec" to activate suexec functionality
+- moved default web content into documentation package
+
+* Tue Jun 06 2006 Marius FERARU <altblue@n0i.net> - 1.3.36-2.n0i.19.MPSSL
+- changed "runtimedir" and "logfiledir" to relative paths,
+  letting users run apache on their own
+
+* Tue Jun 06 2006 Marius FERARU <altblue@n0i.net> - 1.3.36-1.n0i.19.MPSSL
+- apache 1.3.36
+- mod_ssl version 2.8.27
+- spec cleanups
+
+* Mon Mar 13 2006 Marius FERARU <altblue@n0i.net> - 1.3.34-2.n0i.18.MPSSL
+- rebuild
+
+* Thu Nov 24 2005 Marius FERARU <altblue@n0i.net> 1.3.34-1.n0i.17.MPSSL
+- apache 1.3.34
+- mod_ssl version 2.8.25
+
+* Tue Sep 20 2005 Marius FERARU <altblue@n0i.net> 1.3.33-5.n0i.16.MPSSL
+- mod_ssl version 2.8.24
+
+* Fri Sep 02 2005 Marius FERARU <altblue@n0i.net> 1.3.33-4.n0i.15.MPSSL
+- rebuild
+- dropped more requirements (which Fedora considers to "always have")
+
+* Sat Jul 23 2005 Marius FERARU <altblue@n0i.net> 1.3.33-3.n0i.14.MPSSL
+- dropped Epoch
+- changed Summary and Description
+- rebuild (perl 5.8.7)
+
+* Tue Jan 04 2005 Marius FERARU <altblue@n0i.net> 1.3.33-2.n0i.13.MPSSL
+- libapreq version 1.33
+
+* Mon Dec 06 2004 Marius FERARU <altblue@n0i.net> 1.3.33-1.n0i.12.MPSSL
+- apache version 1.3.33
+- mod_ssl version 2.8.22
+- description update
+
+* Tue Aug 17 2004 Marius FERARU <altblue@n0i.net> 1.3.31-5.n0i.11.MPSSL
+- mod_ssl version 2.8.19
+
+* Thu Jul 15 2004 Marius FERARU <altblue@n0i.net> 1.3.31-4.n0i.10.MPSSL
+- mod_ssl version 2.8.18
+
+* Tue Jul 13 2004 Marius FERARU <altblue@n0i.net> 1.3.31-3.n0i.9.MPSSL
+- tweaked rotatelog's build: drop linking with apache libs
+
+* Tue Jul 13 2004 Marius FERARU <altblue@n0i.net> 1.3.31-2.n0i.8.MPSSL
+- applied some fixing patches from current CVS version
+
+* Thu May 13 2004 Marius FERARU <altblue@n0i.net> 1.3.31-1.n0i.7.MPSSL
+- apache version 1.3.31
+- mod_ssl version 2.8.17
+- updated apxs patch
+- slight spec tweaks
+- enabled backtrace experimental module
+- updated config patch
+
+* Fri Apr 30 2004 Marius Feraru <altblue@n0i.net> 1.3.29-6.n0i.6.MPSSL
+- automatic rebuild
+
+* Thu Apr 22 2004 Marius FERARU <altblue@n0i.net> 1.3.29-5.n0i.5.MPSSL
+- rebuild (perl 5.8.4)
+
+* Tue Feb 10 2004 Marius FERARU <altblue@n0i.net> 1.3.29-4.n0i.4.MPSSL
+- fixed the shameful bugs from my httpd.init script
+
+* Fri Jan 23 2004 Marius FERARU <altblue@n0i.net> 1.3.29-3.n0i.3.MPSSL
+- rebuild (perl 5.8.3)
+
+* Fri Jan 16 2004 Marius FERARU <altblue@n0i.net> 1.3.29-2.n0i.2.MPSSL
+- rebuilt on perl 5.8.2 / Fedora 1 Devel (tobe FC2)
+- finally clearly enabled modperl.c in apache_1.3.23-config.patch
+as many helpless people seem to use this dumb default configuration file :(
+- also updated the same patch to properly define SSL too :)
+- added a lame "MPSSL" extra tag in release to make people understand this
+is a !SPECIAL! apache + mod_perl + mod_ssl + libapreq package suite!!!
+- updated init script to do "real" server shutdown (in squid style) and to NOT
+shutdown all the apache servers, just the one started with /var/run/httpd.pid
+- added USE_MODULEARGS=[yes/no] and SHUTDOWN_TIMEOUT=[seconds] configuration
+parameters to init script
+
+* Thu Nov 13 2003 Marius FERARU <altblue@n0i.net> 1.3.29-1.n0i.1
+- apache 1.3.29
+- modssl 2.8.16
+- dropped zombie patch
+- dropped fderr patch
+- dropped for good thttpd conflict note as THERE IS NO CONFLICT!!! In fact
+we really use them both for long time without a problem :))
+- added more Prereq stuff
+- more Fedora style spec updates
+
+* Thu Oct 16 2003 Marius FERARU <altblue@n0i.net> 1.3.28-2.n0i
+- mod_perl 1.29
+- libapreq 1.3
+- replaced ALL direct 'etc' occurences to macros (some for other stuff)
+- perl %%files are now more properly quested.
+- switched krb5-config to pkg-config
+- switched textutils to coreutils
+- using mm 1.3
+- disabled internal expat linking
+- added the 'zombie' patch
+- added the 'file descriptors are erroneously closed' patch
+
+* Mon Jul 28 2003 Marius FERARU <altblue.net> 1.3.28-1.n0i
+- mod_perl 1.28
+- added builtin libapreq
+
+* Fri Jul 25 2003 Marius FERARU <altblue@n0i.net> 1.3.28-0.n0i
+- apache version 1.3.28
+- mod_ssl version 2.8.15
+- switched the old dbm-gdbm patch with a more elegant one (apache_1.3.27-db);
+yet, more tests are to be done on other systems before dropping the old one
+from our src.rpm
+- disabled suexec SSL env support patch as Apache ppl changed their code heavily
+and I do not yet have time to update this patch
+- moved mod_perl header files into apache-devel (are they needed by someone?!)
+- dropped using RPM_SOURCE_DIR/<filename> stuff.
+- disabled auth_db module (db4 API changes?!)
+
+* Mon Apr 21 2003 Marius FERARU <altblue@n0i.net> 1.3.27-2.n0i
+- automatic rebuild on RHL9
+
+* Wed Mar 26 2003 Marius FERARU <altblue@n0i.net> 1.3.27-1.n0i
+- mod_ssl version 2.8.14
+- dropped thttpd conflict note as THERE IS NO CONFLICT!!! In fact we really
+use them both :))
+
+* Fri Oct 18 2002 Marius Feraru <altblue@n0i.net>
+- apache version 1.3.27
+- mod_ssl version 2.8.11
+- eliminated db4 patch
+- disabled thttpd conflict flag
+
+* Tue Sep 24 2002 Marius Feraru <altblue@n0i.net>
+- automatic rebuild (to conform with the openssl update)
+
+* Wed Sep  4 2002 Marius Feraru <altblue@n0i.net>
+- some spec cleanups (rpm 4.1.x compatibility)
+
+* Tue Jul 23 2002 Marius FERARU <altblue@n0i.net>
+- apache 1.3.26
+- mod_perl 1.27
+- mod_ssl 2.8.10
+- lots of new tweaks to the spec file (hopefully it will be easier now for others to
+rebuild this package =] )
+
+
+* Sat Sep 1 2001 Marius FERARU <altblue@n0i.net>
+- updated apache to 1.3.22
+- reparsed and tweaked all RedHat patches
+- lots of spec file tweaks: optimisations,
+  file location/integration/modes fixes...
+
+* Sat Sep 1 2001 Marius FERARU <altblue@n0i.net>
+- updated mod_perl to version 1.26
+- based on apache-1.3.20-15.src.rpm from Red Hat RawHide
+- used apache_modperl-1.3.19-1.24-1.src.rpm from
+  perl.apache.org as example spec.
--- a/Spec/erlang-erlydtl.spec
+++ b/Spec/erlang-erlydtl.spec
@@ -0,0 +1,62 @@
+%global debug_package %{nil}
+
+Name:           erlang-erlydtl
+Version:        0.6.0
+Release:        1%{?dist}
+Summary:        Erlang implementation of the Django Template Language.
+
+Group:          Development/Libraries
+License:        MIT
+URL:            http://code.google.com/p/erlydtl/
+Source0:        http://erlydtl.googlecode.com/files/erlydtl-0.6.0.tar.gz
+Patch0:         erlang-erlydtl-0.6.0-tests.patch
+Patch1:         erlang-erlydtl-0.6.0-r14a.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Provides:       ErlyDTL = %{version}-%{release}
+BuildRequires:  erlang
+Requires:       erlang
+
+%description
+ErlyDTL is an Erlang implementation of the Django Template Language. The
+erlydtl module compiles Django Template source code into Erlang bytecode. The
+compiled template has a "render" function that takes a list of variables and
+returns a fully rendered document
+
+%prep
+%setup -q -n erlydtl-%{version}
+find examples/ -type f -executable -exec chmod -x {} \;
+
+%patch0 -p0
+%patch1 -p0
+
+%build
+make %{?_smp_mflags}
+
+%check
+make test
+
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/%{_libdir}/erlang/lib/erlydtl-%{version}/
+cp -r ebin     %{buildroot}/%{_libdir}/erlang/lib/erlydtl-%{version}/
+cp -r bin      %{buildroot}/%{_libdir}/erlang/lib/erlydtl-%{version}/
+cp -r priv     %{buildroot}/%{_libdir}/erlang/lib/erlydtl-%{version}/
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%dir %{_libdir}/erlang/lib/erlydtl-%{version}  
+%{_libdir}/erlang/lib/erlydtl-%{version}/*
+%doc README
+%doc examples
+
+
+%changelog
+* Sun Aug 1 2010 Ilia Cheishvili <ilia.cheishvili@gmail.com> - 0.6.0-1
+- Initial Package
--- a/Spec/manos.spec
+++ b/Spec/manos.spec
@@ -0,0 +1,46 @@
+#
+# spec file for package manos
+#
+# Copyright (c) 2010 Jackson Harper (jackson@novell.com)
+#
+#
+
+Name:           manos-devel
+Version:        0.1.1
+Release:        1
+License:        MIT/X11
+BuildRoot:      %{_tmppath}/manos-%{version}-build
+BuildRequires:  mono-devel >= 2.6
+BuildRequires:  mono-nunit >= 2.6
+Source0:        manos-%{version}.tar.bz2
+Source1:        rpmlintrc
+Summary:        The Manos Web Application Framework
+Group:          Development/Web/Servers
+BuildArch:      noarch
+
+%description
+Manos is an easy to use, easy to test, high performance web application framework that stays out of your way and makes your life ridiculously simple.
+
+%files
+%defattr(-, root, root)
+%{_prefix}/lib/manos
+%{_bindir}/manos
+%{_datadir}/manos
+%{_prefix}/lib/pkgconfig/manos.pc
+%{_datadir}/man/man1/manos.1.gz
+
+%prep
+%setup -q -n manos-%{version}
+
+
+%build
+./configure --prefix=%{buildroot}%{_prefix} --install-prefix=%{_prefix}
+make
+
+%install
+make install
+
+%clean
+rm -rf %{buildroot}
+
+%changelog
--- a/samples/Ruby/any.spec
+++ b/samples/Ruby/any.spec
@@ -0,0 +1,44 @@
+require File.dirname(File.expand_path(__FILE__)) + '/../spec_helper'
+
+describe Spira::Types::Any do
+
+  before :all do
+    @uri = RDF::URI('http://example.org')
+  end
+
+  # this spec is going to be necessarily loose.  The 'Any' type is defined to
+  # use RDF.rb's automatic RDF Literal boxing and unboxing, which may or may
+  # not change between verions.
+  #
+  context "when serializing" do
+    it "should serialize literals to RDF Literals" do
+      serialized = Spira::Types::Any.serialize(15)
+      serialized.should be_a RDF::Literal
+      serialized = Spira::Types::Any.serialize("test")
+      serialized.should be_a RDF::Literal
+    end
+
+    it "should keep RDF::URIs as URIs" do
+      Spira::Types::Any.serialize(@uri).should == @uri
+    end
+
+    it "should fail to serialize collections" do
+      lambda { Spira::Types::Any.serialize([]) }.should raise_error TypeError
+    end
+  end
+
+  context "when unserializing" do
+    it "should unserialize to ruby types" do
+      value = Spira::Types::Any.unserialize(RDF::Literal.new(5, :datatype => RDF::XSD.integer))
+      value.should == 5
+      value = Spira::Types::Any.unserialize(RDF::Literal.new("a string"))
+      value.should == "a string"
+    end
+
+    it "should unserialize URIs to URIs" do
+      Spira::Types::Any.unserialize(@uri).should == @uri
+    end
+  end
+
+
+end
--- a/samples/XML/HITSP_C32.sch
+++ b/samples/XML/HITSP_C32.sch
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+Retrieved on 2016-08-30 from http://cda-validation.nist.gov/cda-validation/downloads.html.
+
+Disclaimer from the National Institute of Standards and Technology website:
+
+"Unless otherwise noted, this software was developed at the National Institute of Standards and Technology by employees of the Federal Government in the course of their official duties. Pursuant to title 17 Section 105 of the United States Code this software is not subject to copyright protection and is in the public domain. The CDA Guideline Validator is an experimental system. NIST assumes no responsibility whatsoever for its use by other parties, and makes no guarantees, expressed or implied, about its quality, reliability, or any other characteristic. We would appreciate acknowledgement if the software is used."
+ -->
+
+<!DOCTYPE schema [
+<!ENTITY ent-2.16.840.1.113883.3.88.11.32.1  SYSTEM 'templates/2.16.840.1.113883.3.88.11.32.1.ent'>
+<!ENTITY ent-2.16.840.1.113883.3.88.11.32.2  SYSTEM 'templates/2.16.840.1.113883.3.88.11.32.2.ent'>
+<!ENTITY ent-2.16.840.1.113883.3.88.11.32.3  SYSTEM 'templates/2.16.840.1.113883.3.88.11.32.3.ent'>
+<!ENTITY ent-2.16.840.1.113883.3.88.11.32.4  SYSTEM 'templates/2.16.840.1.113883.3.88.11.32.4.ent'>
+<!ENTITY ent-2.16.840.1.113883.3.88.11.32.5  SYSTEM 'templates/2.16.840.1.113883.3.88.11.32.5.ent'>
+<!ENTITY ent-2.16.840.1.113883.3.88.11.32.6  SYSTEM 'templates/2.16.840.1.113883.3.88.11.32.6.ent'>
+<!ENTITY ent-2.16.840.1.113883.3.88.11.32.7  SYSTEM 'templates/2.16.840.1.113883.3.88.11.32.7.ent'>
+<!ENTITY ent-2.16.840.1.113883.3.88.11.32.8  SYSTEM 'templates/2.16.840.1.113883.3.88.11.32.8.ent'>
+<!ENTITY ent-2.16.840.1.113883.3.88.11.32.9  SYSTEM 'templates/2.16.840.1.113883.3.88.11.32.9.ent'>
+<!ENTITY ent-2.16.840.1.113883.3.88.11.32.10  SYSTEM 'templates/2.16.840.1.113883.3.88.11.32.10.ent'>
+<!ENTITY ent-2.16.840.1.113883.3.88.11.32.11  SYSTEM 'templates/2.16.840.1.113883.3.88.11.32.11.ent'>
+<!ENTITY ent-2.16.840.1.113883.3.88.11.32.12  SYSTEM 'templates/2.16.840.1.113883.3.88.11.32.12.ent'>
+<!ENTITY ent-2.16.840.1.113883.3.88.11.32.13  SYSTEM 'templates/2.16.840.1.113883.3.88.11.32.13.ent'>
+<!ENTITY ent-2.16.840.1.113883.3.88.11.32.14  SYSTEM 'templates/2.16.840.1.113883.3.88.11.32.14.ent'>
+<!ENTITY ent-2.16.840.1.113883.3.88.11.32.15  SYSTEM 'templates/2.16.840.1.113883.3.88.11.32.15.ent'>
+<!ENTITY ent-2.16.840.1.113883.3.88.11.32.16  SYSTEM 'templates/2.16.840.1.113883.3.88.11.32.16.ent'>
+<!ENTITY ent-2.16.840.1.113883.3.88.11.32.17  SYSTEM 'templates/2.16.840.1.113883.3.88.11.32.17.ent'>
+]>
+<schema xmlns="http://www.ascc.net/xml/schematron" xmlns:cda="urn:hl7-org:v3">
+    <!--
+        To use iso schematron instead of schematron 1.5,
+        change the xmlns attribute from
+        "http://www.ascc.net/xml/schematron"
+        to
+        "http://purl.oclc.org/dsdl/schematron"
+    -->
+    <title>HITSP_C32</title>
+    <ns prefix="cda" uri="urn:hl7-org:v3"/>
+    <ns prefix="sdtc" uri="urn:hl7-org:sdtc"/>
+    <ns prefix="xsi" uri="http://www.w3.org/2001/XMLSchema-instance"/>
+
+    <phase id='errors'>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.1-errors'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.2-errors'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.3-errors'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.4-errors'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.5-errors'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.6-errors'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.7-errors'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.8-errors'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.9-errors'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.10-errors'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.11-errors'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.12-errors'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.13-errors'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.14-errors'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.15-errors'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.16-errors'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.17-errors'/>
+    </phase>
+
+    <phase id='warning'>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.1-warning'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.2-warning'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.3-warning'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.4-warning'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.5-warning'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.6-warning'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.7-warning'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.8-warning'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.9-warning'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.10-warning'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.11-warning'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.12-warning'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.13-warning'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.14-warning'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.15-warning'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.16-warning'/>
+        <active pattern='p-2.16.840.1.113883.3.88.11.32.17-warning'/>
+    </phase>
+
+     <phase id='note'>
+         <active pattern='p-2.16.840.1.113883.3.88.11.32.1-note'/>
+         <active pattern='p-2.16.840.1.113883.3.88.11.32.2-note'/>
+         <active pattern='p-2.16.840.1.113883.3.88.11.32.3-note'/>
+         <active pattern='p-2.16.840.1.113883.3.88.11.32.4-note'/>
+         <active pattern='p-2.16.840.1.113883.3.88.11.32.5-note'/>
+         <active pattern='p-2.16.840.1.113883.3.88.11.32.6-note'/>
+         <active pattern='p-2.16.840.1.113883.3.88.11.32.7-note'/>
+         <active pattern='p-2.16.840.1.113883.3.88.11.32.8-note'/>
+         <active pattern='p-2.16.840.1.113883.3.88.11.32.9-note'/>
+         <active pattern='p-2.16.840.1.113883.3.88.11.32.10-note'/>
+         <active pattern='p-2.16.840.1.113883.3.88.11.32.11-note'/>
+         <active pattern='p-2.16.840.1.113883.3.88.11.32.12-note'/>
+         <active pattern='p-2.16.840.1.113883.3.88.11.32.13-note'/>
+         <active pattern='p-2.16.840.1.113883.3.88.11.32.14-note'/>
+         <active pattern='p-2.16.840.1.113883.3.88.11.32.15-note'/>
+         <active pattern='p-2.16.840.1.113883.3.88.11.32.16-note'/>
+         <active pattern='p-2.16.840.1.113883.3.88.11.32.17-note'/>
+     </phase>
+
+     <phase id='violation'>
+
+<active pattern='p-2.16.840.1.113883.3.88.11.32.4-violation'/>
+<active pattern='p-2.16.840.1.113883.3.88.11.32.5-violation'/>
+<active pattern='p-2.16.840.1.113883.3.88.11.32.6-violation'/>
+<active pattern='p-2.16.840.1.113883.3.88.11.32.7-violation'/>
+<active pattern='p-2.16.840.1.113883.3.88.11.32.8-violation'/>
+<active pattern='p-2.16.840.1.113883.3.88.11.32.9-violation'/>
+<active pattern='p-2.16.840.1.113883.3.88.11.32.10-violation'/>
+<active pattern='p-2.16.840.1.113883.3.88.11.32.11-violation'/>
+<active pattern='p-2.16.840.1.113883.3.88.11.32.12-violation'/>
+<active pattern='p-2.16.840.1.113883.3.88.11.32.13-violation'/>
+<active pattern='p-2.16.840.1.113883.3.88.11.32.14-violation'/>
+<active pattern='p-2.16.840.1.113883.3.88.11.32.15-violation'/>
+<active pattern='p-2.16.840.1.113883.3.88.11.32.16-violation'/>
+<active pattern='p-2.16.840.1.113883.3.88.11.32.17-violation'/>
+
+     </phase>
+
+    <!-- Template_2.16.840.1.113883.3.88.11.32.1 -->
+    <!-- HITSP/C32 Registration and Medication History -->
+
+    &ent-2.16.840.1.113883.3.88.11.32.1;
+
+    <!-- Template_2.16.840.1.113883.3.88.11.32.2 -->
+    <!-- HITSP/C32 Language Spoken Module -->
+
+    &ent-2.16.840.1.113883.3.88.11.32.2;
+
+    <!-- Template_2.16.840.1.113883.3.88.11.32.3 -->
+    <!-- HITSP/C32 Support Module -->
+
+    &ent-2.16.840.1.113883.3.88.11.32.3;
+
+    <!-- Template_2.16.840.1.113883.3.88.11.32.4 -->
+    <!-- HITSP/C32 Healthcare Provider Module -->
+
+    &ent-2.16.840.1.113883.3.88.11.32.4;
+
+    <!-- Template_2.16.840.1.113883.3.88.11.32.5 -->
+    <!-- HITSP/C32 Insurance Provider Module -->
+
+    &ent-2.16.840.1.113883.3.88.11.32.5;
+
+    <!-- Template_2.16.840.1.113883.3.88.11.32.6 -->
+    <!-- HITSP/C32 Allergies and Drug Sensitivities Module -->
+
+    &ent-2.16.840.1.113883.3.88.11.32.6;
+
+    <!-- Template_2.16.840.1.113883.3.88.11.32.7 -->
+    <!-- HITSP/C32 Conditions Module -->
+
+    &ent-2.16.840.1.113883.3.88.11.32.7;
+
+    <!-- Template_2.16.840.1.113883.3.88.11.32.8 -->
+    <!-- HITSP/C32 Medications - Administration Information Module -->
+
+    &ent-2.16.840.1.113883.3.88.11.32.8;
+
+    <!-- Template_2.16.840.1.113883.3.88.11.32.9 -->
+    <!-- HITSP/C32 Medications Module, Medication Information data element -->
+
+    &ent-2.16.840.1.113883.3.88.11.32.9;
+
+    <!-- Template_2.16.840.1.113883.3.88.11.32.10 -->
+    <!-- HITSP/C32 Medications Module, Medication Information, Type of Medication data element -->
+
+    &ent-2.16.840.1.113883.3.88.11.32.10;
+
+    <!-- Template_2.16.840.1.113883.3.88.11.32.11 -->
+    <!-- HITSP/C32 Order Information data element -->
+
+    &ent-2.16.840.1.113883.3.88.11.32.11;
+
+    <!-- Template_2.16.840.1.113883.3.88.11.32.12 -->
+    <!-- HITSP/C32 Comments Module -->
+
+    &ent-2.16.840.1.113883.3.88.11.32.12;
+
+    <!-- Template_2.16.840.1.113883.3.88.11.32.13 -->
+    <!-- HITSP/C32 Advance Directives Module -->
+
+    &ent-2.16.840.1.113883.3.88.11.32.13;
+
+    <!-- Template_2.16.840.1.113883.3.88.11.32.14 -->
+    <!-- HITSP/C32 Immunizations Module -->
+
+    &ent-2.16.840.1.113883.3.88.11.32.14;
+
+    <!-- Template_2.16.840.1.113883.3.88.11.32.15 -->
+    <!-- HITSP/C32 Vital Signs Module -->
+
+    &ent-2.16.840.1.113883.3.88.11.32.15;
+
+    <!-- Template_2.16.840.1.113883.3.88.11.32.16 -->
+    <!-- HITSP/C32 Results Module -->
+
+    &ent-2.16.840.1.113883.3.88.11.32.16;
+
+    <!-- Template_2.16.840.1.113883.3.88.11.32.17 -->
+    <!-- HITSP/C32 Encounters Module -->
+
+    &ent-2.16.840.1.113883.3.88.11.32.17;
+
+</schema>
--- a/samples/XML/namespace-strict.sch
+++ b/samples/XML/namespace-strict.sch
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://purl.oclc.org/dsdl/schematron"
+   queryBinding="xslt2"
+   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <!-- XSLT 2.0 Schematron by Wendell Piez (Mulberry Technologies, Inc.),
+       August 2011 -->
+  
+  <!-- This Schematron is released into the public domain.     
+       Please credit your sources. -->
+  
+  
+  <!-- Requires Schematron that allows embedded XSLT 2.0 with support for
+       the namespace:: axis. Tested with Saxon 9.3.0.5. -->
+  
+  <ns prefix="m" uri="http://www.mulberrytech.com/xslt/util"/>
+  
+  <xsl:variable name="ns-set" xmlns:m="http://www.mulberrytech.com/xslt/util">
+    <!-- include elements to declare expected namespace prefixes
+         with their bindings, like so:
+
+         (prefix 'mml')
+         <m:ns prefix="mml"   uri="http://www.w3.org/1998/Math/MathML"/>
+         (default namespace, no prefix)
+         <m:ns prefix=""      uri="http://www.w3.org/1998/Math/MathML"/>
+         -->
+         
+    <m:ns prefix="mml"   uri="http://www.w3.org/1998/Math/MathML"/>
+    <m:ns prefix="xlink" uri="http://www.w3.org/1999/xlink"/>>
+    <m:ns prefix="oasis" uri="http://docs.oasis-open.org/ns/oasis-exchange/table"/>
+
+    <!-- 'xml' prefix is always in scope with this binding -->
+    <m:ns prefix="xml"   uri="http://www.w3.org/XML/1998/namespace"/>
+  </xsl:variable>
+  
+  <pattern>
+    <!-- checking the document element against the spec given in ns-set -->
+    <rule context="/*">
+      <let name="new-prefixes" value="in-scope-prefixes(.)[not(. = $ns-set/m:ns/@prefix)]"/>
+      <let name="new-namespaces" value="(for $p in (in-scope-prefixes(.)) return namespace-uri-for-prefix($p,.))
+        [not(. = $ns-set/m:ns/@uri)]"/>
+      <report test="exists($new-prefixes)">
+        Unrecognized namespace prefix<xsl:value-of select="('es')[count($new-prefixes) gt 1]"/>: 
+        <value-of select="string-join(
+          (for $p in $new-prefixes return m:label($p)),
+          ', ')"/>
+      </report>
+      <report test="exists($new-namespaces)">
+        Unrecognized namespace URI<xsl:value-of select="('s')[count($new-namespaces) gt 1]"/>: 
+        <value-of select="string-join(($new-namespaces),', ')"/>
+      </report>
+      
+      <let name="misassigned-prefixes" value="in-scope-prefixes(.)[not(.=$new-prefixes)]
+        [for $p in (.) return 
+          namespace-uri-for-prefix($p,current()) ne $ns-set/m:ns[@prefix=$p]/@uri]"/>
+      <report test="exists($misassigned-prefixes)">
+        Prefix<xsl:value-of select="('es')[count($misassigned-prefixes) gt 1]"/> 
+        assigned incorrectly: <value-of select="string-join(
+          (for $p in $misassigned-prefixes return
+          concat(m:label($p), ' (should be ''',$ns-set/m:ns[@prefix=$p]/@uri,''')')),
+          '; ')"/>
+      </report>
+    </rule>
+    
+    <!-- Elsewhere, all namespaces given must correspond with those
+      on the parent -->
+    <rule context="*">
+      <assert test="every $n in (namespace::*) satisfies
+        exists(../namespace::*[deep-equal(.,$n)])">
+        Namespace may not be declared here.
+      </assert>
+      <assert test="every $n in (../namespace::*) satisfies
+        exists(namespace::*[deep-equal(.,$n)])">
+        Namespace may not be undeclared here.
+      </assert>
+    </rule>
+  </pattern>
+  
+  <xsl:function name="m:label" as="xs:string">
+    <xsl:param name="label" as="xs:string"/>
+    <xsl:sequence select="if (string($label)) then concat('''',$label,'''') else '[unprefixed]'"/>
+  </xsl:function>
+  
+</schema>
--- a/samples/XML/oasis-table.sch
+++ b/samples/XML/oasis-table.sch
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================= -->
+<!-- 
+  This work is in the public domain and may be reproduced, published or 
+  otherwise used without the permission of the National Library of Medicine (NLM).
+  
+  We request only that the NLM is cited as the source of the work.
+  
+  Although all reasonable efforts have been taken to ensure the accuracy and 
+  reliability of the software and data, the NLM and the U.S. Government  do 
+  not and cannot warrant the performance or results that may be obtained  by
+  using this software or data. The NLM and the U.S. Government disclaim all 
+  warranties, express or implied, including warranties of performance, 
+  merchantability or fitness for any particular purpose.
+-->
+<!-- ============================================================= -->
+
+<schema xmlns="http://purl.oclc.org/dsdl/schematron"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:m="http://mulberrytech.com/xslt/oasis-html/util"
+  queryBinding="xslt2">
+  
+  <title>OASIS/CALS table validation</title>
+  
+  <!-- Mulberry Technologies (wap)
+       
+       Designed for JATS, but probably also useful in other
+       systems using OASIS/CALS/Docbook tables
+       
+       Assumes a table DTD (or schema) valid to the OASIS/CALS/Docbook model
+  -->
+  
+  <ns prefix="o" uri="http://docs.oasis-open.org/ns/oasis-exchange/table"/>
+  <ns prefix="m" uri="http://mulberrytech.com/xslt/oasis-html/util"/>
+  <!--<ns prefix="xsl" uri="http://www.w3.org/1999/XSL/Transform"/>-->
+  
+  <!-- the included stylesheet includes key and function declarations required -->
+  <xsl:include href="oasis-exchange-support.xsl"/>
+  
+  <let name="default-border-style" value="solid"/>
+  
+  <pattern>
+    <rule context="o:tgroup">
+      <let name="okay-cols" value="@cols[. castable as xs:integer][. > 0]"/>
+      <assert test="exists(@cols)">tgroup/@cols is not given</assert>
+      <assert test="empty(@cols) or exists($okay-cols)">@cols should be a natural number
+      (integer greater than zero).</assert>
+      <assert test="empty($okay-cols) or empty(o:colspec) or (count(o:colspec) = @cols)">The tgroup has 
+        <value-of select="count(o:colspec)"/> colspec<value-of select="if (count(o:colspec) = 1) then '' else 's'"/>, 
+        but its @cols is given as '<value-of select="@cols"/>'.</assert>
+      <report test="not(*/o:row/m:actual-cols(.) != */o:row/m:actual-cols(.))
+        and ($okay-cols != m:actual-cols((*/o:row)[1]))">tgroup/@cols is given as
+        <value-of select="$okay-cols"/>, but all rows have <value-of
+          select="m:actual-cols((*/o:row)[1])"/> entr<value-of 
+          select="if (m:actual-cols((*/o:row)[1]) eq 1) then 'y' else 'ies'"/>.
+      </report>
+      <report test="@align='char'" role="warning">Without assigning @char or @charoff to everything,
+        assigning @align='char' to tgroup only aligns contents to right of center.</report>
+    </rule>
+    
+    <rule context="o:colspec">
+      <let name="okay-colwidth"
+        value="@colwidth[exists(m:colwidth-unit(current()))]"/>
+      <assert test="empty(@colwidth) or exists($okay-colwidth)">Malformed @colwidth.</assert>
+      <assert test="empty($okay-colwidth) or 
+        (count(../o:colspec[m:colwidth-unit(.)=m:colwidth-unit(current())]) &gt;
+         count(../o:colspec[not(m:colwidth-unit(.)=m:colwidth-unit(current()))]))">@colwidth unit
+        (<value-of select="m:colwidth-unit(.)"/>) is not consistent with the
+        units on other colspecs.</assert>
+      
+      <assert test="empty($okay-colwidth) or matches($okay-colwidth,'^\s*\*\s*$')
+        or (xs:double(replace($okay-colwidth,'[\s\p{L}\*]','')[. castable as xs:double]) &gt; 0)">@colwidth must be positive</assert>
+      <report test="empty(m:colwidth-unit(.))
+        and exists(../o:colspec/m:colwidth-unit(.))">The same unit of measure should be used on every 
+        colspec/@colwidth.</report>
+      
+      <assert test="empty(@colnum) or (@colnum = count(.|preceding-sibling::o:colspec))">@colnum 
+        '<value-of select="@colnum"/>' does not correspond to
+        the column's actual number (<value-of select="count(.|preceding-sibling::o:colspec)"/>)</assert>
+      <report test="@colname = (../o:colspec except .)/@colname">The same @colname is assigned to more than
+         one colspec.</report>
+      <assert test="not(@align='char') or exists(@char)" role="warning">@align='char', but no @char is given.</assert>
+      <report test="normalize-space(@char) and not((@align,../@align)[1]='char')">@char is given, but alignment is not 'char'.</report>
+      <assert test="empty(@charoff) or ((@align,../@align)[1]='char')" role="warning">@charoff is given, but alignment is not 'char'.</assert>
+    </rule>
+    
+    <rule context="o:row">
+      <let name="tgroup" value="ancestor::o:tgroup[1]"/>
+      <let name="rowno" value="m:rowno(.)"/>
+      <let name="given-entries" value="count(distinct-values(key('entry-by-row',$rowno,$tgroup)/m:across(.)))"/>
+      <report test="$given-entries &lt; $tgroup/@cols
+        and exists($tgroup/@cols[. castable as xs:integer])" role="warning">
+        The row doesn't have enough entries (<value-of select="$tgroup/@cols"/> 
+        <value-of select="if ($tgroup/@cols=1) then ' is' else ' are'"/> expected;
+        <value-of select="$given-entries"/> <value-of select="if ($given-entries=1) then ' is' else ' are'"/> given).
+      </report>
+    </rule>
+    <rule context="o:entry">
+      <let name="tgroup" value="ancestor::o:tgroup[1]"/>
+      <assert test="empty(@nameend) or exists(key('colspec-by-name',@nameend,$tgroup))">No colspec is 
+        named <value-of select="@nameend"/>.</assert>
+      <assert test="empty(@nameend|@namest) or 
+        (key('colspec-by-name',@nameend,$tgroup) >> key('colspec-by-name',@namest,$tgroup))">Entry's end
+        column (<value-of select="@nameend"/>) must follow its start column 
+        (<value-of select="@namest"/>).</assert>
+      <assert test="empty(@namest) or exists(key('colspec-by-name',@namest,$tgroup))">No colspec is 
+        named <value-of select="@namest"/>.</assert>
+      <assert test="empty(@colname) or exists(key('colspec-by-name',@colname,$tgroup))">No colspec is 
+        named <value-of select="@colname"/>.</assert>
+      <assert test="empty(@nameend) or exists(@colname|@namest)">Entry is assigned an end
+        column (<value-of select="@nameend"/>) but not a start column.</assert>
+      <assert test="not(@colname != @namest)">Entry is assigned to column <value-of select="@colname"/>,
+        so it can't start at column <value-of select="@namest"/>.
+      </assert>
+
+      <assert test="m:across(.)[1] &gt; (preceding-sibling::o:entry[1]/m:across(.)[last()],0)[1]">
+        Entry must be assigned to a free column (after its preceding entries). 
+      </assert>
+      
+      <report test="m:down(.) &gt; m:rowno(../../o:row[last()])">This entry doesn't fit into
+        its <value-of select="local-name(../..)"/>.</report>
+      
+      <report test="(exists(@morerows) and
+        (key('entry-by-row',m:down(.),$tgroup)/m:across(.)[last()] &gt; $tgroup/@cols))
+        or empty($tgroup/@cols)" role="warning">
+        A row in which this entry appears has too many entries.
+      </report>
+      <!-- the next rule will never fire for entries spanning columns: they always
+           fit by virtue of being assigned a @nameend -->
+      <report test="(m:across(.)[last()] &gt; $tgroup/@cols) or empty($tgroup/@cols)">
+        Entry does not fit in row. (<value-of select="$tgroup/@cols"/> are allowed; entry
+        is in column <value-of select="m:across(.)[last()]"/>.)
+        <!-- Entry does not fit in row. (# columns are allowed; row ends in column #.)       -->
+      </report>
+      
+      <assert test="empty(@char) or m:align(.)='char'" role="warning">@char is given, but alignment is not 'char'.</assert>
+      <assert test="empty(@charoff) or m:align(.)='char'" role="warning">@charoff is given, but alignment is not 'char'.</assert>
+      <assert test="empty(@charoff) or ((@charoff castable as xs:integer) and
+        (@charoff &gt;= 0) and (@charoff &lt;= 100))">@charoff must be a whole number between 0 and 100.</assert>
+      <assert test="not(m:align(.)='char') or exists(@char|m:colspec-for-entry(.)/@char)" role="warning">
+        Entry is designated for character alignment, but no character (@char) is given on it or its colspec.
+      </assert>
+      <assert test="empty(@char) or not(@char != m:colspec-for-entry(.)/@char)">
+        Entry is assigned an alignment character (<value-of select="@char"/>)
+        different from its column's (<value-of select="m:colspec-for-entry(.)/@char"/>).</assert>
+      <report test="exists(*) and (m:align(.)='char')" role="warning">With @align='char', markup of 
+        entry contents (<value-of select="string-join(distinct-values(*/name()),', ')"/>) will be ignored.</report>
+    </rule>
+  </pattern>
+</schema>
--- a/script/convert-grammars
+++ b/script/convert-grammars
@@ -42,7 +42,7 @@ class DirectoryPackage
      case File.extname(path.downcase)
      when '.plist'
        path.split('/')[-2] == 'Syntaxes'
-      when '.tmlanguage'
+      when '.tmlanguage', '.yaml-tmlanguage'
        true
      when '.cson', '.json'
        path.split('/')[-2] == 'grammars'
@@ -114,7 +114,7 @@ class SVNPackage
  def fetch(tmp_dir)
    `svn export -q "#{url}/Syntaxes" "#{tmp_dir}/Syntaxes"`
    raise "Failed to export SVN repository: #{url}: #{$?.to_s}" unless $?.success?
-    Dir["#{tmp_dir}/Syntaxes/*.{plist,tmLanguage,tmlanguage}"]
+    Dir["#{tmp_dir}/Syntaxes/*.{plist,tmLanguage,tmlanguage,YAML-tmLanguage}"]
  end
 end

@@ -148,6 +148,17 @@ def load_grammar(path)
  case File.extname(path.downcase)
  when '.plist', '.tmlanguage'
    Plist::parse_xml(path)
+  when '.yaml-tmlanguage'
+    content = File.read(path)
+    # Attempt to parse YAML file even if it has a YAML 1.2 header
+    if content.lines[0] =~ /^%YAML[ :]1\.2/
+      content = content.lines[1..-1].join
+    end
+    begin
+      YAML.load(content)
+    rescue Psych::SyntaxError => e
+      $stderr.puts "Failed to parse YAML grammar '#{path}'"
+    end
  when '.cson'
    cson = `"#{CSONC}" "#{path}"`
    raise "Failed to convert CSON grammar '#{path}': #{$?.to_s}" unless $?.success?
@@ -169,7 +180,7 @@ def load_grammars(tmp_dir, source, all_scopes)
        else
          SingleFile.new(source)
        end
-      elsif source.end_with?('.tmLanguage', '.plist')
+      elsif source.end_with?('.tmLanguage', '.plist', '.YAML-tmLanguage')
        SingleGrammar.new(source)
      elsif source.start_with?('https://github.com')
        GitHubPackage.new(source)
@@ -185,7 +196,7 @@ def load_grammars(tmp_dir, source, all_scopes)

  p.fetch(tmp_dir).map do |path|
    grammar = load_grammar(path)
-    scope = grammar['scopeName']
+    scope = grammar['scopeName'] || grammar['scope']

    if all_scopes.key?(scope)
      unless all_scopes[scope] == p.url
@@ -204,7 +215,7 @@ def install_grammars(grammars, path)
  installed = []

  grammars.each do |grammar|
-    scope = grammar['scopeName']
+    scope = grammar['scopeName'] || grammar['scope']
    File.write(File.join(GRAMMARS_PATH, "#{scope}.json"), JSON.pretty_generate(grammar))
    installed << scope
  end
--- a/script/set-language-ids
+++ b/script/set-language-ids
@@ -0,0 +1,82 @@
+#!/usr/bin/env ruby
+require 'yaml'
+require 'pry'
+
+header = <<-EOF
+# Defines all Languages known to GitHub.
+#
+# type              - Either data, programming, markup, prose, or nil
+# aliases           - An Array of additional aliases (implicitly
+#                     includes name.downcase)
+# ace_mode          - A String name of the Ace Mode used for highlighting whenever
+#                     a file is edited. This must match one of the filenames in http://git.io/3XO_Cg.
+#                     Use "text" if a mode does not exist.
+# wrap              - Boolean wrap to enable line wrapping (default: false)
+# extensions        - An Array of associated extensions (the first one is
+#                     considered the primary extension, the others should be
+#                     listed alphabetically)
+# interpreters      - An Array of associated interpreters
+# searchable        - Boolean flag to enable searching (defaults to true)
+# search_term       - Deprecated: Some languages may be indexed under a
+#                     different alias. Avoid defining new exceptions.
+# language_id       - Integer used as a language-name-independent indexed field so that we can rename
+#                     languages in Linguist without reindexing all the code on GitHub. Must not be 
+#                     changed for existing languages without the explicit permission of GitHub staff.
+# color             - CSS hex color to represent the language.
+# tm_scope          - The TextMate scope that represents this programming
+#                     language. This should match one of the scopes listed in
+#                     the grammars.yml file. Use "none" if there is no grammar
+#                     for this language.
+# group             - Name of the parent language. Languages in a group are counted
+#                     in the statistics as the parent language.
+#
+# Any additions or modifications (even trivial) should have corresponding
+# test changes in `test/test_blob.rb`.
+#
+# Please keep this list alphabetized. Capitalization comes before lowercase.
+
+EOF
+
+generated = true if ARGV[0] == "--force"
+update = true if ARGV[0] == "--update"
+
+if generated
+  puts "You're regenerating all of the language_id attributes for all Linguist "
+  puts "languages defined in languages.yml. This is almost certainly NOT what"
+  puts "you meant to do!"
+
+  language_index = 0
+
+  languages = YAML.load(File.read("lib/linguist/languages.yml"))
+  languages.each do |name, vals|
+    vals.merge!('language_id' => language_index)
+    language_index += 1
+  end
+
+  File.write("lib/linguist/languages.yml", header + YAML.dump(languages))
+elsif update
+  puts "Adding new language_id attributes to languages.yml that don't have one set"
+  languages = YAML.load(File.read("lib/linguist/languages.yml"))
+
+  # First grab the maximum language_id
+  language_ids = []
+  languages.each { |name, vals| language_ids << vals['language_id'] if vals.has_key?('language_id')}
+  max_language_id = language_ids.max
+  puts "Current maximum language_id is #{max_language_id}"
+
+  missing_count = 0
+  language_index = max_language_id
+
+  languages.each do |name, vals|
+    unless vals.has_key?('language_id')
+      language_index += 1
+      missing_count += 1
+      vals.merge!('language_id' => language_index)
+    end
+  end
+
+  File.write("lib/linguist/languages.yml", header + YAML.dump(languages))
+  puts "Updated language_id attributes for #{missing_count} languages"
+else
+  puts "Whatever you want me to do, I can't figure it out. Giving up..."
+end
--- a/test/test_language.rb
+++ b/test/test_language.rb
@@ -67,6 +67,22 @@ class TestLanguage < Minitest::Test
    assert_nil Language.find_by_alias(nil)
  end

+  # Note these are set by script/set-language-ids. If these tests fail then someone
+  # has changed the language_id fields set in languages.yml which is almost certainly
+  # not what you want to happen (these fields are used in GitHub's search indexes)
+  def test_language_ids
+    assert_equal 4, Language['ANTLR'].language_id
+    assert_equal 54, Language['Ceylon'].language_id
+    assert_equal 326, Language['Ruby'].language_id
+    assert_equal 421, Language['xBase'].language_id
+  end
+
+  def test_find_by_id
+    assert_equal Language['Elixir'], Language.find_by_id(100)
+    assert_equal Language['Ruby'], Language.find_by_id(326)
+    assert_equal Language['xBase'], Language.find_by_id(421)
+  end
+
  def test_groups
    # Test a couple identity cases
    assert_equal Language['Perl'], Language['Perl'].group
@@ -386,6 +402,22 @@ class TestLanguage < Minitest::Test
    assert missing.empty?, message
  end

+  def test_all_languages_have_a_language_id_set
+    missing = Language.all.select { |language| language.language_id.nil? }
+
+    message = "The following languages do not have a language_id listed in languages.yml. Please add language_id fields for all new languages.\n"
+    missing.each { |language| message << "#{language.name}\n" }
+    assert missing.empty?, message
+  end
+
+  def test_all_language_id_are_unique
+    duplicates = Language.all.group_by{ |language| language.language_id }.select { |k, v| v.size > 1 }.map(&:first)
+
+    message = "The following language_id are used several times in languages.yml. Please use script/set-language-ids --update as per the contribution guidelines.\n"
+    duplicates.each { |language_id| message << "#{language_id}\n" }
+    assert duplicates.empty?, message
+  end
+
  def test_all_languages_have_a_valid_ace_mode
    ace_fixture_path = File.join('test', 'fixtures', 'ace_modes.json')
    skip("No ace_modes.json file") unless File.exist?(ace_fixture_path)
--- a/vendor/grammars/Docker.tmbundle
+++ b/vendor/grammars/Docker.tmbundle
--- a/vendor/grammars/NSIS
+++ b/vendor/grammars/NSIS
--- a/vendor/grammars/Sublime-Inform/.gitignore
+++ b/vendor/grammars/Sublime-Inform/.gitignore
@@ -1,2 +0,0 @@
-
-.DS_Store
--- a/vendor/grammars/Sublime-Inform/Inform7/book.sublime-snippet
+++ b/vendor/grammars/Sublime-Inform/Inform7/book.sublime-snippet
@@ -1,6 +0,0 @@
-<snippet>
-	<content><![CDATA[Book $1 - ${2:Title}
-]]></content>
-	<tabTrigger>book</tabTrigger>	
-	<scope>source.Inform7</scope>
-</snippet>
--- a/vendor/grammars/Sublime-Inform/Inform7/chapter.sublime-snippet
+++ b/vendor/grammars/Sublime-Inform/Inform7/chapter.sublime-snippet
@@ -1,6 +0,0 @@
-<snippet>
-	<content><![CDATA[Chapter $1 - ${2:Title}
-]]></content>
-	<tabTrigger>chapter</tabTrigger>	
-	<scope>source.Inform7</scope>
-</snippet>
--- a/vendor/grammars/Sublime-Inform/Inform7/door.sublime-snippet
+++ b/vendor/grammars/Sublime-Inform/Inform7/door.sublime-snippet
@@ -1,7 +0,0 @@
-<snippet>
-	<content><![CDATA[
-${1:DoorName} is a door. $1 is ${2:Direction} from ${3:Room}.
-]]></content>
-	<tabTrigger>door</tabTrigger>
-	<scope>source.Inform7</scope>
-</snippet>
--- a/vendor/grammars/Sublime-Inform/Inform7/inform7.JSON-tmLanguage
+++ b/vendor/grammars/Sublime-Inform/Inform7/inform7.JSON-tmLanguage
@@ -1,34 +0,0 @@
-{ "name": "Inform7",
-  "scopeName": "source.Inform7", 
-  "fileTypes": ["i7x"], 
-  "patterns": [
-  	{  "name": "keyword.control.Inform7",
-  	   "match": "\\b(Include|Release)\\b"
-  	},
-  	{ "name"	: "comment.block.Inform7",
-  	  "begin"	: "\\[",
-  	  "end"		: "\\]",
-  	  "comment"	: "All comments in Inform7 are delimited this way."
-  	},
-  	{ "name"	: "string.quoted.double.Inform7",
-  	  "begin"	: "\"",
-  	  "end"		: "\"",
-  	  "patterns": [
-	  	  { "name"		: "keyword.operator.Inform7",
-	  	    "begin"		: "\\[",
-	  	    "end"		: "\\]",
-	  	    "comment"	: "For logic inside of strings."
-	  	  }
-  	  ]
-  	},
-  	{  "name"	: "storage.type.Inform7",
-  	   "match"	: "(Volume|Book|Chapter|Part|Section|Table)\\s+\\d?\\s+-?\\s+((?:\\w|\\s|-)*)",
-  	   "comment": "Matches headings for major sections in Inform7"
-  	},
-  	{  "name": "constant.numeric.Inform7",
-  	   "match": "([0-9])+",
-  	   "comment":"Gotta call out the numbers!"
-  	}
-  ],
-  "uuid": "0c4cbdee-beb7-4ea6-af56-27246d479373"
-}
--- a/vendor/grammars/Sublime-Inform/Inform7/inform7.tmLanguage
+++ b/vendor/grammars/Sublime-Inform/Inform7/inform7.tmLanguage
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>fileTypes</key>
-	<array>
-		<string>i7x</string>
-		<string>inform</string>
-		<string>ni</string>
-	</array>
-	<key>name</key>
-	<string>Inform7</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>match</key>
-			<string>\b(Include|Release)\b</string>
-			<key>name</key>
-			<string>keyword.control.Inform7</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>\[</string>
-			<key>comment</key>
-			<string>All comments in Inform7 are delimited this way.</string>
-			<key>end</key>
-			<string>\]</string>
-			<key>name</key>
-			<string>comment.block.Inform7</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>"</string>
-			<key>end</key>
-			<string>"</string>
-			<key>name</key>
-			<string>string.quoted.double.Inform7</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>\[</string>
-					<key>comment</key>
-					<string>For logic inside of strings.</string>
-					<key>end</key>
-					<string>\]</string>
-					<key>name</key>
-					<string>keyword.operator.Inform7</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>comment</key>
-			<string>Matches headings for major sections in Inform7</string>
-			<key>match</key>
-			<string>(Volume|Book|Chapter|Part|Section|Table)\s+\d?\s+-?\s+((?:\w|\s|-)*)</string>
-			<key>name</key>
-			<string>storage.type.Inform7</string>
-		</dict>
-		<dict>
-			<key>comment</key>
-			<string>Gotta call out the numbers!</string>
-			<key>match</key>
-			<string>([0-9])+</string>
-			<key>name</key>
-			<string>constant.numeric.Inform7</string>
-		</dict>
-	</array>
-	<key>scopeName</key>
-	<string>source.Inform7</string>
-	<key>uuid</key>
-	<string>0c4cbdee-beb7-4ea6-af56-27246d479373</string>
-</dict>
-</plist>
--- a/vendor/grammars/Sublime-Inform/Inform7/object.sublime-snippet
+++ b/vendor/grammars/Sublime-Inform/Inform7/object.sublime-snippet
@@ -1,8 +0,0 @@
-<snippet>
-	<content><![CDATA[
-$1 is a portable thing in ${2:Room} ${3:ShortDescription}
-The description of $1 is ${4:Description}
-]]></content>
-	<tabTrigger>object</tabTrigger>
-	<scope>source.Inform7</scope>
-</snippet>
--- a/vendor/grammars/Sublime-Inform/Inform7/part.sublime-snippet
+++ b/vendor/grammars/Sublime-Inform/Inform7/part.sublime-snippet
@@ -1,6 +0,0 @@
-<snippet>
-	<content><![CDATA[Part $1 - ${2:Title}
-]]></content>
-	<tabTrigger>part</tabTrigger>	
-	<scope>source.Inform7</scope>
-</snippet>
--- a/vendor/grammars/Sublime-Inform/Inform7/room.sublime-snippet
+++ b/vendor/grammars/Sublime-Inform/Inform7/room.sublime-snippet
@@ -1,7 +0,0 @@
-<snippet>
-	<content><![CDATA[
-${1:RoomName} is a room in ${2:Region}. "${3:Description}"
-]]></content>
-	<tabTrigger>room</tabTrigger>
-	<scope>source.Inform7</scope>
-</snippet>
--- a/vendor/grammars/Sublime-Inform/Inform7/scene.sublime-snippet
+++ b/vendor/grammars/Sublime-Inform/Inform7/scene.sublime-snippet
@@ -1,11 +0,0 @@
-<snippet>
-	<content><![CDATA[
-${1:SceneName} is a Scene.
-$1 begins when $2 .
-$1 ends when $3 .
-When $1 begins: $4 .
-When $1 ends: $5 .
-]]></content>
-	<tabTrigger>scene</tabTrigger> 
-  	<scope>source.Inform7</scope> 
-</snippet>
--- a/vendor/grammars/Sublime-Inform/Inform7/section.sublime-snippet
+++ b/vendor/grammars/Sublime-Inform/Inform7/section.sublime-snippet
@@ -1,6 +0,0 @@
-<snippet>
-	<content><![CDATA[Section $1 - ${2:Title}
-]]></content>
-	<tabTrigger>section</tabTrigger>	
-	<scope>source.Inform7</scope>
-</snippet>
--- a/vendor/grammars/Sublime-Inform/Inform7/volume.sublime-snippet
+++ b/vendor/grammars/Sublime-Inform/Inform7/volume.sublime-snippet
@@ -1,6 +0,0 @@
-<snippet>
-	<content><![CDATA[Volume $1 - ${2:Title}
-]]></content>
-	<tabTrigger>volume</tabTrigger>	
-	<scope>source.Inform7</scope>
-</snippet>
--- a/vendor/grammars/Sublime-Inform/LICENSE.txt
+++ b/vendor/grammars/Sublime-Inform/LICENSE.txt
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Nate Dickson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/vendor/grammars/Sublime-Inform/README.md
+++ b/vendor/grammars/Sublime-Inform/README.md
@@ -1,8 +0,0 @@
-#Inform7 Package for Sublime Text 2
-This package has a lot of little files that make Inform7 easier to edit in Sublime Text 2. that's why it's called what it is, you see.
-##Usage
-Grab the zip file, unzip it, and put it in your ```Packages``` Directory.
-That's pretty much it. Open an ```i7x``` file in Sublime Text 2 and it'll be all highlighted and there's a bunch of snippets you can use and all that.
-
-##Want to submit a pull request for this readme file?
-Please, please do.
--- a/vendor/grammars/awk-sublime
+++ b/vendor/grammars/awk-sublime
--- a/vendor/grammars/c.tmbundle
+++ b/vendor/grammars/c.tmbundle
--- a/vendor/grammars/d.tmbundle
+++ b/vendor/grammars/d.tmbundle
--- a/vendor/grammars/diff.tmbundle
+++ b/vendor/grammars/diff.tmbundle
--- a/vendor/grammars/ebundles
+++ b/vendor/grammars/ebundles
--- a/vendor/grammars/html.tmbundle
+++ b/vendor/grammars/html.tmbundle
--- a/vendor/grammars/jade-tmbundle
+++ b/vendor/grammars/jade-tmbundle
--- a/vendor/grammars/language-babel
+++ b/vendor/grammars/language-babel
--- a/vendor/grammars/language-batchfile
+++ b/vendor/grammars/language-batchfile
--- a/vendor/grammars/language-clojure
+++ b/vendor/grammars/language-clojure
--- a/vendor/grammars/language-emacs-lisp
+++ b/vendor/grammars/language-emacs-lisp
--- a/vendor/grammars/language-graphql
+++ b/vendor/grammars/language-graphql
--- a/vendor/grammars/language-javascript
+++ b/vendor/grammars/language-javascript
--- a/vendor/grammars/language-python
+++ b/vendor/grammars/language-python
--- a/vendor/grammars/language-roff
+++ b/vendor/grammars/language-roff
--- a/vendor/grammars/language-rpm-spec
+++ b/vendor/grammars/language-rpm-spec
--- a/vendor/grammars/language-shellscript
+++ b/vendor/grammars/language-shellscript
--- a/vendor/grammars/latex.tmbundle
+++ b/vendor/grammars/latex.tmbundle
--- a/vendor/grammars/less.tmbundle/Commands/Save
+++ b/vendor/grammars/less.tmbundle/Commands/Save
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>saveActiveFile</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby18
-
-file = ENV["TM_FILEPATH"]
-target = file.sub(/\.less$/, ".css")
-system("lessc \"#{file}\" \"#{target}\"")
-puts "Compiled CSS to '#{target}'"</string>
-	<key>input</key>
-	<string>document</string>
-	<key>inputFormat</key>
-	<string>text</string>
-	<key>keyEquivalent</key>
-	<string>@b</string>
-	<key>name</key>
-	<string>Save to CSS</string>
-	<key>outputCaret</key>
-	<string>afterOutput</string>
-	<key>outputFormat</key>
-	<string>text</string>
-	<key>outputLocation</key>
-	<string>toolTip</string>
-	<key>requiredCommands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>lessc</string>
-			<key>locations</key>
-			<array>
-				<string>/opt/local/bin/lessc</string>
-				<string>/usr/local/bin/lessc</string>
-			</array>
-		</dict>
-	</array>
-	<key>scope</key>
-	<string>source.css.less</string>
-	<key>uuid</key>
-	<string>78788223-5E5E-434E-98BE-17BCDF600611</string>
-	<key>version</key>
-	<integer>2</integer>
-</dict>
-</plist>
--- a/vendor/grammars/less.tmbundle/Commands/Save
+++ b/vendor/grammars/less.tmbundle/Commands/Save
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>saveActiveFile</string>
-	<key>command</key>
-	<string>#!/usr/bin/env ruby18
-
-file = ENV["TM_FILEPATH"]
-target = file.sub(/\.less$/, ".css")
-system("lessc -x \"#{file}\" \"#{target}\"")
-puts "Compiled Minified CSS to '#{target}'"</string>
-	<key>input</key>
-	<string>document</string>
-	<key>inputFormat</key>
-	<string>text</string>
-	<key>keyEquivalent</key>
-	<string>~@b</string>
-	<key>name</key>
-	<string>Save to Minified CSS</string>
-	<key>outputCaret</key>
-	<string>afterOutput</string>
-	<key>outputFormat</key>
-	<string>text</string>
-	<key>outputLocation</key>
-	<string>toolTip</string>
-	<key>requiredCommands</key>
-	<array>
-		<dict>
-			<key>command</key>
-			<string>lessc</string>
-			<key>locations</key>
-			<array>
-				<string>/opt/local/bin/lessc</string>
-				<string>/usr/local/bin/lessc</string>
-			</array>
-		</dict>
-	</array>
-	<key>scope</key>
-	<string>source.css.less</string>
-	<key>uuid</key>
-	<string>448D3A8D-260E-4949-BA33-654886ECDCAF</string>
-	<key>version</key>
-	<integer>2</integer>
-</dict>
-</plist>
--- a/vendor/grammars/less.tmbundle/DragCommands/Insert
+++ b/vendor/grammars/less.tmbundle/DragCommands/Insert
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>beforeRunningCommand</key>
-	<string>nop</string>
-	<key>command</key>
-	<string>#!/usr/bin/env php
-&lt;?php
-$path = getenv('TM_DROPPED_FILE');
-$path_parts = pathinfo($path);
-$info = getimagesize($path);
-list($width, $height) = $info;
-$mime = $info['mime'];
-$contents = base64_encode(file_get_contents($path));
-
-echo "@gfx-{$path_parts['filename']}: \"data:{$mime};base64,{$contents}\";\n";
-echo "@gfx-{$path_parts['filename']}-width: {$width}px;\n";
-echo "@gfx-{$path_parts['filename']}-height: {$height}px;";</string>
-	<key>draggedFileExtensions</key>
-	<array>
-		<string>png</string>
-		<string>jpeg</string>
-		<string>jpg</string>
-		<string>gif</string>
-	</array>
-	<key>input</key>
-	<string>selection</string>
-	<key>name</key>
-	<string>Insert inline Image</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
-	<key>scope</key>
-	<string>source.css.less</string>
-	<key>uuid</key>
-	<string>7B0CA307-CC1C-4EE2-9F63-4825800ACDA7</string>
-</dict>
-</plist>
--- a/vendor/grammars/less.tmbundle/Preferences/Comment.tmPreferences
+++ b/vendor/grammars/less.tmbundle/Preferences/Comment.tmPreferences
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Comments</string>
-	<key>scope</key>
-	<string>source.css.less</string>
-	<key>settings</key>
-	<dict>
-		<key>shellVariables</key>
-		<array>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_START</string>
-				<key>value</key>
-				<string>// </string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_START_2</string>
-				<key>value</key>
-				<string>/* </string>
-			</dict>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_END_2</string>
-				<key>value</key>
-				<string> */</string>
-			</dict>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>D0CC551B-751D-4A7C-A738-2513E3C7F285</string>
-</dict>
-</plist>
--- a/vendor/grammars/less.tmbundle/README.md
+++ b/vendor/grammars/less.tmbundle/README.md
@@ -1,25 +0,0 @@
-# Installation
-
-You can install this bundle in TextMate by opening the preferences and going to the bundles tab. After installation it will be automatically updated for you.
-
-# License (MIT)
-
-Copyright (c) 2010 Scott Kyle and Rasmus Andersson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--- a/vendor/grammars/less.tmbundle/Syntaxes/LESS.tmLanguage
+++ b/vendor/grammars/less.tmbundle/Syntaxes/LESS.tmLanguage
@@ -1,434 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>comment</key>
-	<string>LeSS</string>
-	<key>fileTypes</key>
-	<array>
-		<string>less</string>
-	</array>
-	<key>foldingStartMarker</key>
-	<string>/\*\*(?!\*)|\{\s*($|/\*(?!.*?\*/.*\S))</string>
-	<key>foldingStopMarker</key>
-	<string>(?&lt;!\*)\*\*/|^\s*\}</string>
-	<key>keyEquivalent</key>
-	<string>^~L</string>
-	<key>name</key>
-	<string>LESS</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>match</key>
-			<string>\b(a|abbr|acronym|address|applet|article|area|audio|video|b|base|big|blockquote|body|br|button|caption|canvas|center|cite|code|col|colgroup|dd|del|details|dfn|div|dl|dt|em|embed|fieldset|figure|figcaption|form|frame|frameset|(h[1-6])|head|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|map|mark|meta|menu|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|q|ruby|s|samp|script|select|small|span|strike|strong|style|sub|sup|summary|svg|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|ul|var|header|section|footer|aside|hgroup|time)\b</string>
-			<key>name</key>
-			<string>keyword.control.html.elements</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>"</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.css</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>"</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.css</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.double.css</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\.</string>
-					<key>name</key>
-					<string>constant.character.escaped.css</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>'</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.css</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>'</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.css</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.single.css</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\.</string>
-					<key>name</key>
-					<string>constant.character.escaped.css</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>entity.other.attribute-name.class.css</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(\.[a-zA-Z0-9_-]+)</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>url\(</string>
-			<key>contentName</key>
-			<string>variable.parameter.url</string>
-			<key>end</key>
-			<string>\)</string>
-			<key>name</key>
-			<string>support.function.any-method.builtin.css</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(#)([0-9a-fA-F]{3}|[0-9a-fA-F]{6})\b</string>
-			<key>name</key>
-			<string>constant.other.rgb-value.css</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>entity.other.attribute-name.id</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>#[a-zA-Z0-9_:\(\)-]+</string>
-			<key>name</key>
-			<string>meta.selector.css</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>/\*</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.begin.css</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>\*/</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>0</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.end.css</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>comment.block.css</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(-|\+)?\s*[0-9]+(\.[0-9]+)?</string>
-			<key>name</key>
-			<string>constant.numeric.css</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?&lt;=[\d])(px|pt|cm|mm|in|em|ex|pc)\b|%</string>
-			<key>name</key>
-			<string>keyword.other.unit.css</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>entity.other.attribute-name.pseudo-element.css</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(:+(after|before|not|last-child|nth-of-type|nth-child|first-child|first-letter|first-line|selection|root))</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>entity.other.attribute-name.pseudo-class.css</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(:+(active|hover|link|visited|focus))</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.entity.css</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>entity.other.attribute-name.attribute.css</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.separator.operator.css</string>
-				</dict>
-				<key>4</key>
-				<dict>
-					<key>name</key>
-					<string>string.unquoted.attribute-value.css</string>
-				</dict>
-				<key>5</key>
-				<dict>
-					<key>name</key>
-					<string>string.quoted.double.attribute-value.css</string>
-				</dict>
-				<key>6</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.css</string>
-				</dict>
-				<key>7</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.css</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(?i)(\[)\s*(-?[_a-z\\[[:^ascii:]]][_a-z0-9\-\\[[:^ascii:]]]*)(?:\s*([~|^$*]?=)\s*(?:(-?[_a-z\\[[:^ascii:]]][_a-z0-9\-\\[[:^ascii:]]]*)|((?&gt;(['"])(?:[^\\]|\\.)*?(\6)))))?\s*(\])</string>
-			<key>name</key>
-			<string>meta.attribute-selector.css</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.control.at-rule.import.css</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.keyword.css</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>^\s*((@)import\b)</string>
-			<key>name</key>
-			<string>meta.at-rule.import.css</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>support.type.property-name.css.vendor</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(-(?:webkit|moz|khtml|o|icab|ms)-(?:background-size|border-radius|box-shadow|opacity|border-image))\s*:</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>support.type.property-name.css</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>\b(azimuth|background-attachment|background-color|background-clip|background-image|background-position|background-repeat|background-size|background|behavior|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border-radius|border|box-shadow|bottom|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|filter|float|font-family|font-size-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|opacity|orphans|outline-color|outline-style|outline-width|outline|overflow(-[xy])?|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|position|pre-wrap|quotes|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|stress|table-layout|text-align|text-decoration|text-indent|text-shadow|text-transform|top|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|word-wrap|z-index|zoom)</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(absolute|all-scroll|always|auto|baseline|below|bidi-override|block|bold|bolder|both|bottom|break-all|break-word|capitalize|center|char|circle|col-resize|collapse|crosshair|dashed|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|groove|hand|help|hidden|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|keep-all|left|lighter|line-edge|line-through|line|linear|list-item|loose|lower-alpha|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|super|sw-resize|table-footer-group|table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-roman|uppercase|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|padding-box)\b</string>
-			<key>name</key>
-			<string>support.constant.property-value.css</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>(\b(?i:arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace)\b)</string>
-			<key>name</key>
-			<string>support.constant.font-name.css</string>
-		</dict>
-		<dict>
-			<key>comment</key>
-			<string>http://www.w3.org/TR/CSS21/syndata.html#value-def-color</string>
-			<key>match</key>
-			<string>\b(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow)\b</string>
-			<key>name</key>
-			<string>support.constant.color.w3c-standard-color-name.css</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(saturate|desaturate|lighten|darken|grayscale)\b</string>
-			<key>name</key>
-			<string>support.function.any-method.builtin.less</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(rgb|rgba|hsl|hsla|url)\b</string>
-			<key>name</key>
-			<string>support.function.any-method.builtin.css</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>support.function.any-method.vendor.css</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(-(?:webkit|moz|khtml|o|icab)-(?:gradient|linear-gradient))</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\b(color-stop|from|to)\b</string>
-			<key>name</key>
-			<string>support.function.any-method.webkit.gradient.css</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>support.function.less</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>(\.[a-zA-Z0-9_-]+)\s*(;|\()</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>(^[ \t]+)?(?=//)</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.whitespace.comment.leading.less</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>(?!\G)</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>begin</key>
-					<string>//</string>
-					<key>beginCaptures</key>
-					<dict>
-						<key>0</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.comment.less</string>
-						</dict>
-					</dict>
-					<key>end</key>
-					<string>\n</string>
-					<key>name</key>
-					<string>comment.line.double-slash.less</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>@[a-zA-Z0-9_-][\w-]*</string>
-			<key>name</key>
-			<string>variable.other.less</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\$|%|&amp;|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|&lt;=|&gt;=|&lt;&lt;=|&gt;&gt;=|&gt;&gt;&gt;=|&lt;&gt;|&lt;|&gt;|!|&amp;&amp;|\|\||\?\:|\*=|(?&lt;!\()/=|%=|\+=|\-=|&amp;=|\^=|\/\b</string>
-			<key>name</key>
-			<string>keyword.operator.less</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.property-list.begin.css</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.section.property-list.end.css</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>Match empty braces to give proper ↩ action</string>
-			<key>match</key>
-			<string>(\{)(\})</string>
-			<key>name</key>
-			<string>meta.brace.curly.less</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\{|\}</string>
-			<key>name</key>
-			<string>meta.brace.curly.less</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\(|\)</string>
-			<key>name</key>
-			<string>meta.brace.round.less</string>
-		</dict>
-		<dict>
-			<key>match</key>
-			<string>\[|\]</string>
-			<key>name</key>
-			<string>meta.brace.square.less</string>
-		</dict>
-	</array>
-	<key>scopeName</key>
-	<string>source.css.less</string>
-	<key>uuid</key>
-	<string>9343D324-75A1-4733-A5C0-5D1D4B6182D0</string>
-</dict>
-</plist>
--- a/vendor/grammars/less.tmbundle/info.plist
+++ b/vendor/grammars/less.tmbundle/info.plist
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>contactEmailRot13</key>
-	<string>zfurrgf@juvgrsnyyf.bet</string>
-	<key>contactName</key>
-	<string>Michael Sheets</string>
-	<key>description</key>
-	<string>Extends CSS with dynamic behavior such as variables, mixins, operations and functions.</string>
-	<key>mainMenu</key>
-	<dict>
-		<key>items</key>
-		<array>
-			<string>78788223-5E5E-434E-98BE-17BCDF600611</string>
-			<string>448D3A8D-260E-4949-BA33-654886ECDCAF</string>
-		</array>
-		<key>submenus</key>
-		<dict/>
-	</dict>
-	<key>name</key>
-	<string>LESS</string>
-	<key>uuid</key>
-	<string>D1D51EE5-E89F-4B14-8AE4-FC364E540B47</string>
-</dict>
-</plist>
--- a/vendor/grammars/objective-c.tmbundle
+++ b/vendor/grammars/objective-c.tmbundle
--- a/vendor/grammars/pawn-sublime-language
+++ b/vendor/grammars/pawn-sublime-language
--- a/vendor/grammars/r.tmbundle
+++ b/vendor/grammars/r.tmbundle
--- a/vendor/grammars/sourcepawn
+++ b/vendor/grammars/sourcepawn
--- a/vendor/grammars/sublime-autoit
+++ b/vendor/grammars/sublime-autoit
--- a/vendor/grammars/sublime-typescript
+++ b/vendor/grammars/sublime-typescript
--- a/vendor/grammars/vue-syntax-highlight
+++ b/vendor/grammars/vue-syntax-highlight
--- a/vendor/licenses/grammar/ebundles.txt
+++ b/vendor/licenses/grammar/ebundles.txt
@@ -1,26 +0,0 @@
---
-type: grammar
-name: ebundles
-license: mit
-curated: true
---
-If not otherwise specified (see below), files in this repository (located at https://ebundles.googlecode.com/svn/) fall under the MIT License:
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy of
-    this software and associated documentation files (the "Software"), to deal in
-    the Software without restriction, including without limitation the rights to
-    use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-    the Software, and to permit persons to whom the Software is furnished to do so,
-    subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-    FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-    COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-    IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-An exception is made for files in readable text which contain their own license information, or files where an accompanying file exists (in the same directory) with a “-license” suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example “tidy” is accompanied by “tidy-license.txt”.
--- a/vendor/licenses/grammar/language-batchfile.txt
+++ b/vendor/licenses/grammar/language-batchfile.txt
@@ -1,11 +1,9 @@
 ---
 type: grammar
-name: Sublime-Inform
+name: language-batchfile
 license: mit
 ---
-The MIT License (MIT)
-
-Copyright (c) 2014 Nate Dickson
+Copyright (c) 2014 Michael Mims

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -14,13 +12,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
--- a/vendor/licenses/grammar/language-emacs-lisp.txt
+++ b/vendor/licenses/grammar/language-emacs-lisp.txt
@@ -0,0 +1,18 @@
+---
+type: grammar
+name: language-emacs-lisp
+license: isc
+---
+Copyright (c) 2016, John Gardner
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- a/vendor/licenses/grammar/language-rpm-spec.txt
+++ b/vendor/licenses/grammar/language-rpm-spec.txt
@@ -0,0 +1,25 @@
+---
+type: grammar
+name: language-rpm-spec
+license: mit
+---
+Copyright (c) 2015 Jeremiah Powell
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/vendor/licenses/grammar/less.tmbundle.txt
+++ b/vendor/licenses/grammar/less.tmbundle.txt
@@ -1,14 +0,0 @@
---
-type: grammar
-name: less.tmbundle
-license: mit
-curated: true
---
-
-Copyright (c) 2010 Scott Kyle and Rasmus Andersson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Author	SHA1	Message	Date
Arfon Smith	e57273c839	Merge pull request #3214 from pchaigno/remove-sublime-syntax Remove support for .sublime-syntax	2016-09-14 15:21:54 -07:00
Paul Chaignon	65491d460e	Remove support for .sublime-syntax	2016-09-14 23:09:22 +02:00
Arfon Smith	8dc4a1308f	Merge pull request #3212 from github/cut-release-v4.8.11 Cut release v4.8.11	2016-09-13 13:02:13 -07:00
Arfon Smith	6841b4d259	Updating to v4.8.11	2016-09-13 11:37:42 -07:00
Arfon Smith	a53423b6e0	Grammar updates	2016-09-13 11:33:20 -07:00
Arfon Smith	02f3ba1840	Merge pull request #3205 from github/language-id Language ids	2016-09-13 11:27:25 -07:00
Arfon Smith	e1216ea4ee	Merge branch 'language-id' of github.com:github/linguist into language-id	2016-09-13 11:14:19 -07:00
Arfon Smith	a3227c2c27	Adding basic find_by_id functionality to Language	2016-09-13 11:09:05 -07:00
Arfon Smith	9f1c950a1f	Merge pull request #3206 from pchaigno/fix-elm-highlighting Fix Elm highlighting	2016-09-13 10:44:46 -07:00
Arfon Smith	c7a0d7b83d	Merge pull request #3208 from pchaigno/lock-grammar-versions Lock grammar versions	2016-09-13 10:43:39 -07:00
Arfon Smith	53c9b2b435	Merge pull request #3207 from pchaigno/test-uniqueness-language-ids Test the uniqueness of language ids	2016-09-13 10:42:53 -07:00
Paul Chaignon	b4a77abd82	Lock SourcePawn grammar to last working version	2016-09-13 13:50:57 +02:00
Paul Chaignon	8a622823b0	Lock NSIS grammar to last working version	2016-09-13 13:47:03 +02:00
Paul Chaignon	3310d925b6	Lock awk grammar to last working version	2016-09-13 13:41:11 +02:00
Paul Chaignon	65201b322a	Test the uniqueness of language ids	2016-09-13 13:10:07 +02:00
Paul Chaignon	b71bf19e37	Fix Elm highlighting Elm grammar repository contains several YAML files with a source.elm scope We need to restrict the path to the Syntaxes directory to make sure we select the appropriate YAML file	2016-09-13 11:04:49 +02:00
Arfon Smith	1f43664a51	Adding some tests for some known language_ids	2016-09-12 22:10:59 -07:00
Arfon Smith	7cda13afcb	A Language should know about it's language_id	2016-09-12 22:02:49 -07:00
Arfon Smith	e0d890240b	Adding basic script for adding language_id fields to languages.yml	2016-09-12 21:35:10 -07:00
Arfon Smith	1fc4c9fdc6	Merge pull request #3203 from github/cut-release-v4.8.10 Cut release v4.8.10	2016-09-11 22:35:56 -07:00
Arfon Smith	fdec52c89a	Bumping to v4.8.10	2016-09-11 22:12:38 -07:00
Arfon Smith	6e40de47da	Grammar update	2016-09-11 22:05:40 -07:00
Arfon Smith	28be72892e	Merge pull request #3173 from Alhadis/specfiles Add support for RPM Spec files	2016-09-11 21:17:57 -07:00
Arfon Smith	6df0e4591d	Merge pull request #3198 from larsbrinkhoff/filebench Add Filebench WML	2016-09-11 21:16:03 -07:00
Arfon Smith	879c63a25e	Merge pull request #3201 from pchaigno/lock-babel-grammar Lock language-babel grammar to v2.22.0	2016-09-11 19:53:10 -07:00
Arfon Smith	ab2e640759	Merge pull request #3189 from Alhadis/batch-fix Replace Batchfile grammar and cleanup submodule list	2016-09-11 19:52:51 -07:00
Paul Chaignon	5e4e38b39a	Lock language-babel grammar to v2.22.0 Use our own fork to make sure we don't update it by mistake	2016-09-11 16:56:17 +02:00
Lars Brinkhoff	dad3191238	Add Filebench Workload Model Language. Sample file from filebench project, Sun CDDL license.	2016-09-09 08:27:17 +02:00
Alhadis	35a13b3633	Add .spec as a supported Python and Ruby extension	2016-09-09 05:41:46 +10:00
Alhadis	56fb48ea96	Merge branch 'master' into specfiles	2016-09-09 05:07:55 +10:00
Lars Brinkhoff	983ff20d3c	Merge pull request #3195 from larsbrinkhoff/r Recognise R comments in heuristic.	2016-09-07 18:57:45 +02:00
Lars Brinkhoff	2d51a5dba4	Recognise R comments in heuristic.	2016-09-07 08:05:22 +02:00
Arfon Smith	df98c86acd	Merge pull request #3183 from akhtars/master Add support for Schematron XML validation files (.sch)	2016-09-06 14:22:49 -07:00
Alhadis	98118eb70b	Add new grammar for MSDOS Batchfile highlighting	2016-09-07 06:05:02 +10:00
Alhadis	1ec84da277	Remove dangling submodules	2016-09-07 06:04:51 +10:00
Alhadis	3112e6deda	Normalise .gitmodules formatting	2016-09-07 06:03:35 +10:00
Arfon Smith	04e1cc6d0a	Merge pull request #3079 from pchaigno/yaml-grammars YAML grammar files	2016-09-04 16:54:35 -07:00
Paul Chaignon	dd7b125869	Merge pull request #3174 from Alhadis/emacs-lisp Use a dedicated grammar for Emacs Lisp highlighting	2016-09-04 19:48:42 +02:00
Arfon Smith	426818120c	Merge pull request #3176 from Alhadis/typo-fixes Fix typos	2016-09-04 08:46:31 -07:00
Shaun Akhtar	50bd2cc3c8	Add support for Schematron XML validation files (.sch) Update languages.yml and add three public domain sample documents.	2016-08-31 12:56:02 -04:00
Alhadis	e930ee1a8e	Fix typos	2016-08-29 02:24:21 +10:00
Alhadis	5ddccaac83	Add ".spacemacs" as a recognised filename	2016-08-29 01:08:10 +10:00
Alhadis	51d7c8f905	Use a dedicated grammar to highlight Emacs Lisp	2016-08-29 00:52:15 +10:00
Alhadis	ed71855612	Add sample .spec files	2016-08-29 00:28:18 +10:00
Alhadis	742faebd8b	Add RPM Spec files to languages list	2016-08-29 00:25:33 +10:00
Paul Chaignon	6763b73d9c	Fix .ts heuristic rule (#3171 ) Use the opening TS tag instead of the closing tag since the closing tag might be at the end of the file, after the max number of lines we read with a LazyBlob	2016-08-27 21:01:58 +02:00
Paul Chaignon	adaf4011bc	Support for .YAML-tmLanguage grammar files	2016-06-26 20:57:50 +02:00
Paul Chaignon	4a031107ac	Support for Sublime Text YAML syntax definitions Sublime Text YAML syntax definitions use the .sublime-syntax file extension Most syntax files declare a YAML 1.2 syntax although they are YAML 1.1 compatible Thus, the YAML version header is stripped off before parsing Displays a warning if parsing fails In .sublime-syntax files, the scope is under the 'scope' key -- as opposed to the usual 'scopeName' key	2016-06-26 19:47:34 +02:00