Merge pull request #2654 from github/vmg/git-linguist-fixes

Small fixes for git-linguist
Bump version
2025-10-29 17:50:22 +00:00 · 2015-09-28 11:12:49 +02:00 · 2015-09-28 01:45:49 -07:00 · 2015-09-28 01:45:49 -07:00 · 2015-09-28 01:45:49 -07:00 · 2015-09-28 01:45:49 -07:00
1577 changed files with 288785 additions and 29337 deletions
--- a/samples/CoffeeScript/empty.coffee
+++ b/samples/CoffeeScript/empty.coffee
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,8 @@
-Gemfile.lock
+/Gemfile.lock
+.bundle/
+benchmark/
+lib/linguist/samples.json
+/grammars
+/node_modules
+test/fixtures/ace_modes.json
+/vendor/gems/
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,682 @@
+[submodule "vendor/grammars/go-tmbundle"]
+	path = vendor/grammars/go-tmbundle
+	url = https://github.com/AlanQuatermain/go-tmbundle
+[submodule "vendor/grammars/PHP-Twig.tmbundle"]
+	path = vendor/grammars/PHP-Twig.tmbundle
+	url = https://github.com/Anomareh/PHP-Twig.tmbundle
+[submodule "vendor/grammars/sublime-cirru"]
+	path = vendor/grammars/sublime-cirru
+	url = https://github.com/Cirru/sublime-cirru
+[submodule "vendor/grammars/Sublime-Logos"]
+	path = vendor/grammars/Sublime-Logos
+	url = https://github.com/Cykey/Sublime-Logos
+[submodule "vendor/grammars/SublimeBrainfuck"]
+	path = vendor/grammars/SublimeBrainfuck
+	url = https://github.com/Drako/SublimeBrainfuck
+[submodule "vendor/grammars/awk-sublime"]
+	path = vendor/grammars/awk-sublime
+	url = https://github.com/JohnNilsson/awk-sublime
+[submodule "vendor/grammars/Sublime-SQF-Language"]
+	path = vendor/grammars/Sublime-SQF-Language
+	url = https://github.com/JonBons/Sublime-SQF-Language
+[submodule "vendor/grammars/SCSS.tmbundle"]
+	path = vendor/grammars/SCSS.tmbundle
+	url = https://github.com/MarioRicalde/SCSS.tmbundle
+[submodule "vendor/grammars/Sublime-REBOL"]
+	path = vendor/grammars/Sublime-REBOL
+	url = https://github.com/Oldes/Sublime-REBOL
+[submodule "vendor/grammars/Sublime-Inform"]
+	path = vendor/grammars/Sublime-Inform
+	url = https://github.com/PogiNate/Sublime-Inform
+[submodule "vendor/grammars/autoitv3-tmbundle"]
+	path = vendor/grammars/autoitv3-tmbundle
+	url = https://github.com/Red-Nova-Technologies/autoitv3-tmbundle
+[submodule "vendor/grammars/Sublime-VimL"]
+	path = vendor/grammars/Sublime-VimL
+	url = https://github.com/SalGnt/Sublime-VimL
+[submodule "vendor/grammars/boo-sublime"]
+	path = vendor/grammars/boo-sublime
+	url = https://github.com/Shammah/boo-sublime
+[submodule "vendor/grammars/ColdFusion"]
+	path = vendor/grammars/ColdFusion
+	url = https://github.com/SublimeText/ColdFusion
+[submodule "vendor/grammars/NSIS"]
+	path = vendor/grammars/NSIS
+	url = https://github.com/SublimeText/NSIS
+[submodule "vendor/grammars/NimLime"]
+	path = vendor/grammars/NimLime
+	url = https://github.com/Varriount/NimLime
+[submodule "vendor/grammars/gradle.tmbundle"]
+	path = vendor/grammars/gradle.tmbundle
+	url = https://github.com/alkemist/gradle.tmbundle
+[submodule "vendor/grammars/Sublime-Loom"]
+	path = vendor/grammars/Sublime-Loom
+	url = https://github.com/ambethia/Sublime-Loom
+[submodule "vendor/grammars/VBDotNetSyntax"]
+	path = vendor/grammars/VBDotNetSyntax
+	url = https://github.com/angryant0007/VBDotNetSyntax
+[submodule "vendor/grammars/cool-tmbundle"]
+	path = vendor/grammars/cool-tmbundle
+	url = https://github.com/anunayk/cool-tmbundle
+[submodule "vendor/grammars/Docker.tmbundle"]
+	path = vendor/grammars/Docker.tmbundle
+	url = https://github.com/asbjornenge/Docker.tmbundle
+[submodule "vendor/grammars/jasmin-sublime"]
+	path = vendor/grammars/jasmin-sublime
+	url = https://github.com/atmarksharp/jasmin-sublime
+[submodule "vendor/grammars/language-clojure"]
+	path = vendor/grammars/language-clojure
+	url = https://github.com/atom/language-clojure
+[submodule "vendor/grammars/language-coffee-script"]
+	path = vendor/grammars/language-coffee-script
+	url = https://github.com/atom/language-coffee-script
+[submodule "vendor/grammars/language-csharp"]
+	path = vendor/grammars/language-csharp
+	url = https://github.com/atom/language-csharp
+[submodule "vendor/grammars/language-gfm"]
+	path = vendor/grammars/language-gfm
+	url = https://github.com/atom/language-gfm
+[submodule "vendor/grammars/language-javascript"]
+	path = vendor/grammars/language-javascript
+	url = https://github.com/atom/language-javascript
+[submodule "vendor/grammars/language-python"]
+	path = vendor/grammars/language-python
+	url = https://github.com/atom/language-python
+[submodule "vendor/grammars/language-shellscript"]
+	path = vendor/grammars/language-shellscript
+	url = https://github.com/atom/language-shellscript
+[submodule "vendor/grammars/language-yaml"]
+	path = vendor/grammars/language-yaml
+	url = https://github.com/atom/language-yaml
+[submodule "vendor/grammars/sublime-sourcepawn"]
+	path = vendor/grammars/sublime-sourcepawn
+	url = https://github.com/austinwagner/sublime-sourcepawn
+[submodule "vendor/grammars/Sublime-Lasso"]
+	path = vendor/grammars/Sublime-Lasso
+	url = https://github.com/bfad/Sublime-Lasso
+[submodule "vendor/grammars/chapel-tmbundle"]
+	path = vendor/grammars/chapel-tmbundle
+	url = https://github.com/chapel-lang/chapel-tmbundle
+[submodule "vendor/grammars/sublime-nginx"]
+	path = vendor/grammars/sublime-nginx
+	url = https://github.com/brandonwamboldt/sublime-nginx
+[submodule "vendor/grammars/bro-sublime"]
+	path = vendor/grammars/bro-sublime
+	url = https://github.com/bro/bro-sublime
+[submodule "vendor/grammars/sublime_man_page_support"]
+	path = vendor/grammars/sublime_man_page_support
+	url = https://github.com/carsonoid/sublime_man_page_support
+[submodule "vendor/grammars/sublime-MuPAD"]
+	path = vendor/grammars/sublime-MuPAD
+	url = https://github.com/ccreutzig/sublime-MuPAD
+[submodule "vendor/grammars/nesC.tmbundle"]
+	path = vendor/grammars/nesC.tmbundle
+	url = https://github.com/cdwilson/nesC.tmbundle
+[submodule "vendor/grammars/haxe-sublime-bundle"]
+	path = vendor/grammars/haxe-sublime-bundle
+	url = https://github.com/clemos/haxe-sublime-bundle
+[submodule "vendor/grammars/cucumber-tmbundle"]
+	path = vendor/grammars/cucumber-tmbundle
+	url = https://github.com/cucumber/cucumber-tmbundle
+[submodule "vendor/grammars/powershell"]
+	path = vendor/grammars/powershell
+	url = https://github.com/SublimeText/PowerShell
+[submodule "vendor/grammars/jade-tmbundle"]
+	path = vendor/grammars/jade-tmbundle
+	url = https://github.com/davidrios/jade-tmbundle
+[submodule "vendor/grammars/elixir-tmbundle"]
+	path = vendor/grammars/elixir-tmbundle
+	url = https://github.com/elixir-lang/elixir-tmbundle
+[submodule "vendor/grammars/sublime-glsl"]
+	path = vendor/grammars/sublime-glsl
+	url = https://github.com/euler0/sublime-glsl
+[submodule "vendor/grammars/fancy-tmbundle"]
+	path = vendor/grammars/fancy-tmbundle
+	url = https://github.com/fancy-lang/fancy-tmbundle
+[submodule "vendor/grammars/monkey.tmbundle"]
+	path = vendor/grammars/monkey.tmbundle
+	url = https://github.com/gingerbeardman/monkey.tmbundle
+[submodule "vendor/grammars/dart-sublime-bundle"]
+	path = vendor/grammars/dart-sublime-bundle
+	url = https://github.com/guillermooo/dart-sublime-bundle
+[submodule "vendor/grammars/sublimetext-cuda-cpp"]
+	path = vendor/grammars/sublimetext-cuda-cpp
+	url = https://github.com/harrism/sublimetext-cuda-cpp
+[submodule "vendor/grammars/pike-textmate"]
+	path = vendor/grammars/pike-textmate
+	url = https://github.com/hww3/pike-textmate
+[submodule "vendor/grammars/ceylon-sublimetext"]
+	path = vendor/grammars/ceylon-sublimetext
+	url = https://github.com/jeancharles-roger/ceylon-sublimetext
+[submodule "vendor/grammars/Sublime-Text-2-OpenEdge-ABL"]
+	path = vendor/grammars/Sublime-Text-2-OpenEdge-ABL
+	url = https://github.com/jfairbank/Sublime-Text-2-OpenEdge-ABL
+[submodule "vendor/grammars/sublime-rust"]
+	path = vendor/grammars/sublime-rust
+	url = https://github.com/jhasse/sublime-rust
+[submodule "vendor/grammars/sublime-befunge"]
+	path = vendor/grammars/sublime-befunge
+	url = https://github.com/johanasplund/sublime-befunge
+[submodule "vendor/grammars/RDoc.tmbundle"]
+	path = vendor/grammars/RDoc.tmbundle
+	url = https://github.com/joshaven/RDoc.tmbundle
+[submodule "vendor/grammars/Textmate-Gosu-Bundle"]
+	path = vendor/grammars/Textmate-Gosu-Bundle
+	url = https://github.com/jpcamara/Textmate-Gosu-Bundle
+[submodule "vendor/grammars/fish-tmbundle"]
+	path = vendor/grammars/fish-tmbundle
+	url = https://github.com/l15n/fish-tmbundle
+[submodule "vendor/grammars/sublime-idris"]
+	path = vendor/grammars/sublime-idris
+	url = https://github.com/laughedelic/sublime-idris
+[submodule "vendor/grammars/moonscript-tmbundle"]
+	path = vendor/grammars/moonscript-tmbundle
+	url = https://github.com/leafo/moonscript-tmbundle
+[submodule "vendor/grammars/Isabelle.tmbundle"]
+	path = vendor/grammars/Isabelle.tmbundle
+	url = https://github.com/lsf37/Isabelle.tmbundle
+[submodule "vendor/grammars/x86-assembly-textmate-bundle"]
+	path = vendor/grammars/x86-assembly-textmate-bundle
+	url = https://github.com/lunixbochs/x86-assembly-textmate-bundle
+[submodule "vendor/grammars/Alloy.tmbundle"]
+	path = vendor/grammars/Alloy.tmbundle
+	url = https://github.com/macekond/Alloy.tmbundle
+[submodule "vendor/grammars/opa.tmbundle"]
+	path = vendor/grammars/opa.tmbundle
+	url = https://github.com/mads379/opa.tmbundle
+[submodule "vendor/grammars/scala.tmbundle"]
+	path = vendor/grammars/scala.tmbundle
+	url = https://github.com/mads379/scala.tmbundle
+[submodule "vendor/grammars/mako-tmbundle"]
+	path = vendor/grammars/mako-tmbundle
+	url = https://github.com/marconi/mako-tmbundle
+[submodule "vendor/grammars/gnuplot-tmbundle"]
+	path = vendor/grammars/gnuplot-tmbundle
+	url = https://github.com/mattfoster/gnuplot-tmbundle
+[submodule "vendor/grammars/idl.tmbundle"]
+	path = vendor/grammars/idl.tmbundle
+	url = https://github.com/mgalloy/idl.tmbundle
+[submodule "vendor/grammars/protobuf-tmbundle"]
+	path = vendor/grammars/protobuf-tmbundle
+	url = https://github.com/michaeledgar/protobuf-tmbundle
+[submodule "vendor/grammars/Sublime-Coq"]
+	path = vendor/grammars/Sublime-Coq
+	url = https://github.com/mkolosick/Sublime-Coq
+[submodule "vendor/grammars/Agda.tmbundle"]
+	path = vendor/grammars/Agda.tmbundle
+	url = https://github.com/mokus0/Agda.tmbundle
+[submodule "vendor/grammars/Julia.tmbundle"]
+	path = vendor/grammars/Julia.tmbundle
+	url = https://github.com/nanoant/Julia.tmbundle
+[submodule "vendor/grammars/assembly.tmbundle"]
+	path = vendor/grammars/assembly.tmbundle
+	url = https://github.com/nanoant/assembly.tmbundle
+[submodule "vendor/grammars/ooc.tmbundle"]
+	path = vendor/grammars/ooc.tmbundle
+	url = https://github.com/nilium/ooc.tmbundle
+[submodule "vendor/grammars/LiveScript.tmbundle"]
+	path = vendor/grammars/LiveScript.tmbundle
+	url = https://github.com/paulmillr/LiveScript.tmbundle
+[submodule "vendor/grammars/sublime-tea"]
+	path = vendor/grammars/sublime-tea
+	url = https://github.com/pferruggiaro/sublime-tea
+[submodule "vendor/grammars/puppet-textmate-bundle"]
+	path = vendor/grammars/puppet-textmate-bundle
+	url = https://github.com/puppet-textmate-bundle/puppet-textmate-bundle
+[submodule "vendor/grammars/abap.tmbundle"]
+	path = vendor/grammars/abap.tmbundle
+	url = https://github.com/pvl/abap.tmbundle
+[submodule "vendor/grammars/mercury-tmlanguage"]
+	path = vendor/grammars/mercury-tmlanguage
+	url = https://github.com/sebgod/mercury-tmlanguage
+[submodule "vendor/grammars/mathematica-tmbundle"]
+	path = vendor/grammars/mathematica-tmbundle
+	url = https://github.com/shadanan/mathematica-tmbundle
+[submodule "vendor/grammars/sublime-robot-plugin"]
+	path = vendor/grammars/sublime-robot-plugin
+	url = https://github.com/shellderp/sublime-robot-plugin
+[submodule "vendor/grammars/actionscript3-tmbundle"]
+	path = vendor/grammars/actionscript3-tmbundle
+	url = https://github.com/honzabrecka/actionscript3-tmbundle
+[submodule "vendor/grammars/Sublime-QML"]
+	path = vendor/grammars/Sublime-QML
+	url = https://github.com/skozlovf/Sublime-QML
+[submodule "vendor/grammars/Slash.tmbundle"]
+	path = vendor/grammars/Slash.tmbundle
+	url = https://github.com/slash-lang/Slash.tmbundle
+[submodule "vendor/grammars/factor"]
+	path = vendor/grammars/factor
+	url = https://github.com/slavapestov/factor
+[submodule "vendor/grammars/ruby-slim.tmbundle"]
+	path = vendor/grammars/ruby-slim.tmbundle
+	url = https://github.com/slim-template/ruby-slim.tmbundle
+[submodule "vendor/grammars/SublimeXtend"]
+	path = vendor/grammars/SublimeXtend
+	url = https://github.com/staltz/SublimeXtend
+[submodule "vendor/grammars/Stata.tmbundle"]
+	path = vendor/grammars/Stata.tmbundle
+	url = https://github.com/statatmbundle/Stata.tmbundle
+[submodule "vendor/grammars/Vala-TMBundle"]
+	path = vendor/grammars/Vala-TMBundle
+	url = https://github.com/technosophos/Vala-TMBundle
+[submodule "vendor/grammars/ant.tmbundle"]
+	path = vendor/grammars/ant.tmbundle
+	url = https://github.com/textmate/ant.tmbundle
+[submodule "vendor/grammars/antlr.tmbundle"]
+	path = vendor/grammars/antlr.tmbundle
+	url = https://github.com/textmate/antlr.tmbundle
+[submodule "vendor/grammars/apache.tmbundle"]
+	path = vendor/grammars/apache.tmbundle
+	url = https://github.com/textmate/apache.tmbundle
+[submodule "vendor/grammars/applescript.tmbundle"]
+	path = vendor/grammars/applescript.tmbundle
+	url = https://github.com/textmate/applescript.tmbundle
+[submodule "vendor/grammars/asp.tmbundle"]
+	path = vendor/grammars/asp.tmbundle
+	url = https://github.com/textmate/asp.tmbundle
+[submodule "vendor/grammars/bison.tmbundle"]
+	path = vendor/grammars/bison.tmbundle
+	url = https://github.com/textmate/bison.tmbundle
+[submodule "vendor/grammars/capnproto.tmbundle"]
+	path = vendor/grammars/capnproto.tmbundle
+	url = https://github.com/textmate/capnproto.tmbundle
+[submodule "vendor/grammars/cmake.tmbundle"]
+	path = vendor/grammars/cmake.tmbundle
+	url = https://github.com/textmate/cmake.tmbundle
+[submodule "vendor/grammars/cpp-qt.tmbundle"]
+	path = vendor/grammars/cpp-qt.tmbundle
+	url = https://github.com/textmate/cpp-qt.tmbundle
+[submodule "vendor/grammars/css.tmbundle"]
+	path = vendor/grammars/css.tmbundle
+	url = https://github.com/textmate/css.tmbundle
+[submodule "vendor/grammars/d.tmbundle"]
+	path = vendor/grammars/d.tmbundle
+	url = https://github.com/textmate/d.tmbundle
+[submodule "vendor/grammars/diff.tmbundle"]
+	path = vendor/grammars/diff.tmbundle
+	url = https://github.com/textmate/diff.tmbundle
+[submodule "vendor/grammars/dylan.tmbundle"]
+	path = vendor/grammars/dylan.tmbundle
+	url = https://github.com/textmate/dylan.tmbundle
+[submodule "vendor/grammars/eiffel.tmbundle"]
+	path = vendor/grammars/eiffel.tmbundle
+	url = https://github.com/textmate/eiffel.tmbundle
+[submodule "vendor/grammars/erlang.tmbundle"]
+	path = vendor/grammars/erlang.tmbundle
+	url = https://github.com/textmate/erlang.tmbundle
+[submodule "vendor/grammars/fortran.tmbundle"]
+	path = vendor/grammars/fortran.tmbundle
+	url = https://github.com/textmate/fortran.tmbundle
+[submodule "vendor/grammars/gettext.tmbundle"]
+	path = vendor/grammars/gettext.tmbundle
+	url = https://github.com/textmate/gettext.tmbundle
+[submodule "vendor/grammars/graphviz.tmbundle"]
+	path = vendor/grammars/graphviz.tmbundle
+	url = https://github.com/textmate/graphviz.tmbundle
+[submodule "vendor/grammars/groovy.tmbundle"]
+	path = vendor/grammars/groovy.tmbundle
+	url = https://github.com/textmate/groovy.tmbundle
+[submodule "vendor/grammars/haskell.tmbundle"]
+	path = vendor/grammars/haskell.tmbundle
+	url = https://github.com/textmate/haskell.tmbundle
+[submodule "vendor/grammars/html.tmbundle"]
+	path = vendor/grammars/html.tmbundle
+	url = https://github.com/textmate/html.tmbundle
+[submodule "vendor/grammars/ini.tmbundle"]
+	path = vendor/grammars/ini.tmbundle
+	url = https://github.com/textmate/ini.tmbundle
+[submodule "vendor/grammars/desktop.tmbundle"]
+	path = vendor/grammars/desktop.tmbundle
+	url = https://github.com/Mailaender/desktop.tmbundle.git
+[submodule "vendor/grammars/io.tmbundle"]
+	path = vendor/grammars/io.tmbundle
+	url = https://github.com/textmate/io.tmbundle
+[submodule "vendor/grammars/java.tmbundle"]
+	path = vendor/grammars/java.tmbundle
+	url = https://github.com/textmate/java.tmbundle
+[submodule "vendor/grammars/javascript-objective-j.tmbundle"]
+	path = vendor/grammars/javascript-objective-j.tmbundle
+	url = https://github.com/textmate/javascript-objective-j.tmbundle
+[submodule "vendor/grammars/json.tmbundle"]
+	path = vendor/grammars/json.tmbundle
+	url = https://github.com/textmate/json.tmbundle
+[submodule "vendor/grammars/latex.tmbundle"]
+	path = vendor/grammars/latex.tmbundle
+	url = https://github.com/textmate/latex.tmbundle
+[submodule "vendor/grammars/less.tmbundle"]
+	path = vendor/grammars/less.tmbundle
+	url = https://github.com/textmate/less.tmbundle
+[submodule "vendor/grammars/lilypond.tmbundle"]
+	path = vendor/grammars/lilypond.tmbundle
+	url = https://github.com/textmate/lilypond.tmbundle
+[submodule "vendor/grammars/lisp.tmbundle"]
+	path = vendor/grammars/lisp.tmbundle
+	url = https://github.com/textmate/lisp.tmbundle
+[submodule "vendor/grammars/logtalk.tmbundle"]
+	path = vendor/grammars/logtalk.tmbundle
+	url = https://github.com/textmate/logtalk.tmbundle
+[submodule "vendor/grammars/lua.tmbundle"]
+	path = vendor/grammars/lua.tmbundle
+	url = https://github.com/textmate/lua.tmbundle
+[submodule "vendor/grammars/make.tmbundle"]
+	path = vendor/grammars/make.tmbundle
+	url = https://github.com/textmate/make.tmbundle
+[submodule "vendor/grammars/matlab.tmbundle"]
+	path = vendor/grammars/matlab.tmbundle
+	url = https://github.com/textmate/matlab.tmbundle
+[submodule "vendor/grammars/maven.tmbundle"]
+	path = vendor/grammars/maven.tmbundle
+	url = https://github.com/textmate/maven.tmbundle
+[submodule "vendor/grammars/nemerle.tmbundle"]
+	path = vendor/grammars/nemerle.tmbundle
+	url = https://github.com/textmate/nemerle.tmbundle
+[submodule "vendor/grammars/ninja.tmbundle"]
+	path = vendor/grammars/ninja.tmbundle
+	url = https://github.com/textmate/ninja.tmbundle
+[submodule "vendor/grammars/objective-c.tmbundle"]
+	path = vendor/grammars/objective-c.tmbundle
+	url = https://github.com/textmate/objective-c.tmbundle
+[submodule "vendor/grammars/ocaml.tmbundle"]
+	path = vendor/grammars/ocaml.tmbundle
+	url = https://github.com/textmate/ocaml.tmbundle
+[submodule "vendor/grammars/pascal.tmbundle"]
+	path = vendor/grammars/pascal.tmbundle
+	url = https://github.com/textmate/pascal.tmbundle
+[submodule "vendor/grammars/php-smarty.tmbundle"]
+	path = vendor/grammars/php-smarty.tmbundle
+	url = https://github.com/textmate/php-smarty.tmbundle
+[submodule "vendor/grammars/php.tmbundle"]
+	path = vendor/grammars/php.tmbundle
+	url = https://github.com/textmate/php.tmbundle
+[submodule "vendor/grammars/postscript.tmbundle"]
+	path = vendor/grammars/postscript.tmbundle
+	url = https://github.com/textmate/postscript.tmbundle
+[submodule "vendor/grammars/processing.tmbundle"]
+	path = vendor/grammars/processing.tmbundle
+	url = https://github.com/textmate/processing.tmbundle
+[submodule "vendor/grammars/python-django.tmbundle"]
+	path = vendor/grammars/python-django.tmbundle
+	url = https://github.com/textmate/python-django.tmbundle
+[submodule "vendor/grammars/r.tmbundle"]
+	path = vendor/grammars/r.tmbundle
+	url = https://github.com/textmate/r.tmbundle
+[submodule "vendor/grammars/restructuredtext.tmbundle"]
+	path = vendor/grammars/restructuredtext.tmbundle
+	url = https://github.com/textmate/restructuredtext.tmbundle
+[submodule "vendor/grammars/ruby-haml.tmbundle"]
+	path = vendor/grammars/ruby-haml.tmbundle
+	url = https://github.com/textmate/ruby-haml.tmbundle
+[submodule "vendor/grammars/scheme.tmbundle"]
+	path = vendor/grammars/scheme.tmbundle
+	url = https://github.com/textmate/scheme.tmbundle
+[submodule "vendor/grammars/scilab.tmbundle"]
+	path = vendor/grammars/scilab.tmbundle
+	url = https://github.com/textmate/scilab.tmbundle
+[submodule "vendor/grammars/sql.tmbundle"]
+	path = vendor/grammars/sql.tmbundle
+	url = https://github.com/textmate/sql.tmbundle
+[submodule "vendor/grammars/standard-ml.tmbundle"]
+	path = vendor/grammars/standard-ml.tmbundle
+	url = https://github.com/textmate/standard-ml.tmbundle
+[submodule "vendor/grammars/swift.tmbundle"]
+	path = vendor/grammars/swift.tmbundle
+	url = https://github.com/textmate/swift.tmbundle
+[submodule "vendor/grammars/tcl.tmbundle"]
+	path = vendor/grammars/tcl.tmbundle
+	url = https://github.com/textmate/tcl.tmbundle
+[submodule "vendor/grammars/thrift.tmbundle"]
+	path = vendor/grammars/thrift.tmbundle
+	url = https://github.com/textmate/thrift.tmbundle
+[submodule "vendor/grammars/toml.tmbundle"]
+	path = vendor/grammars/toml.tmbundle
+	url = https://github.com/textmate/toml.tmbundle
+[submodule "vendor/grammars/verilog.tmbundle"]
+	path = vendor/grammars/verilog.tmbundle
+	url = https://github.com/textmate/verilog.tmbundle
+[submodule "vendor/grammars/xml.tmbundle"]
+	path = vendor/grammars/xml.tmbundle
+	url = https://github.com/textmate/xml.tmbundle
+[submodule "vendor/grammars/smalltalk-tmbundle"]
+	path = vendor/grammars/smalltalk-tmbundle
+	url = https://github.com/tomas-stefano/smalltalk-tmbundle
+[submodule "vendor/grammars/ioke-outdated"]
+	path = vendor/grammars/ioke-outdated
+	url = https://github.com/vic/ioke-outdated
+[submodule "vendor/grammars/kotlin-sublime-package"]
+	path = vendor/grammars/kotlin-sublime-package
+	url = https://github.com/vkostyukov/kotlin-sublime-package
+[submodule "vendor/grammars/c.tmbundle"]
+	path = vendor/grammars/c.tmbundle
+	url = https://github.com/textmate/c.tmbundle
+[submodule "vendor/grammars/zephir-sublime"]
+	path = vendor/grammars/zephir-sublime
+	url = https://github.com/vmg/zephir-sublime
+[submodule "vendor/grammars/llvm.tmbundle"]
+	path = vendor/grammars/llvm.tmbundle
+	url = https://github.com/whitequark/llvm.tmbundle
+[submodule "vendor/grammars/sublime-nix"]
+	path = vendor/grammars/sublime-nix
+	url = https://github.com/wmertens/sublime-nix
+[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/sublime-mask"]
+	path = vendor/grammars/sublime-mask
+	url = https://github.com/tenbits/sublime-mask
+[submodule "vendor/grammars/sublime_cobol"]
+	path = vendor/grammars/sublime_cobol
+	url = https://bitbucket.org/bitlang/sublime_cobol
+[submodule "vendor/grammars/ruby.tmbundle"]
+	path = vendor/grammars/ruby.tmbundle
+	url = https://github.com/aroben/ruby.tmbundle
+	branch = pl
+[submodule "vendor/grammars/IDL-Syntax"]
+	path = vendor/grammars/IDL-Syntax
+	url = https://github.com/andik/IDL-Syntax
+[submodule "vendor/grammars/sas.tmbundle"]
+	path = vendor/grammars/sas.tmbundle
+	url = https://github.com/rpardee/sas.tmbundle
+[submodule "vendor/grammars/atom-salt"]
+	path = vendor/grammars/atom-salt
+	url = https://github.com/saltstack/atom-salt
+[submodule "vendor/grammars/Scalate.tmbundle"]
+	path = vendor/grammars/Scalate.tmbundle
+	url = https://github.com/scalate/Scalate.tmbundle
+[submodule "vendor/grammars/Elm.tmLanguage"]
+	path = vendor/grammars/Elm.tmLanguage
+	url = https://github.com/deadfoxygrandpa/Elm.tmLanguage
+[submodule "vendor/grammars/sublime-bsv"]
+	path = vendor/grammars/sublime-bsv
+	url = https://github.com/thotypous/sublime-bsv
+[submodule "vendor/grammars/Sublime-HTTP"]
+	path = vendor/grammars/Sublime-HTTP
+	url = https://github.com/httpspec/sublime-highlighting
+[submodule "vendor/grammars/sass-textmate-bundle"]
+	path = vendor/grammars/sass-textmate-bundle
+	url = https://github.com/nathos/sass-textmate-bundle
+[submodule "vendor/grammars/carto-atom"]
+	path = vendor/grammars/carto-atom
+	url = https://github.com/yohanboniface/carto-atom
+[submodule "vendor/grammars/Sublime-Nit"]
+	path = vendor/grammars/Sublime-Nit
+	url = https://github.com/R4PaSs/Sublime-Nit
+[submodule "vendor/grammars/language-hy"]
+	path = vendor/grammars/language-hy
+	url = https://github.com/rwtolbert/language-hy
+[submodule "vendor/grammars/Racket"]
+	path = vendor/grammars/Racket
+	url = https://github.com/soegaard/racket-highlight-for-github
+[submodule "vendor/grammars/turtle.tmbundle"]
+	path = vendor/grammars/turtle.tmbundle
+	url = https://github.com/peta/turtle.tmbundle
+[submodule "vendor/grammars/liquid.tmbundle"]
+	path = vendor/grammars/liquid.tmbundle
+	url = https://github.com/bastilian/validcode-textmate-bundles
+[submodule "vendor/grammars/ats.sublime"]
+	path = vendor/grammars/ats.sublime
+	url = https://github.com/steinwaywhw/ats-mode-sublimetext
+[submodule "vendor/grammars/Modelica"]
+	path = vendor/grammars/Modelica
+	url = https://github.com/BorisChumichev/modelicaSublimeTextPackage
+[submodule "vendor/grammars/sublime-apl"]
+	path = vendor/grammars/sublime-apl
+	url = https://github.com/StoneCypher/sublime-apl
+[submodule "vendor/grammars/CLIPS-sublime"]
+	path = vendor/grammars/CLIPS-sublime
+	url = https://github.com/psicomante/CLIPS-sublime
+[submodule "vendor/grammars/Creole"]
+	path = vendor/grammars/Creole
+	url = https://github.com/Siddley/Creole
+[submodule "vendor/grammars/GDScript-sublime"]
+	path = vendor/grammars/GDScript-sublime
+	url = https://github.com/beefsack/GDScript-sublime
+[submodule "vendor/grammars/sublime-golo"]
+	path = vendor/grammars/sublime-golo
+	url = https://github.com/TypeUnsafe/sublime-golo
+[submodule "vendor/grammars/JSyntax"]
+	path = vendor/grammars/JSyntax
+	url = https://github.com/bcj/JSyntax
+[submodule "vendor/grammars/TXL"]
+	path = vendor/grammars/TXL
+	url = https://github.com/MikeHoffert/Sublime-Text-TXL-syntax
+[submodule "vendor/grammars/G-Code"]
+	path = vendor/grammars/G-Code
+	url = https://github.com/robotmaster/sublime-text-syntax-highlighting
+[submodule "vendor/grammars/grace-tmbundle"]
+	path = vendor/grammars/grace-tmbundle
+	url = https://github.com/zmthy/grace-tmbundle
+[submodule "vendor/grammars/sublime-text-ox"]
+	path = vendor/grammars/sublime-text-ox
+	url = https://github.com/andreashetland/sublime-text-ox
+[submodule "vendor/grammars/AutoHotkey"]
+	path = vendor/grammars/AutoHotkey
+	url = https://github.com/ahkscript/SublimeAutoHotkey
+[submodule "vendor/grammars/ec.tmbundle"]
+	path = vendor/grammars/ec.tmbundle
+	url = https://github.com/ecere/ec.tmbundle
+[submodule "vendor/grammars/InnoSetup"]
+	path = vendor/grammars/InnoSetup
+	url = https://github.com/idleberg/InnoSetup-Sublime-Text
+[submodule "vendor/grammars/gap-tmbundle"]
+	path = vendor/grammars/gap-tmbundle
+	url = https://github.com/dhowden/gap-tmbundle
+[submodule "vendor/grammars/SublimePapyrus"]
+	path = vendor/grammars/SublimePapyrus
+	url = https://github.com/Kapiainen/SublimePapyrus
+[submodule "vendor/grammars/sublime-spintools"]
+	path = vendor/grammars/sublime-spintools
+	url = https://github.com/bitbased/sublime-spintools
+[submodule "vendor/grammars/PogoScript.tmbundle"]
+	path = vendor/grammars/PogoScript.tmbundle
+	url = https://github.com/featurist/PogoScript.tmbundle
+[submodule "vendor/grammars/sublime-opal"]
+	path = vendor/grammars/sublime-opal
+	url = https://github.com/artifactz/sublime-opal
+[submodule "vendor/grammars/mediawiki.tmbundle"]
+	path = vendor/grammars/mediawiki.tmbundle
+	url = https://github.com/textmate/mediawiki.tmbundle
+[submodule "vendor/grammars/SublimeClarion"]
+	path = vendor/grammars/SublimeClarion
+	url = https://github.com/fushnisoft/SublimeClarion
+[submodule "vendor/grammars/oracle.tmbundle"]
+	path = vendor/grammars/oracle.tmbundle
+	url = https://github.com/mulander/oracle.tmbundle.git
+[submodule "vendor/grammars/BrightScript.tmbundle"]
+	path = vendor/grammars/BrightScript.tmbundle
+	url = https://github.com/cmink/BrightScript.tmbundle
+[submodule "vendor/grammars/Stylus"]
+	path = vendor/grammars/Stylus
+	url = https://github.com/billymoon/Stylus
+[submodule "vendor/grammars/asciidoc.tmbundle"]
+	path = vendor/grammars/asciidoc.tmbundle
+	url = https://github.com/zuckschwerdt/asciidoc.tmbundle
+[submodule "vendor/grammars/sublime-text-pig-latin"]
+	path = vendor/grammars/sublime-text-pig-latin
+	url = https://github.com/goblindegook/sublime-text-pig-latin
+[submodule "vendor/grammars/Lean.tmbundle"]
+	path = vendor/grammars/Lean.tmbundle
+	url = https://github.com/leanprover/Lean.tmbundle
+[submodule "vendor/grammars/ampl"]
+	path = vendor/grammars/ampl
+	url = https://github.com/ampl/sublime-ampl
+[submodule "vendor/grammars/openscad.tmbundle"]
+	path = vendor/grammars/openscad.tmbundle
+	url = https://github.com/tbuser/openscad.tmbundle
+[submodule "vendor/grammars/sublime-varnish"]
+	path = vendor/grammars/sublime-varnish
+	url = https://github.com/brandonwamboldt/sublime-varnish
+[submodule "vendor/grammars/xc.tmbundle"]
+	path = vendor/grammars/xc.tmbundle
+	url = https://github.com/graymalkin/xc.tmbundle
+[submodule "vendor/grammars/perl.tmbundle"]
+	path = vendor/grammars/perl.tmbundle
+	url = https://github.com/textmate/perl.tmbundle
+[submodule "vendor/grammars/sublime-netlinx"]
+	path = vendor/grammars/sublime-netlinx
+	url = https://github.com/amclain/sublime-netlinx
+[submodule "vendor/grammars/Sublime-Red"]
+	path = vendor/grammars/Sublime-Red
+	url = https://github.com/Oldes/Sublime-Red
+[submodule "vendor/grammars/jflex.tmbundle"]
+	path = vendor/grammars/jflex.tmbundle
+	url = https://github.com/jflex-de/jflex.tmbundle.git
+[submodule "vendor/grammars/Sublime-Modula-2"]
+	path = vendor/grammars/Sublime-Modula-2
+	url = https://github.com/harogaston/Sublime-Modula-2
+[submodule "vendor/grammars/ada.tmbundle"]
+	path = vendor/grammars/ada.tmbundle
+	url = https://github.com/textmate/ada.tmbundle
+[submodule "vendor/grammars/api-blueprint-sublime-plugin"]
+	path = vendor/grammars/api-blueprint-sublime-plugin
+	url = https://github.com/apiaryio/api-blueprint-sublime-plugin
+[submodule "vendor/grammars/Handlebars"]
+	path = vendor/grammars/Handlebars
+	url = https://github.com/daaain/Handlebars
+[submodule "vendor/grammars/smali-sublime"]
+	path = vendor/grammars/smali-sublime
+	url = https://github.com/ShaneWilton/sublime-smali
+[submodule "vendor/grammars/language-jsoniq"]
+	path = vendor/grammars/language-jsoniq
+	url = http://github.com/wcandillon/language-jsoniq
+[submodule "vendor/grammars/atom-fsharp"]
+	path = vendor/grammars/atom-fsharp
+	url = https://github.com/fsprojects/atom-fsharp
+[submodule "vendor/grammars/SMT.tmbundle"]
+	path = vendor/grammars/SMT.tmbundle
+	url = https://github.com/SRI-CSL/SMT.tmbundle.git
+[submodule "vendor/grammars/language-crystal"]
+	path = vendor/grammars/language-crystal
+	url = https://github.com/k2b6s9j/language-crystal
+[submodule "vendor/grammars/language-xbase"]
+	path = vendor/grammars/language-xbase
+	url = https://github.com/hernad/atom-language-harbour
+[submodule "vendor/grammars/language-ncl"]
+	path = vendor/grammars/language-ncl
+	url = https://github.com/rpavlick/language-ncl.git
+[submodule "vendor/grammars/atom-language-purescript"]
+	path = vendor/grammars/atom-language-purescript
+	url = https://github.com/freebroccolo/atom-language-purescript
+[submodule "vendor/grammars/vue-syntax-highlight"]
+	path = vendor/grammars/vue-syntax-highlight
+	url = https://github.com/vuejs/vue-syntax-highlight
+[submodule "vendor/grammars/st2-zonefile"]
+	path = vendor/grammars/st2-zonefile
+	url = https://github.com/sixty4k/st2-zonefile
+[submodule "vendor/grammars/sublimeprolog"]
+	path = vendor/grammars/sublimeprolog
+	url = https://github.com/alnkpa/sublimeprolog
+[submodule "vendor/grammars/sublime-aspectj"]
+	path = vendor/grammars/sublime-aspectj
+	url = https://github.com/pchaigno/sublime-aspectj
+[submodule "vendor/grammars/sublime-typescript"]
+	path = vendor/grammars/sublime-typescript
+	url = https://github.com/Microsoft/TypeScript-Sublime-Plugin
+[submodule "vendor/grammars/X10"]
+	path = vendor/grammars/X10
+	url = git@github.com:x10-lang/x10-highlighting.git
+[submodule "vendor/grammars/language-babel"]
+	path = vendor/grammars/language-babel
+	url = https://github.com/gandm/language-babel
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,11 @@
-before_install: sudo apt-get install libicu-dev -y
+before_install: script/travis/before_install
 rvm:
-  - 1.8.7
-  - 1.9.2
  - 1.9.3
-  - ree
+  - 2.0.0
+  - 2.1
+  - 2.2
 notifications:
  disabled: true
+git:
+  submodules: false
+cache: bundler
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,105 @@
+# Contributing
+
+[code-of-conduct]: http://todogroup.org/opencodeofconduct/#Linguist/opensource@github.com
+
+Hi there! We're thrilled that you'd like to contribute to this project. Your help is essential for keeping it great. This project adheres to the [Open Code of Conduct][code-of-conduct]. By participating, you are expected to uphold this code.
+
+The majority of contributions won't need to touch any Ruby code at all.
+
+## Adding an extension to a language
+
+We try only to add new extensions once they have some usage on GitHub. In most cases we prefer that extensions be in use in hundreds of repositories before supporting them in Linguist.
+
+To add support for a new extension:
+
+0. Add your extension to the language entry in [`languages.yml`][languages].
+0. Add at least one sample for your extension to the [samples directory][samples] in the correct subdirectory.
+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 this extension is already listed in [`languages.yml`][languages] then sometimes a few more steps will need to be taken:
+
+0. Make sure that example `.yourextension` files are present in the [samples directory][samples] for each language that uses `.yourextension`.
+0. Test the performance of the Bayesian classifier with a relatively large number (1000s) of sample `.yourextension` files. (ping @arfon or @bkeepers to help with this) to ensure we're not misclassifying files.
+0. If the Bayesian classifier does a bad job with the sample `.yourextension` files then a [heuristic](https://github.com/github/linguist/blob/master/lib/linguist/heuristics.rb) may need to be written to help.
+
+
+## Adding a language
+
+We try only to add languages once they have some usage on GitHub. In most cases we prefer that each new file extension be in use in hundreds of repositories before supporting them in Linguist.
+
+To add support for a new language:
+
+0. Add an entry for your language to [`languages.yml`][languages].
+0. Add a grammar for your language. Please only add grammars that have a license that permits redistribution.
+  0. Add your grammar as a submodule: `git submodule add https://github.com/JaneSmith/MyGrammar vendor/grammars/MyGrammar`.
+  0. Add your grammar to [`grammars.yml`][grammars] by running `script/convert-grammars --add vendor/grammars/MyGrammar`.
+0. Add samples for your language to the [samples directory][samples] in the correct subdirectory.
+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:
+
+0. Make sure that example `.foo` files are present in the [samples directory][samples] for each language that uses `.foo`.
+0. Test the performance of the Bayesian classifier with a relatively large number (1000s) of sample `.foo` files. (ping @arfon or @bkeepers to help with this) to ensure we're not misclassifying files.
+0. If the Bayesian classifier does a bad job with the sample `.foo` files then a [heuristic](https://github.com/github/linguist/blob/master/lib/linguist/heuristics.rb) may need to be written to help.
+
+Remember, the goal here is to try and avoid false positives!
+
+
+## Fixing a misclassified language
+
+Most languages are detected by their file extension defined in [languages.yml][languages].  For disambiguating between files with common extensions, linguist applies some [heuristics](/lib/linguist/heuristics.rb) and a [statistical classifier](lib/linguist/classifier.rb). This process can help differentiate between, for example, `.h` files which could be either C, C++, or Obj-C.
+
+Misclassifications can often be solved by either adding a new filename or extension for the language or adding more [samples][samples] to make the classifier smarter.
+
+
+## Fixing syntax highlighting
+
+Syntax highlighting in GitHub is performed using TextMate-compatible grammars. These are the same grammars that TextMate, Sublime Text and Atom use. Every language in [languages.yml][languages] is mapped to its corresponding TM `scope`. This scope will be used when picking up a grammar for highlighting.
+
+Assuming your code is being detected as the right language, in most cases this is due to a bug in the language grammar rather than a bug in Linguist. [`grammars.yml`][grammars] lists all the grammars we use for syntax highlighting on github.com. Find the one corresponding to your code's programming language and submit a bug report upstream. If you can, try to reproduce the highlighting problem in the text editor that the grammar is designed for (TextMate, Sublime Text, or Atom) and include that information in your bug report.
+
+You can also try to fix the bug yourself and submit a Pull Request. [TextMate's documentation](https://manual.macromates.com/en/language_grammars) offers a good introduction on how to work with TextMate-compatible grammars. You can test grammars using [Lightshow](https://github-lightshow.herokuapp.com).
+
+Once the bug has been fixed upstream, we'll pick it up for GitHub in the next release of Linguist.
+
+## Testing
+
+For development you are going to want to checkout out the source. To get it, clone the repo and run [Bundler](http://gembundler.com/) to install its dependencies.
+
+    git clone https://github.com/github/linguist.git
+    cd linguist/
+    script/bootstrap
+
+To run the tests:
+
+    bundle exec rake test
+
+Sometimes getting the tests running can be too much work, especially if you don't have much Ruby experience. It's okay: be lazy and let our build bot [Travis](https://travis-ci.org/#!/github/linguist) run the tests for you. Just open a pull request and the bot will start cranking away.
+
+Here's our current build status: [![Build Status](https://api.travis-ci.org/github/linguist.svg?branch=master)](https://travis-ci.org/github/linguist)
+
+
+## Releasing
+
+If you are the current maintainer of this gem:
+
+0. Create a branch for the release: `git checkout -b cut-release-vxx.xx.xx`
+0. Make sure your local dependencies are up to date: `script/bootstrap`
+0. If grammar submodules have not been updated recently, update them: `git submodule update --remote && git commit -a`
+0. Ensure that samples are updated: `bundle exec rake samples`
+0. Ensure that tests are green: `bundle exec rake test`
+0. Bump gem version in `lib/linguist/version.rb`, [like this](https://github.com/github/linguist/commit/8d2ea90a5ba3b2fe6e1508b7155aa4632eea2985).
+0. Make a PR to github/linguist, [like this](https://github.com/github/linguist/pull/1238).
+0. Build a local gem: `bundle exec rake build_gem`
+0. Test the gem:
+  0. Bump the Gemfile and Gemfile.lock versions for an app which relies on this gem
+  0. Install the new gem locally
+  0. Test behavior locally, branch deploy, whatever needs to happen
+0. Merge github/linguist PR
+0. Tag and push: `git tag vx.xx.xx; git push --tags`
+0. Push to rubygems.org -- `gem push github-linguist-3.0.0.gem`
+
+[grammars]: /grammars.yml
+[languages]: /lib/linguist/languages.yml
+[samples]: /samples
+[new-issue]: https://github.com/github/linguist/issues/new
--- a/6
+++ b/6
@@ -1,2 +1,4 @@
-source :rubygems
-gemspec
+source 'https://rubygems.org'
+gemspec :name => "github-linguist"
+gemspec :name => "github-linguist-grammars"
+gem 'byebug' if RUBY_VERSION >= '2.0'
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2011 GitHub, Inc.
+Copyright (c) 2011-2015 GitHub, Inc.

 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
--- a/README.md
+++ b/README.md
@@ -1,85 +1,114 @@
 # Linguist

-We use this library at GitHub to detect blob languages, highlight code, ignore binary files, suppress generated files in diffs and generate language breakdown graphs.
+[issues]: https://github.com/github/linguist/issues
+[new-issue]: https://github.com/github/linguist/issues/new

-## Features
+This library is used on GitHub.com to detect blob languages, ignore binary or vendored files, suppress generated files in diffs, and generate language breakdown graphs.

-### Language detection
+See [Troubleshooting](#troubleshooting) and [`CONTRIBUTING.md`](/CONTRIBUTING.md) before filing an issue or creating a pull request.

-Linguist defines the list of all languages known to GitHub in a [yaml file](https://github.com/github/linguist/blob/master/lib/linguist/languages.yml). In order for a file to be highlighted, a language and lexer must be defined there.
+## Troubleshooting

-Most languages are detected by their file extension. This is the fastest and most common situation.
+### My repository is detected as the wrong language

-For disambiguating between files with common extensions, we use a [bayesian classifier](https://github.com/github/linguist/blob/master/lib/linguist/classifier.rb). For an example, this helps us tell the difference between `.h` files which could be either C, C++, or Obj-C.
+![language stats bar](https://cloud.githubusercontent.com/assets/173/5562290/48e24654-8ddf-11e4-8fe7-735b0ce3a0d3.png)

-In the actual GitHub app we deal with `Grit::Blob` objects. For testing, there is a simple `FileBlob` API.
+The Language stats bar displays languages percentages for the files in the repository. The percentages are calculated based on the bytes of code for each language as reported by the [List Languages](https://developer.github.com/v3/repos/#list-languages) API. If the bar is reporting a language that you don't expect:

-    Linguist::FileBlob.new("lib/linguist.rb").language.name #=> "Ruby"
+0. Click on the name of the language in the stats bar to see a list of the files that are identified as that language.
+0. If you see files that you didn't write, consider moving the files into one of the [paths for vendored  code](/lib/linguist/vendor.yml), or use the [manual overrides](#overrides) feature to ignore them.
+0. If the files are being misclassified, search for [open issues][issues] to see if anyone else has already reported the issue. Any information you an add, especially links to public repositories, is helpful.
+0. If there are no reported issues of this misclassification, [open an issue][new-issue] and include a link to the repository or a sample of the code that is being misclassified.

-    Linguist::FileBlob.new("bin/linguist").language.name #=> "Ruby"
+## Overrides

-See [lib/linguist/language.rb](https://github.com/github/linguist/blob/master/lib/linguist/language.rb) and [lib/linguist/languages.yml](https://github.com/github/linguist/blob/master/lib/linguist/languages.yml).
+Linguist supports a number of different custom overrides strategies for language definitions and vendored paths.

-### Syntax Highlighting
+### Using gitattributes

-The actual syntax highlighting is handled by our Pygments wrapper, [pygments.rb](https://github.com/tmm1/pygments.rb). It also provides a [Lexer abstraction](https://github.com/tmm1/pygments.rb/blob/master/lib/pygments/lexer.rb) that determines which highlighter should be used on a file.
+Add a `.gitattributes` file to your project and use standard git-style path matchers for the files you want to override to set `linguist-documentation`, `linguist-language`, and `linguist-vendored`. `.gitattributes` will be used to determine language statistics, but will not be used to syntax highlight files. To manually set syntax highlighting, use [Vim or Emacs modelines](#using-emacs-or-vim-modelines).

-We typically run on a prerelease version of Pygments, [pygments.rb](https://github.com/tmm1/pygments.rb), to get early access to new lexers. The [lexers.yml](https://github.com/github/linguist/blob/master/lib/linguist/lexers.yml) file is a dump of the lexers we have available on our server.
+```
+$ cat .gitattributes
+*.rb linguist-language=Java
+```

-### Stats
+Checking code you didn't write, such as JavaScript libraries, into your git repo is a common practice, but this often inflates your project's language stats and may even cause your project to be labeled as another language. By default, Linguist treats all of the paths defined in [lib/linguist/vendor.yml](https://github.com/github/linguist/blob/master/lib/linguist/vendor.yml) as vendored and therefore doesn't include them in the language statistics for a repository. Vendored files are also hidden by default in diffs on github.com.

-The Language Graph you see on every repository is built by aggregating the languages of all repo's blobs. The top language in the graph determines the project's primary language. Collectively, these stats make up the [Top Languages](https://github.com/languages) page.
+Use the `linguist-vendored` attribute to vendor or un-vendor paths. Please note, overriding the vendored (or un-vendored) status of a file only affects the language statistics for the repository and not the behavior in diffs on github.com.

-The repository stats API can be used on a directory:
+```
+$ cat .gitattributes
+special-vendored-path/* linguist-vendored
+jquery.js linguist-vendored=false
+```

-    project = Linguist::Repository.from_directory(".")
-    project.language.name  #=> "Ruby"
-    project.languages      #=> { "Ruby" => 0.98,
-                                 "Shell" => 0.02 }
+Similar to vendored files, Linguist excludes documentation files from your project's language stats. (Unlike vendored files, documentation files are displayed in diffs on github.com.) [lib/linguist/documentation.yml](lib/linguist/documentation.yml) lists common documentation paths and excludes them from the language statistics for your repository.

-These stats are also printed out by the binary. Try running `linguist` on itself:
+Use the `linguist-documentation` attribute to mark or unmark paths as documentation.

-    $ bundle exec linguist lib/
-    100%  Ruby
+```
+$ cat .gitattributes
+project-docs/* linguist-documentation
+docs/formatter.rb linguist-documentation=false
+```

-#### Ignore vendored files
+### Using Emacs or Vim modelines

-Checking other code into your git repo is a common practice. But this often inflates your project's language stats and may even cause your project to be labeled as another language. We are able to identify some of these files and directories and exclude them.
+Alternatively, you can use Vim or Emacs style modelines to set the language for a single file. Modelines can be placed anywhere within a file and are respected when determining how to syntax-highlight a file on GitHub.com

-    Linguist::FileBlob.new("vendor/plugins/foo.rb").vendored? # => true
+##### Vim
+```
+vim: set filetype=prolog:
+vim: set ft=cpp:
+```

-See [Linguist::BlobHelper#vendored?](https://github.com/github/linguist/blob/master/lib/linguist/blob_helper.rb) and [lib/linguist/vendor.yml](https://github.com/github/linguist/blob/master/lib/linguist/vendor.yml).
+##### Emacs
+```
+-*- mode: php;-*-
+```

-#### Generated file detection
+## Usage

-Not all plain text files are true source files. Generated files like minified js and compiled CoffeeScript can be detected and excluded from language stats. As an extra bonus, these files are suppressed in Diffs.
+Install the gem:

-    Linguist::FileBlob.new("underscore.min.js").generated? # => true
+```
+$ gem install github-linguist
+```

-See [Linguist::BlobHelper#generated?](https://github.com/github/linguist/blob/master/lib/linguist/blob_helper.rb).
+Then use it in your application:

-## Installation
+```ruby
+require 'rugged'
+require 'linguist'

-github.com is usually running the latest version of the `github-linguist` gem that is released on [RubyGems.org](http://rubygems.org/gems/github-linguist).
+repo = Rugged::Repository.new('.')
+project = Linguist::Repository.new(repo, repo.head.target_id)
+project.language       #=> "Ruby"
+project.languages      #=> { "Ruby" => 119387 }
+```

-But for development you are going to want to checkout out the source. To get it, clone the repo and run [Bundler](http://gembundler.com/) to install its dependencies.
+These stats are also printed out by the `linguist` executable. You can use the
+`--breakdown` flag, and the binary will also output the breakdown of files by language.

-    git clone https://github.com/github/linguist.git
-    cd linguist/
-    bundle install
+You can try running `linguist` on the root directory in this repository itself:

-To run the tests:
+```
+$ bundle exec linguist --breakdown

-    bundle exec rake test
+100.00% Ruby
+
+Ruby:
+Gemfile
+Rakefile
+bin/linguist
+github-linguist.gemspec
+lib/linguist.rb
+…
+```

 ## Contributing

-The majority of patches won't need to touch any Ruby code at all. The [master language list](https://github.com/github/linguist/blob/master/lib/linguist/languages.yml) is just a configuration file.
+Please check out our [contributing guidelines](CONTRIBUTING.md).

-Almost all bug fixes or new language additions should come with some additional code samples. Just drop them under [`samples/`](https://github.com/github/linguist/tree/master/samples) in the correct subdirectory and our test suite will automatically test them. In most cases you shouldn't need to add any new assertions.
-
-### Testing
-
-Sometimes getting the tests running can be to much work especially if you don't have much Ruby experience. Its okay, be lazy and let our build bot [Travis](http://travis-ci.org/#!/github/linguist) run the tests for you. Just open a pull request and the bot will start cranking away.
-
-Heres our current build status, which is hopefully green: [![Build Status](https://secure.travis-ci.org/github/linguist.png?branch=master)](http://travis-ci.org/github/linguist)
+##
--- a/123
+++ b/123
@@ -1,18 +1,116 @@
+require 'bundler/setup'
 require 'rake/clean'
 require 'rake/testtask'
+require 'yaml'
+require 'yajl'
+require 'open-uri'

 task :default => :test

-Rake::TestTask.new do |t|
-  t.warning = true
+Rake::TestTask.new
+
+# Extend test task to check for samples and fetch latest Ace modes
+task :test => [:check_samples, :fetch_ace_modes]
+
+desc "Check that we have samples.json generated"
+task :check_samples do
+  unless File.exist?('lib/linguist/samples.json')
+    Rake::Task[:samples].invoke
+  end
+end
+
+desc "Fetch the latest Ace modes from its GitHub repository"
+task :fetch_ace_modes do
+  ACE_FIXTURE_PATH = File.join('test', 'fixtures', 'ace_modes.json')
+
+  File.delete(ACE_FIXTURE_PATH) if File.exist?(ACE_FIXTURE_PATH)
+
+  begin
+    ace_github_modes = open("https://api.github.com/repos/ajaxorg/ace/contents/lib/ace/mode").read
+    File.write(ACE_FIXTURE_PATH, ace_github_modes)
+  rescue OpenURI::HTTPError, SocketError
+      # no internet? no problem.
+  end
 end

 task :samples do
  require 'linguist/samples'
-  require 'yajl'
-  data = Linguist::Samples.data
-  json = Yajl::Encoder.encode(data, :pretty => true)
-  File.open('lib/linguist/samples.json', 'w') { |io| io.write json }
+  json = Yajl.dump(Linguist::Samples.data, :pretty => true)
+  File.write 'lib/linguist/samples.json', json
+end
+
+task :build_gem => :samples do
+  languages = YAML.load_file("lib/linguist/languages.yml")
+  File.write("lib/linguist/languages.json", Yajl.dump(languages))
+  `gem build github-linguist.gemspec`
+  File.delete("lib/linguist/languages.json")
+end
+
+task :build_grammars_gem do
+  rm_rf "grammars"
+  sh "script/convert-grammars"
+  sh "gem", "build", "github-linguist-grammars.gemspec"
+end
+
+namespace :benchmark do
+  benchmark_path = "benchmark/results"
+
+  # $ bundle exec rake benchmark:generate CORPUS=path/to/samples
+  desc "Generate results for"
+  task :generate do
+    ref = `git rev-parse HEAD`.strip[0,8]
+
+    corpus = File.expand_path(ENV["CORPUS"] || "samples")
+
+    require 'linguist'
+
+    results = Hash.new
+    Dir.glob("#{corpus}/**/*").each do |file|
+      next unless File.file?(file)
+      filename = file.gsub("#{corpus}/", "")
+      results[filename] = Linguist::FileBlob.new(file).language
+    end
+
+    # Ensure results directory exists
+    FileUtils.mkdir_p("benchmark/results")
+
+    # Write results
+    if `git status`.include?('working directory clean')
+      result_filename = "benchmark/results/#{File.basename(corpus)}-#{ref}.json"
+    else
+      result_filename = "benchmark/results/#{File.basename(corpus)}-#{ref}-unstaged.json"
+    end
+
+    File.write(result_filename, results.to_json)
+    puts "wrote #{result_filename}"
+  end
+
+  # $ bundle exec rake benchmark:compare REFERENCE=path/to/reference.json CANDIDATE=path/to/candidate.json
+  desc "Compare results"
+  task :compare do
+    reference_file = ENV["REFERENCE"]
+    candidate_file = ENV["CANDIDATE"]
+
+    reference = Yajl.load(File.read(reference_file))
+    reference_counts = Hash.new(0)
+    reference.each { |filename, language| reference_counts[language] += 1 }
+
+    candidate = Yajl.load(File.read(candidate_file))
+    candidate_counts = Hash.new(0)
+    candidate.each { |filename, language| candidate_counts[language] += 1 }
+
+    changes = diff(reference_counts, candidate_counts)
+
+    if changes.any?
+      changes.each do |language, (before, after)|
+        before_percent = 100 * before / reference.size.to_f
+        after_percent = 100 * after / candidate.size.to_f
+        puts "%s changed from %.1f%% to %.1f%%" % [language || 'unknown', before_percent, after_percent]
+      end
+    else
+      puts "No changes"
+    end
+  end
 end

 namespace :classifier do
@@ -30,7 +128,7 @@ namespace :classifier do
      next if file_language.nil? || file_language == 'Text'
      begin
        data = open(file_url).read
-        guessed_language, score = Linguist::Classifier.classify(Linguist::Samples::DATA, data).first
+        guessed_language, score = Linguist::Classifier.classify(Linguist::Samples.cache, data).first

        total += 1
        guessed_language == file_language ? correct += 1 : incorrect += 1
@@ -47,14 +145,12 @@ namespace :classifier do

  def each_public_gist
    require 'open-uri'
-    require 'json'
-
    url = "https://api.github.com/gists/public"

    loop do
      resp = open(url)
      url = resp.meta['link'][/<([^>]+)>; rel="next"/, 1]
-      gists = JSON.parse(resp.read)
+      gists = Yajl.load(resp.read)

      for gist in gists
        for filename, attrs in gist['files']
@@ -64,3 +160,10 @@ namespace :classifier do
    end
  end
 end
+
+
+def diff(a, b)
+  (a.keys | b.keys).each_with_object({}) do |key, diff|
+    diff[key] = [a[key], b[key]] unless a[key] == b[key]
+  end
+end
--- a/bin/git-linguist
+++ b/bin/git-linguist
@@ -0,0 +1,137 @@
+#!/usr/bin/env ruby
+
+require 'linguist'
+require 'rugged'
+require 'optparse'
+require 'json'
+require 'tmpdir'
+require 'zlib'
+
+class GitLinguist
+  def initialize(path, commit_oid, incremental = true)
+    @repo_path = path
+    @commit_oid = commit_oid
+    @incremental = incremental
+  end
+
+  def linguist
+    if @commit_oid.nil?
+      raise "git-linguist must be called with a specific commit OID to perform language computation"
+    end
+    repo = Linguist::Repository.new(rugged, @commit_oid)
+
+    if @incremental && stats = load_language_stats
+      old_commit_oid, old_stats = stats
+
+      # A cache with NULL oid means that we want to froze
+      # these language stats in place and stop computing
+      # them (for performance reasons)
+      return old_stats if old_commit_oid == NULL_OID
+      repo.load_existing_stats(old_commit_oid, old_stats)
+    end
+
+    result = yield repo
+
+    save_language_stats(@commit_oid, repo.cache)
+    result
+  end
+
+  def load_language_stats
+    version, oid, stats = load_cache
+    if version == LANGUAGE_STATS_CACHE_VERSION && oid && stats
+      [oid, stats]
+    end
+  end
+
+  def save_language_stats(oid, stats)
+    cache = [LANGUAGE_STATS_CACHE_VERSION, oid, stats]
+    write_cache(cache)
+  end
+
+  def clear_language_stats
+    File.unlink(cache_file)
+  end
+
+  def disable_language_stats
+    save_language_stats(NULL_OID, {})
+  end
+
+  protected
+  NULL_OID = ("0" * 40).freeze
+
+  LANGUAGE_STATS_CACHE = 'language-stats.cache'
+  LANGUAGE_STATS_CACHE_VERSION = "v3:#{Linguist::VERSION}"
+
+  def rugged
+    @rugged ||= Rugged::Repository.bare(@repo_path)
+  end
+
+  def cache_file
+    File.join(@repo_path, LANGUAGE_STATS_CACHE)
+  end
+
+  def write_cache(object)
+    return unless File.directory? @repo_path
+
+    begin
+      tmp_path = Dir::Tmpname.make_tmpname(cache_file, nil)
+      File.open(tmp_path, "wb") do |f|
+        marshal = Marshal.dump(object)
+        f.write(Zlib::Deflate.deflate(marshal))
+      end
+
+      File.rename(tmp_path, cache_file)
+    rescue => e
+      (File.unlink(tmp_path) rescue nil)
+      raise e
+    end
+  end
+
+  def load_cache
+    marshal = File.open(cache_file, "rb") { |f| Zlib::Inflate.inflate(f.read) }
+    Marshal.load(marshal)
+  rescue SystemCallError, ::Zlib::DataError, ::Zlib::BufError, TypeError
+    nil
+  end
+end
+
+
+def git_linguist(args)
+  incremental = true
+  commit = nil
+
+  parser = OptionParser.new do |opts|
+    opts.banner = "Usage: git-linguist [OPTIONS] stats|breakdown|dump-cache|clear|disable"
+
+    opts.on("-f", "--force", "Force a full rescan") { incremental = false }
+    opts.on("--commit=COMMIT", "Commit to index") { |v| commit = v}
+  end
+
+  parser.parse!(args)
+
+  git_dir = `git rev-parse --git-dir`.strip
+  raise "git-linguist must be ran in a Git repository" unless $?.success?
+  wrapper = GitLinguist.new(git_dir, commit, incremental)
+
+  case args.pop
+  when "stats"
+    wrapper.linguist do |linguist|
+      puts JSON.dump(linguist.languages)
+    end
+  when "breakdown"
+    wrapper.linguist do |linguist|
+      puts JSON.dump(linguist.breakdown_by_file)
+    end
+  when "dump-cache"
+    puts JSON.dump(wrapper.load_language_stats)
+  when "clear"
+    wrapper.clear_language_stats
+  when "disable"
+    wrapper.disable_language_stats
+  else
+    $stderr.print(parser.help)
+    exit 1
+  end
+end
+
+git_linguist(ARGV)
--- a/bin/linguist
+++ b/bin/linguist
@@ -1,15 +1,40 @@
 #!/usr/bin/env ruby

-require 'linguist/file_blob'
-require 'linguist/repository'
+# linguist — detect language type for a file, or, given a directory, determine language breakdown
+#     usage: linguist <path> [<--breakdown>]
+#
+require 'linguist'
+require 'rugged'

 path = ARGV[0] || Dir.pwd

+# special case if not given a directory but still given the --breakdown option
+if path == "--breakdown"
+  path = Dir.pwd
+  breakdown = true
+end
+
+ARGV.shift
+breakdown = true if ARGV[0] == "--breakdown"
+
 if File.directory?(path)
-  repo = Linguist::Repository.from_directory(path)
+  rugged = Rugged::Repository.new(path)
+  repo = Linguist::Repository.new(rugged, rugged.head.target_id)
  repo.languages.sort_by { |_, size| size }.reverse.each do |language, size|
-    percentage = ((size / repo.size.to_f) * 100).round
-    puts "%-4s %s" % ["#{percentage}%", language]
+    percentage = ((size / repo.size.to_f) * 100)
+    percentage = sprintf '%.2f' % percentage
+    puts "%-7s %s" % ["#{percentage}%", language]
+  end
+  if breakdown
+    puts
+    file_breakdown = repo.breakdown_by_file
+    file_breakdown.each do |lang, files|
+      puts "#{lang}:"
+      files.each do |file|
+        puts file
+      end
+      puts
+    end
  end
 elsif File.file?(path)
  blob = Linguist::FileBlob.new(path, Dir.pwd)
--- a/github-linguist-grammars.gemspec
+++ b/github-linguist-grammars.gemspec
@@ -0,0 +1,14 @@
+require File.expand_path('../lib/linguist/version', __FILE__)
+
+Gem::Specification.new do |s|
+  s.name    = 'github-linguist-grammars'
+  s.version = Linguist::VERSION
+  s.summary = "Language grammars for use with github-linguist"
+
+  s.authors  = "GitHub"
+  s.homepage = "https://github.com/github/linguist"
+
+  s.files = ['lib/linguist/grammars.rb'] + Dir['grammars/*']
+
+  s.add_development_dependency 'plist', '~>3.1'
+end
--- a/github-linguist.gemspec
+++ b/github-linguist.gemspec
@@ -1,18 +1,29 @@
+require File.expand_path('../lib/linguist/version', __FILE__)
+
 Gem::Specification.new do |s|
  s.name    = 'github-linguist'
-  s.version = '2.3.1'
+  s.version = Linguist::VERSION
  s.summary = "GitHub Language detection"
+  s.description = 'We use this library at GitHub to detect blob languages, highlight code, ignore binary files, suppress generated files in diffs, and generate language breakdown graphs.'

-  s.authors = "GitHub"
+  s.authors  = "GitHub"
+  s.homepage = "https://github.com/github/linguist"
+  s.license  = "MIT"

-  s.files = Dir['lib/**/*']
-  s.executables << 'linguist'
+  s.files = Dir['lib/**/*'] - ['lib/linguist/grammars.rb'] + ['LICENSE']
+  s.executables = ['linguist', 'git-linguist']

-  s.add_dependency 'charlock_holmes', '~> 0.6.6'
-  s.add_dependency 'escape_utils',    '~> 0.2.3'
-  s.add_dependency 'mime-types',      '~> 1.19'
-  s.add_dependency 'pygments.rb',     '>= 0.2.13'
-  s.add_development_dependency 'json'
+  s.add_dependency 'charlock_holmes', '~> 0.7.3'
+  s.add_dependency 'escape_utils',    '~> 1.1.0'
+  s.add_dependency 'mime-types',      '>= 1.19'
+  s.add_dependency 'rugged',          '>= 0.23.0b'
+
+  s.add_development_dependency 'minitest', '>= 5.0'
+  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'pry'
  s.add_development_dependency 'rake'
  s.add_development_dependency 'yajl-ruby'
+  s.add_development_dependency 'color-proximity', '~> 0.2.1'
+  s.add_development_dependency 'licensee', '~> 4.7.4'
+
 end
--- a/grammars.yml
+++ b/grammars.yml
@@ -0,0 +1,570 @@
+---
+http://svn.edgewall.org/repos/genshi/contrib/textmate/Genshi.tmbundle/Syntaxes/Markup%20Template%20%28XML%29.tmLanguage:
+- text.xml.genshi
+http://svn.textmate.org/trunk/Review/Bundles/BlitzMax.tmbundle:
+- source.blitzmax
+http://svn.textmate.org/trunk/Review/Bundles/Cython.tmbundle:
+- source.cython
+http://svn.textmate.org/trunk/Review/Bundles/Forth.tmbundle:
+- source.forth
+http://svn.textmate.org/trunk/Review/Bundles/Parrot.tmbundle:
+- source.parrot.pir
+http://svn.textmate.org/trunk/Review/Bundles/SecondLife%20LSL.tmbundle:
+- source.lsl
+http://svn.textmate.org/trunk/Review/Bundles/VHDL.tmbundle:
+- source.vhdl
+http://svn.textmate.org/trunk/Review/Bundles/XQuery.tmbundle:
+- source.xquery
+https://bitbucket.org/Clams/sublimesystemverilog/get/default.tar.gz:
+- source.systemverilog
+- source.ucfconstraints
+https://fan.googlecode.com/hg-history/Build%201.0.55/adm/tools/textmate/Fan.tmbundle/Syntaxes/Fan.tmLanguage:
+- source.fan
+vendor/grammars/Agda.tmbundle:
+- source.agda
+vendor/grammars/Alloy.tmbundle:
+- source.alloy
+vendor/grammars/AutoHotkey/:
+- source.ahk
+vendor/grammars/BrightScript.tmbundle/:
+- source.brightauthorproject
+- source.brightscript
+vendor/grammars/CLIPS-sublime:
+- source.clips
+vendor/grammars/ColdFusion:
+- source.cfscript
+- source.cfscript.cfc
+- text.cfml.basic
+- text.html.cfm
+vendor/grammars/Creole:
+- text.html.creole
+vendor/grammars/Docker.tmbundle:
+- source.dockerfile
+vendor/grammars/Elm.tmLanguage:
+- source.elm
+vendor/grammars/G-Code/:
+- source.LS
+- source.MCPOST
+- source.MOD
+- source.apt
+- source.gcode
+vendor/grammars/GDScript-sublime/:
+- source.gdscript
+vendor/grammars/Handlebars:
+- text.html.handlebars
+vendor/grammars/IDL-Syntax:
+- source.webidl
+vendor/grammars/InnoSetup/:
+- source.inno
+vendor/grammars/Isabelle.tmbundle:
+- source.isabelle.root
+- source.isabelle.theory
+vendor/grammars/JSyntax/:
+- source.j
+vendor/grammars/Julia.tmbundle:
+- source.julia
+vendor/grammars/Lean.tmbundle:
+- source.lean
+vendor/grammars/LiveScript.tmbundle:
+- source.livescript
+vendor/grammars/Modelica/:
+- source.modelica
+vendor/grammars/NSIS:
+- source.nsis
+vendor/grammars/NimLime:
+- source.nim
+- source.nim_filter
+- source.nimcfg
+vendor/grammars/PHP-Twig.tmbundle:
+- text.html.twig
+vendor/grammars/PogoScript.tmbundle/:
+- source.pogoscript
+vendor/grammars/RDoc.tmbundle:
+- text.rdoc
+vendor/grammars/Racket:
+- source.racket
+vendor/grammars/SCSS.tmbundle:
+- source.scss
+vendor/grammars/SMT.tmbundle:
+- source.smt
+vendor/grammars/Scalate.tmbundle:
+- source.scaml
+- text.html.ssp
+vendor/grammars/Slash.tmbundle:
+- text.html.slash
+vendor/grammars/Stata.tmbundle:
+- source.mata
+- source.stata
+vendor/grammars/Stylus/:
+- source.stylus
+vendor/grammars/Sublime-Coq:
+- source.coq
+vendor/grammars/Sublime-HTTP:
+- source.httpspec
+vendor/grammars/Sublime-Inform:
+- source.Inform7
+vendor/grammars/Sublime-Lasso:
+- file.lasso
+vendor/grammars/Sublime-Logos:
+- source.logos
+vendor/grammars/Sublime-Loom:
+- source.loomscript
+vendor/grammars/Sublime-Modula-2/:
+- source.modula2
+vendor/grammars/Sublime-Nit:
+- source.nit
+vendor/grammars/Sublime-QML:
+- source.qml
+vendor/grammars/Sublime-REBOL:
+- source.rebol
+vendor/grammars/Sublime-Red:
+- source.red
+vendor/grammars/Sublime-SQF-Language:
+- source.sqf
+vendor/grammars/Sublime-Text-2-OpenEdge-ABL:
+- source.abl
+- text.html.abl
+vendor/grammars/Sublime-VimL:
+- source.viml
+vendor/grammars/SublimeBrainfuck:
+- source.bf
+vendor/grammars/SublimeClarion/:
+- source.clarion
+vendor/grammars/SublimePapyrus/:
+- source.compiled-papyrus
+- source.papyrus
+- source.papyrus-assembly
+vendor/grammars/SublimeXtend:
+- source.xtend
+vendor/grammars/TXL/:
+- source.txl
+vendor/grammars/Textmate-Gosu-Bundle:
+- source.gosu.2
+vendor/grammars/VBDotNetSyntax:
+- source.vbnet
+vendor/grammars/Vala-TMBundle:
+- source.vala
+vendor/grammars/X10:
+- source.x10
+vendor/grammars/abap.tmbundle:
+- source.abap
+vendor/grammars/actionscript3-tmbundle:
+- source.actionscript.3
+- text.html.asdoc
+- text.xml.flex-config
+vendor/grammars/ada.tmbundle:
+- source.ada
+vendor/grammars/ampl:
+- source.ampl
+vendor/grammars/ant.tmbundle:
+- text.xml.ant
+vendor/grammars/antlr.tmbundle:
+- source.antlr
+vendor/grammars/apache.tmbundle:
+- source.apache-config
+- source.apache-config.mod_perl
+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/:
+- text.html.asciidoc
+vendor/grammars/asp.tmbundle:
+- source.asp
+- text.html.asp
+vendor/grammars/assembly.tmbundle:
+- objdump.x86asm
+- source.x86asm
+vendor/grammars/atom-fsharp/:
+- source.fsharp
+vendor/grammars/atom-language-purescript/:
+- source.purescript
+vendor/grammars/atom-salt:
+- source.python.salt
+- source.yaml.salt
+vendor/grammars/ats.sublime:
+- source.ats
+vendor/grammars/autoitv3-tmbundle:
+- source.autoit.3
+vendor/grammars/awk-sublime:
+- source.awk
+vendor/grammars/bison.tmbundle:
+- source.bison
+vendor/grammars/boo-sublime:
+- source.boo
+vendor/grammars/bro-sublime:
+- source.bro
+vendor/grammars/c.tmbundle:
+- source.c
+- source.c++
+- source.c.platform
+vendor/grammars/capnproto.tmbundle:
+- source.capnp
+vendor/grammars/carto-atom:
+- source.css.mss
+vendor/grammars/ceylon-sublimetext:
+- module.ceylon
+- source.ceylon
+vendor/grammars/chapel-tmbundle:
+- source.chapel
+vendor/grammars/cmake.tmbundle:
+- source.cache.cmake
+- source.cmake
+vendor/grammars/cool-tmbundle:
+- source.cool
+vendor/grammars/cpp-qt.tmbundle:
+- source.c++.qt
+- source.qmake
+vendor/grammars/css.tmbundle:
+- source.css
+vendor/grammars/cucumber-tmbundle:
+- source.ruby.rspec.cucumber.steps
+- text.gherkin.feature
+vendor/grammars/d.tmbundle:
+- source.d
+vendor/grammars/dart-sublime-bundle:
+- source.dart
+- source.pubspec
+- text.dart-analysis-output
+- text.dart-doccomments
+vendor/grammars/desktop.tmbundle:
+- source.desktop
+vendor/grammars/diff.tmbundle:
+- source.diff
+vendor/grammars/dylan.tmbundle:
+- source.dylan
+- source.lid
+- source.makegen
+vendor/grammars/ebundles/Bundles/MSDOS batch file.tmbundle:
+- source.dosbatch
+vendor/grammars/ec.tmbundle/:
+- source.c.ec
+vendor/grammars/eiffel.tmbundle:
+- source.eiffel
+vendor/grammars/elixir-tmbundle:
+- source.elixir
+- text.elixir
+- text.html.elixir
+vendor/grammars/erlang.tmbundle:
+- source.erlang
+- text.html.erlang.yaws
+vendor/grammars/factor:
+- source.factor
+- text.html.factor
+vendor/grammars/fancy-tmbundle:
+- source.fancy
+vendor/grammars/fish-tmbundle:
+- source.fish
+vendor/grammars/fortran.tmbundle:
+- source.fortran
+- source.fortran.modern
+vendor/grammars/gap-tmbundle/:
+- source.gap
+vendor/grammars/gettext.tmbundle:
+- source.po
+vendor/grammars/gnuplot-tmbundle:
+- source.gnuplot
+vendor/grammars/go-tmbundle:
+- source.go
+vendor/grammars/grace-tmbundle/:
+- source.grace
+vendor/grammars/gradle.tmbundle:
+- source.groovy.gradle
+vendor/grammars/graphviz.tmbundle:
+- source.dot
+vendor/grammars/groovy.tmbundle:
+- source.groovy
+vendor/grammars/haskell.tmbundle:
+- source.haskell
+- text.tex.latex.haskell
+vendor/grammars/haxe-sublime-bundle:
+- source.erazor
+- source.haxe.2
+- source.hss.1
+- source.hxml
+- source.nmml
+vendor/grammars/html.tmbundle:
+- text.html.basic
+vendor/grammars/idl.tmbundle:
+- source.idl
+- source.idl-dlm
+- text.idl-idldoc
+vendor/grammars/ini.tmbundle:
+- source.ini
+vendor/grammars/io.tmbundle:
+- source.io
+vendor/grammars/ioke-outdated:
+- source.ioke
+vendor/grammars/jade-tmbundle:
+- source.jade
+- source.pyjade
+vendor/grammars/jasmin-sublime:
+- source.jasmin
+vendor/grammars/java.tmbundle:
+- source.java
+- source.java-properties
+- text.html.jsp
+- text.junit-test-report
+vendor/grammars/javascript-objective-j.tmbundle:
+- source.js.objj
+vendor/grammars/jflex.tmbundle:
+- source.jflex
+vendor/grammars/json.tmbundle:
+- source.json
+vendor/grammars/kotlin-sublime-package:
+- source.Kotlin
+vendor/grammars/language-babel/:
+- source.js.jsx
+- source.regexp.babel
+vendor/grammars/language-clojure:
+- source.clojure
+vendor/grammars/language-coffee-script:
+- source.coffee
+- source.litcoffee
+vendor/grammars/language-crystal:
+- source.crystal
+vendor/grammars/language-csharp:
+- source.cake
+- source.cs
+- source.csx
+- source.nant-build
+vendor/grammars/language-gfm:
+- source.gfm
+vendor/grammars/language-hy:
+- source.hy
+vendor/grammars/language-javascript:
+- source.js
+- source.js.regexp
+- source.js.regexp.replacement
+vendor/grammars/language-jsoniq/:
+- source.jq
+- source.xq
+vendor/grammars/language-ncl:
+- source.ncl
+vendor/grammars/language-python:
+- source.python
+- source.regexp.python
+- text.python.console
+- text.python.traceback
+vendor/grammars/language-shellscript:
+- source.shell
+- text.shell-session
+vendor/grammars/language-xbase:
+- source.harbour
+vendor/grammars/language-yaml:
+- source.yaml
+vendor/grammars/latex.tmbundle:
+- text.bibtex
+- text.log.latex
+- text.tex
+- text.tex.latex
+- text.tex.latex.beamer
+- text.tex.latex.memoir
+vendor/grammars/less.tmbundle:
+- source.css.less
+vendor/grammars/lilypond.tmbundle:
+- source.lilypond
+vendor/grammars/liquid.tmbundle:
+- text.html.liquid
+vendor/grammars/lisp.tmbundle:
+- source.lisp
+vendor/grammars/llvm.tmbundle:
+- source.llvm
+vendor/grammars/logtalk.tmbundle:
+- source.logtalk
+vendor/grammars/lua.tmbundle:
+- source.lua
+vendor/grammars/make.tmbundle:
+- source.makefile
+vendor/grammars/mako-tmbundle:
+- text.html.mako
+vendor/grammars/mathematica-tmbundle:
+- source.mathematica
+vendor/grammars/matlab.tmbundle:
+- source.matlab
+- source.octave
+vendor/grammars/maven.tmbundle:
+- text.xml.pom
+vendor/grammars/mediawiki.tmbundle/:
+- text.html.mediawiki
+vendor/grammars/mercury-tmlanguage:
+- source.mercury
+vendor/grammars/monkey.tmbundle:
+- source.monkey
+vendor/grammars/moonscript-tmbundle:
+- source.moonscript
+vendor/grammars/nemerle.tmbundle:
+- source.nemerle
+vendor/grammars/nesC.tmbundle:
+- source.nesc
+vendor/grammars/ninja.tmbundle:
+- source.ninja
+vendor/grammars/objective-c.tmbundle:
+- source.objc
+- source.objc++
+- source.objc.platform
+- source.strings
+vendor/grammars/ocaml.tmbundle:
+- source.camlp4.ocaml
+- source.ocaml
+- source.ocamllex
+- source.ocamlyacc
+vendor/grammars/ooc.tmbundle:
+- source.ooc
+vendor/grammars/opa.tmbundle:
+- source.opa
+vendor/grammars/openscad.tmbundle/:
+- source.scad
+vendor/grammars/oracle.tmbundle:
+- source.plsql.oracle
+vendor/grammars/oz-tmbundle/Syntaxes/Oz.tmLanguage:
+- source.oz
+vendor/grammars/pascal.tmbundle:
+- source.pascal
+vendor/grammars/perl.tmbundle/:
+- source.perl
+- source.perl.6
+vendor/grammars/php-smarty.tmbundle:
+- text.html.smarty
+vendor/grammars/php.tmbundle:
+- text.html.php
+vendor/grammars/pike-textmate:
+- source.pike
+vendor/grammars/postscript.tmbundle:
+- source.postscript
+vendor/grammars/powershell:
+- source.powershell
+vendor/grammars/processing.tmbundle:
+- source.processing
+vendor/grammars/protobuf-tmbundle:
+- source.protobuf
+vendor/grammars/puppet-textmate-bundle:
+- source.puppet
+vendor/grammars/python-django.tmbundle:
+- source.python.django
+- text.html.django
+vendor/grammars/r.tmbundle:
+- source.r
+- text.tex.latex.rd
+vendor/grammars/restructuredtext.tmbundle:
+- text.restructuredtext
+vendor/grammars/ruby-haml.tmbundle:
+- text.haml
+vendor/grammars/ruby-slim.tmbundle:
+- text.slim
+vendor/grammars/ruby.tmbundle:
+- source.ruby
+- text.html.erb
+vendor/grammars/sas.tmbundle:
+- source.sas
+- source.sas_log
+vendor/grammars/sass-textmate-bundle:
+- source.sass
+vendor/grammars/scala.tmbundle:
+- source.sbt
+- source.scala
+vendor/grammars/scheme.tmbundle:
+- source.scheme
+vendor/grammars/scilab.tmbundle:
+- source.scilab
+vendor/grammars/smali-sublime/smali.tmLanguage:
+- source.smali
+vendor/grammars/smalltalk-tmbundle:
+- source.smalltalk
+vendor/grammars/sql.tmbundle:
+- source.sql
+vendor/grammars/st2-zonefile:
+- text.zone_file
+vendor/grammars/standard-ml.tmbundle:
+- source.cm
+- source.ml
+vendor/grammars/sublime-MuPAD:
+- source.mupad
+vendor/grammars/sublime-apl/:
+- source.apl
+vendor/grammars/sublime-aspectj/:
+- source.aspectj
+vendor/grammars/sublime-befunge:
+- source.befunge
+vendor/grammars/sublime-bsv:
+- source.bsv
+vendor/grammars/sublime-cirru:
+- source.cirru
+vendor/grammars/sublime-glsl:
+- source.essl
+- source.glsl
+vendor/grammars/sublime-golo/:
+- source.golo
+vendor/grammars/sublime-idris:
+- source.idris
+vendor/grammars/sublime-mask:
+- source.mask
+vendor/grammars/sublime-netlinx:
+- source.netlinx
+- source.netlinx.erb
+vendor/grammars/sublime-nginx:
+- source.nginx
+vendor/grammars/sublime-nix:
+- source.nix
+vendor/grammars/sublime-opal/:
+- source.opal
+- source.opalsysdefs
+vendor/grammars/sublime-robot-plugin:
+- text.robot
+vendor/grammars/sublime-rust:
+- source.rust
+vendor/grammars/sublime-sourcepawn:
+- source.sp
+vendor/grammars/sublime-spintools/:
+- source.regexp.spin
+- source.spin
+vendor/grammars/sublime-tea:
+- source.tea
+vendor/grammars/sublime-text-ox/:
+- source.ox
+vendor/grammars/sublime-text-pig-latin/:
+- source.pig_latin
+vendor/grammars/sublime-typescript/:
+- source.ts
+- source.tsx
+vendor/grammars/sublime-varnish:
+- source.varnish.vcl
+vendor/grammars/sublime_cobol:
+- source.acucobol
+- source.cobol
+- source.jcl
+- source.opencobol
+vendor/grammars/sublime_man_page_support:
+- source.man
+- text.groff
+vendor/grammars/sublimeprolog/:
+- source.prolog
+- source.prolog.eclipse
+vendor/grammars/sublimetext-cuda-cpp:
+- source.cuda-c++
+vendor/grammars/swift.tmbundle:
+- source.swift
+vendor/grammars/tcl.tmbundle:
+- source.tcl
+- text.html.tcl
+vendor/grammars/thrift.tmbundle:
+- source.thrift
+vendor/grammars/toml.tmbundle:
+- source.toml
+vendor/grammars/turtle.tmbundle:
+- source.sparql
+- source.turtle
+vendor/grammars/verilog.tmbundle:
+- source.verilog
+vendor/grammars/vue-syntax-highlight:
+- text.html.vue
+vendor/grammars/x86-assembly-textmate-bundle:
+- source.asm.x86
+vendor/grammars/xc.tmbundle/:
+- source.xc
+vendor/grammars/xml.tmbundle:
+- text.xml
+- text.xml.xsl
+vendor/grammars/zephir-sublime:
+- source.php.zephir
--- a/lib/linguist.rb
+++ b/lib/linguist.rb
@@ -1,5 +1,20 @@
 require 'linguist/blob_helper'
 require 'linguist/generated'
+require 'linguist/heuristics'
 require 'linguist/language'
 require 'linguist/repository'
 require 'linguist/samples'
+require 'linguist/shebang'
+require 'linguist/version'
+
+class << Linguist
+  attr_accessor :instrumenter
+
+  def instrument(*args, &bk)
+    if instrumenter
+      instrumenter.instrument(*args, &bk)
+    else
+      yield if block_given?
+    end
+  end
+end
--- a/lib/linguist/blob_helper.rb
+++ b/lib/linguist/blob_helper.rb
@@ -1,13 +1,16 @@
 require 'linguist/generated'
-require 'linguist/language'
-
 require 'charlock_holmes'
 require 'escape_utils'
 require 'mime/types'
-require 'pygments'
 require 'yaml'

 module Linguist
+  # DEPRECATED Avoid mixing into Blob classes. Prefer functional interfaces
+  # like `Language.detect` over `Blob#language`. Functions are much easier to
+  # cache and compose.
+  #
+  # Avoid adding additional bloat to this module.
+  #
  # BlobHelper is a mixin for Blobish classes that respond to "name",
  # "data" and "size" such as Grit::Blob.
  module BlobHelper
@@ -58,6 +61,15 @@ module Linguist
      _mime_type ? _mime_type.binary? : false
    end

+    # Internal: Is the blob binary according to its mime type,
+    # overriding it if we have better data from the languages.yml
+    # database.
+    #
+    # Return true or false
+    def likely_binary?
+      binary_mime_type? && !Language.find_by_filename(name)
+    end
+
    # Public: Get the Content-Type header value
    #
    # This value is used when serving raw blobs.
@@ -87,7 +99,7 @@ module Linguist
      elsif name.nil?
        "attachment"
      else
-        "attachment; filename=#{EscapeUtils.escape_url(File.basename(name))}"
+        "attachment; filename=#{EscapeUtils.escape_url(name)}"
      end
    end

@@ -97,6 +109,12 @@ module Linguist
      end
    end

+    def ruby_encoding
+      if hash = detect_encoding
+        hash[:ruby_encoding]
+      end
+    end
+
    # Try to guess the encoding
    #
    # Returns: a Hash, with :encoding, :confidence, :type
@@ -128,6 +146,13 @@ module Linguist
      end
    end

+    # Public: Is the blob empty?
+    #
+    # Return true or false
+    def empty?
+      data.nil? || data == ""
+    end
+
    # Public: Is the blob text?
    #
    # Return true or false
@@ -139,7 +164,28 @@ module Linguist
    #
    # Return true or false
    def image?
-      ['.png', '.jpg', '.jpeg', '.gif'].include?(extname)
+      ['.png', '.jpg', '.jpeg', '.gif'].include?(extname.downcase)
+    end
+
+    # Public: Is the blob a supported 3D model format?
+    #
+    # Return true or false
+    def solid?
+      extname.downcase == '.stl'
+    end
+
+    # Public: Is this blob a CSV file?
+    #
+    # Return true or false
+    def csv?
+      text? && extname.downcase == '.csv'
+    end
+
+    # Public: Is the blob a PDF?
+    #
+    # Return true or false
+    def pdf?
+      extname.downcase == '.pdf'
    end

    MEGABYTE = 1024 * 1024
@@ -153,21 +199,13 @@ module Linguist

    # Public: Is the blob safe to colorize?
    #
-    # We use Pygments.rb for syntax highlighting blobs, which
-    # has some quirks and also is essentially 'un-killable' via
-    # normal timeout.  To workaround this we try to
-    # carefully handling Pygments.rb anything it can't handle.
-    #
    # Return true or false
    def safe_to_colorize?
-      text? && !large? && !high_ratio_of_long_lines?
+      !large? && text? && !high_ratio_of_long_lines?
    end

    # Internal: Does the blob have a ratio of long lines?
    #
-    # These types of files are usually going to make Pygments.rb
-    # angry if we try to colorize them.
-    #
    # Return true or false
    def high_ratio_of_long_lines?
      return false if loc == 0
@@ -195,7 +233,22 @@ module Linguist
    #
    # Return true or false
    def vendored?
-      name =~ VendoredRegexp ? true : false
+      path =~ VendoredRegexp ? true : false
+    end
+
+    documentation_paths = YAML.load_file(File.expand_path("../documentation.yml", __FILE__))
+    DocumentationRegexp = Regexp.new(documentation_paths.join('|'))
+
+    # Public: Is the blob in a documentation directory?
+    #
+    # Documentation files are ignored by language statistics.
+    #
+    # See "documentation.yml" for a list of documentation conventions that match
+    # this pattern.
+    #
+    # Return true or false
+    def documentation?
+      path =~ DocumentationRegexp ? true : false
    end

    # Public: Get each line of data
@@ -204,7 +257,36 @@ module Linguist
    #
    # Returns an Array of lines
    def lines
-      @lines ||= (viewable? && data) ? data.split("\n", -1) : []
+      @lines ||=
+        if viewable? && data
+          # `data` is usually encoded as ASCII-8BIT even when the content has
+          # been detected as a different encoding. However, we are not allowed
+          # to change the encoding of `data` because we've made the implicit
+          # guarantee that each entry in `lines` is encoded the same way as
+          # `data`.
+          #
+          # Instead, we re-encode each possible newline sequence as the
+          # detected encoding, then force them back to the encoding of `data`
+          # (usually a binary encoding like ASCII-8BIT). This means that the
+          # byte sequence will match how newlines are likely encoded in the
+          # file, but we don't have to change the encoding of `data` as far as
+          # Ruby is concerned. This allows us to correctly parse out each line
+          # without changing the encoding of `data`, and
+          # also--importantly--without having to duplicate many (potentially
+          # large) strings.
+          begin
+            encoded_newlines = ["\r\n", "\r", "\n"].
+              map { |nl| nl.encode(ruby_encoding, "ASCII-8BIT").force_encoding(data.encoding) }
+
+            data.split(Regexp.union(encoded_newlines), -1)
+          rescue Encoding::ConverterNotFoundError
+            # The data is not splittable in the detected encoding.  Assume it's
+            # one big line.
+            [data]
+          end
+        else
+          []
+        end
    end

    # Public: Get number of lines of code
@@ -227,44 +309,14 @@ module Linguist

    # Public: Is the blob a generated file?
    #
-    # Generated source code is supressed in diffs and is ignored by
+    # Generated source code is suppressed in diffs and is ignored by
    # language statistics.
    #
    # May load Blob#data
    #
    # Return true or false
    def generated?
-      @_generated ||= Generated.generated?(name, lambda { data })
-    end
-
-    # Public: Should the blob be indexed for searching?
-    #
-    # Excluded:
-    # - Files over 0.1MB
-    # - Non-text files
-    # - Langauges marked as not searchable
-    # - Generated source files
-    #
-    # Please add additional test coverage to
-    # `test/test_blob.rb#test_indexable` if you make any changes.
-    #
-    # Return true or false
-    def indexable?
-      if binary?
-        false
-      elsif extname == '.txt'
-        true
-      elsif language.nil?
-        false
-      elsif !language.searchable?
-        false
-      elsif generated?
-        false
-      elsif size > 100 * 1024
-        false
-      else
-        true
-      end
+      @_generated ||= Generated.generated?(path, lambda { data })
    end

    # Public: Detects the Language of the blob.
@@ -273,48 +325,22 @@ module Linguist
    #
    # Returns a Language or nil if none is detected
    def language
-      return @language if defined? @language
-
-      if defined?(@data) && @data.is_a?(String)
-        data = @data
-      else
-        data = lambda { binary_mime_type? ? "" : self.data }
-      end
-
-      @language = Language.detect(name.to_s, data, mode)
+      @language ||= Language.detect(self)
    end

-    # Internal: Get the lexer of the blob.
-    #
-    # Returns a Lexer.
-    def lexer
-      language ? language.lexer : Pygments::Lexer.find_by_name('Text only')
+    # Internal: Get the TextMate compatible scope for the blob
+    def tm_scope
+      language && language.tm_scope
    end

-    # Public: Highlight syntax of blob
-    #
-    # options - A Hash of options (defaults to {})
-    #
-    # Returns html String
-    def colorize(options = {})
-      return unless safe_to_colorize?
-      options[:options] ||= {}
-      options[:options][:encoding] ||= encoding
-      lexer.highlight(data, options)
-    end
+    DETECTABLE_TYPES = [:programming, :markup].freeze

-    # Public: Highlight syntax of blob without the outer highlight div
-    # wrapper.
-    #
-    # options - A Hash of options (defaults to {})
-    #
-    # Returns html String
-    def colorize_without_wrapper(options = {})
-      if text = colorize(options)
-        text[%r{<div class="highlight"><pre>(.*?)</pre>\s*</div>}m, 1]
-      else
-        ''
-      end
+    # Internal: Should this blob be included in repository language statistics?
+    def include_in_language_stats?
+      !vendored? &&
+      !documentation? &&
+      !generated? &&
+      language && DETECTABLE_TYPES.include?(language.type)
    end
  end
 end
--- a/lib/linguist/classifier.rb
+++ b/lib/linguist/classifier.rb
@@ -3,6 +3,25 @@ require 'linguist/tokenizer'
 module Linguist
  # Language bayesian classifier.
  class Classifier
+    # Public: Use the classifier to detect language of the blob.
+    #
+    # blob               - An object that quacks like a blob.
+    # possible_languages - Array of Language objects
+    #
+    # Examples
+    #
+    #   Classifier.call(FileBlob.new("path/to/file"), [
+    #     Language["Ruby"], Language["Python"]
+    #   ])
+    #
+    # Returns an Array of Language objects, most probable first.
+    def self.call(blob, possible_languages)
+      language_names = possible_languages.map(&:name)
+      classify(Samples.cache, blob.data, language_names).map do |name, _|
+        Language[name] # Return the actual Language objects
+      end
+    end
+
    # Public: Train classifier that data is a certain language.
    #
    # db       - Hash classifier database object
@@ -14,6 +33,9 @@ module Linguist
    #   Classifier.train(db, 'Ruby', "def hello; end")
    #
    # Returns nothing.
+    #
+    # Set LINGUIST_DEBUG=1 or =2 to see probabilities per-token or
+    # per-language.  See also #dump_all_tokens, below.
    def self.train!(db, language, data)
      tokens = Tokenizer.tokenize(data)

@@ -40,7 +62,7 @@ module Linguist

    # Public: Guess language of data.
    #
-    # db        - Hash of classifer tokens database.
+    # db        - Hash of classifier tokens database.
    # data      - Array of tokens or String data to analyze.
    # languages - Array of language name Strings to restrict to.
    #
@@ -75,17 +97,19 @@ module Linguist
    def classify(tokens, languages)
      return [] if tokens.nil?
      tokens = Tokenizer.tokenize(tokens) if tokens.is_a?(String)
-
      scores = {}
+
+      debug_dump_all_tokens(tokens, languages) if verbosity >= 2
+
      languages.each do |language|
-        scores[language] = tokens_probability(tokens, language) +
-                                   language_probability(language)
+        scores[language] = tokens_probability(tokens, language) + language_probability(language)
+        debug_dump_probabilities(tokens, language, scores[language]) if verbosity >= 1
      end

      scores.sort { |a, b| b[1] <=> a[1] }.map { |score| [score[0], score[1]] }
    end

-    # Internal: Probably of set of tokens in a language occuring - P(D | C)
+    # Internal: Probably of set of tokens in a language occurring - P(D | C)
    #
    # tokens   - Array of String tokens.
    # language - Language to check.
@@ -97,7 +121,7 @@ module Linguist
      end
    end

-    # Internal: Probably of token in language occuring - P(F | C)
+    # Internal: Probably of token in language occurring - P(F | C)
    #
    # token    - String token.
    # language - Language to check.
@@ -111,7 +135,7 @@ module Linguist
      end
    end

-    # Internal: Probably of a language occuring - P(C)
+    # Internal: Probably of a language occurring - P(C)
    #
    # language - Language to check.
    #
@@ -119,5 +143,48 @@ module Linguist
    def language_probability(language)
      Math.log(@languages[language].to_f / @languages_total.to_f)
    end
+
+    private
+      def verbosity
+        @verbosity ||= (ENV['LINGUIST_DEBUG'] || 0).to_i
+      end
+
+      def debug_dump_probabilities(tokens, language, score)
+        printf("%10s = %10.3f + %7.3f = %10.3f\n",
+            language, tokens_probability(tokens, language), language_probability(language), score)
+      end
+
+      # Internal: show a table of probabilities for each <token,language> pair.
+      #
+      # The number in each table entry is the number of "points" that each
+      # token contributes toward the belief that the file under test is a
+      # particular language.  Points are additive.
+      #
+      # Points are the number of times a token appears in the file, times
+      # how much more likely (log of probability ratio) that token is to
+      # appear in one language vs. the least-likely language.  Dashes
+      # indicate the least-likely language (and zero points) for each token.
+      def debug_dump_all_tokens(tokens, languages)
+        maxlen = tokens.map { |tok| tok.size }.max
+
+        printf "%#{maxlen}s", ""
+        puts "    #" + languages.map { |lang| sprintf("%10s", lang) }.join
+
+        token_map = Hash.new(0)
+        tokens.each { |tok| token_map[tok] += 1 }
+
+        token_map.sort.each { |tok, count|
+          arr = languages.map { |lang| [lang, token_probability(tok, lang)] }
+          min = arr.map { |a,b| b }.min
+          minlog = Math.log(min)
+          if !arr.inject(true) { |result, n| result && n[1] == arr[0][1] }
+            printf "%#{maxlen}s%5d", tok, count
+
+            puts arr.map { |ent|
+              ent[1] == min ? "         -" : sprintf("%10.3f", count * (Math.log(ent[1]) - minlog))
+            }.join
+          end
+        }
+      end
  end
 end
--- a/lib/linguist/documentation.yml
+++ b/lib/linguist/documentation.yml
@@ -0,0 +1,30 @@
+# Documentation files and directories are excluded from language
+# statistics.
+#
+# Lines in this file are Regexps that are matched against the file
+# pathname.
+#
+# Please add additional test coverage to
+# `test/test_blob.rb#test_documentation` if you make any changes.
+
+## Documentation directories ##
+
+- ^docs?/
+- (^|/)[Dd]ocumentation/
+- (^|/)javadoc/
+- ^man/
+- ^[Ee]xamples/
+
+## Documentation files ##
+
+- (^|/)CHANGE(S|LOG)?(\.|$)
+- (^|/)CONTRIBUTING(\.|$)
+- (^|/)COPYING(\.|$)
+- (^|/)INSTALL(\.|$)
+- (^|/)LICEN[CS]E(\.|$)
+- (^|/)[Ll]icen[cs]e(\.|$)
+- (^|/)README(\.|$)
+- (^|/)[Rr]eadme(\.|$)
+
+# Samples folders
+- ^[Ss]amples/
--- a/lib/linguist/file_blob.rb
+++ b/lib/linguist/file_blob.rb
@@ -3,7 +3,7 @@ require 'linguist/blob_helper'
 module Linguist
  # A FileBlob is a wrapper around a File object to make it quack
  # like a Grit::Blob. It provides the basic interface: `name`,
-  # `data`, and `size`.
+  # `data`, `path` and `size`.
  class FileBlob
    include BlobHelper

@@ -14,43 +14,71 @@ module Linguist
    #
    # Returns a FileBlob.
    def initialize(path, base_path = nil)
-      @path = path
-      @name = base_path ? path.sub("#{base_path}/", '') : path
+      @fullpath = path
+      @path = base_path ? path.sub("#{base_path}/", '') : path
    end

    # Public: Filename
    #
    # Examples
    #
-    #   FileBlob.new("/path/to/linguist/lib/linguist.rb").name
+    #   FileBlob.new("/path/to/linguist/lib/linguist.rb").path
    #   # =>  "/path/to/linguist/lib/linguist.rb"
    #
    #   FileBlob.new("/path/to/linguist/lib/linguist.rb",
-    #                "/path/to/linguist").name
+    #                "/path/to/linguist").path
    #   # =>  "lib/linguist.rb"
    #
    # Returns a String
-    attr_reader :name
+    attr_reader :path

    # Public: Read file permissions
    #
    # Returns a String like '100644'
    def mode
-      File.stat(@path).mode.to_s(8)
+      File.stat(@fullpath).mode.to_s(8)
+    end
+
+    # Public: File name
+    #
+    # Returns a String
+    def name
+      File.basename(@fullpath)
    end

    # Public: Read file contents.
    #
    # Returns a String.
    def data
-      File.read(@path)
+      File.read(@fullpath)
    end

    # Public: Get byte size
    #
    # Returns an Integer.
    def size
-      File.size(@path)
+      File.size(@fullpath)
+    end
+
+    # Public: Get file extension.
+    #
+    # Returns a String.
+    def extension
+      extensions.last || ""
+    end
+
+    # Public: Return an array of the file extensions
+    #
+    #     >> Linguist::FileBlob.new("app/views/things/index.html.erb").extensions
+    #     => [".html.erb", ".erb"]
+    #
+    # Returns an Array
+    def extensions
+      basename, *segments = name.downcase.split(".")
+
+      segments.map.with_index do |segment, index|
+        "." + segments[index..-1].join(".")
+      end
    end
  end
 end
--- a/lib/linguist/generated.rb
+++ b/lib/linguist/generated.rb
@@ -43,7 +43,7 @@ module Linguist

    # Internal: Is the blob a generated file?
    #
-    # Generated source code is supressed in diffs and is ignored by
+    # Generated source code is suppressed in diffs and is ignored by
    # language statistics.
    #
    # Please add additional test coverage to
@@ -51,42 +51,73 @@ module Linguist
    #
    # Return true or false
    def generated?
-      name == 'Gemfile.lock' ||
-        minified_javascript? ||
-        compiled_coffeescript? ||
-        xcode_project_file? ||
-        generated_net_docfile? ||
-        generated_parser?
+      xcode_file? ||
+      generated_net_designer_file? ||
+      generated_net_specflow_feature_file? ||
+      composer_lock? ||
+      node_modules? ||
+      godeps? ||
+      generated_by_zephir? ||
+      minified_files? ||
+      source_map? ||
+      compiled_coffeescript? ||
+      generated_parser? ||
+      generated_net_docfile? ||
+      generated_postscript? ||
+      compiled_cython_file? ||
+      generated_go? ||
+      generated_protocol_buffer? ||
+      generated_apache_thrift? ||
+      generated_jni_header? ||
+      vcr_cassette? ||
+      generated_module? ||
+      generated_unity3d_meta?
    end

-    # Internal: Is the blob an XCode project file?
+    # Internal: Is the blob an Xcode file?
    #
-    # Generated if the file extension is an XCode project
+    # Generated if the file extension is an Xcode
    # file extension.
    #
    # Returns true of false.
-    def xcode_project_file?
-      ['.xib', '.nib', '.storyboard', '.pbxproj', '.xcworkspacedata', '.xcuserstate'].include?(extname)
+    def xcode_file?
+      ['.nib', '.xcworkspacedata', '.xcuserstate'].include?(extname)
    end

-    # Internal: Is the blob minified JS?
+    # Internal: Is the blob minified files?
    #
-    # Consider JS minified if the average line length is
-    # greater then 100c.
+    # Consider a file minified if the average line length is
+    # greater then 110c.
+    #
+    # Currently, only JS and CSS files are detected by this method.
    #
    # Returns true or false.
-    def minified_javascript?
-      return unless extname == '.js'
+    def minified_files?
+      return unless ['.js', '.css'].include? extname
      if lines.any?
-        (lines.inject(0) { |n, l| n += l.length } / lines.length) > 100
+        (lines.inject(0) { |n, l| n += l.length } / lines.length) > 110
      else
        false
      end
    end

+    # Internal: Is the blob a generated source map?
+    #
+    # Source Maps usually have .css.map or .js.map extensions. In case they
+    # are not following the name convention, detect them based on the content.
+    #
+    # Returns true or false.
+    def source_map?
+      return false unless extname.downcase == '.map'
+
+      name =~ /(\.css|\.js)\.map$/i ||                 # Name convention
+      lines[0] =~ /^{"version":\d+,/ ||                # Revision 2 and later begin with the version number
+      lines[0] =~ /^\/\*\* Begin line maps\. \*\*\/{/  # Revision 1 begins with a magic comment
+    end
+
    # Internal: Is the blob of JS generated by CoffeeScript?
    #
-    # CoffeScript is meant to output JS that would be difficult to
+    # CoffeeScript is meant to output JS that would be difficult to
    # tell if it was generated or not. Look for a number of patterns
    # output by the CS compiler.
    #
@@ -142,6 +173,27 @@ module Linguist
        lines[-2].include?("</doc>")
    end

+    # Internal: Is this a codegen file for a .NET project?
+    #
+    # Visual Studio often uses code generation to generate partial classes, and
+    # these files can be quite unwieldy. Let's hide them.
+    #
+    # Returns true or false
+    def generated_net_designer_file?
+      name.downcase =~ /\.designer\.cs$/
+    end
+
+    # Internal: Is this a codegen file for Specflow feature file?
+    #
+    # Visual Studio's SpecFlow extension generates *.feature.cs files
+    # from *.feature files, they are not meant to be consumed by humans.
+    # Let's hide them.
+    #
+    # Returns true or false
+    def generated_net_specflow_feature_file?
+      name.downcase =~ /\.feature\.cs$/
+    end
+
    # Internal: Is the blob of JS a parser generated by PEG.js?
    #
    # PEG.js-generated parsers are not meant to be consumed by humans.
@@ -158,5 +210,154 @@ module Linguist

      false
    end
+
+    # Internal: Is the blob of PostScript generated?
+    #
+    # PostScript files are often generated by other programs. If they tell us so,
+    # we can detect them.
+    #
+    # Returns true or false.
+    def generated_postscript?
+      return false unless ['.ps', '.eps'].include? extname
+
+      # We analyze the "%%Creator:" comment, which contains the author/generator
+      # of the file. If there is one, it should be in one of the first few lines.
+      creator = lines[0..9].find {|line| line =~ /^%%Creator: /}
+      return false if creator.nil?
+
+      # Most generators write their version number, while human authors' or companies'
+      # names don't contain numbers. So look if the line contains digits. Also
+      # look for some special cases without version numbers.
+      return creator =~ /[0-9]/ ||
+        creator.include?("mpage") ||
+        creator.include?("draw") ||
+        creator.include?("ImageMagick")
+    end
+
+    def generated_go?
+      return false unless extname == '.go'
+      return false unless lines.count > 1
+
+      return lines[0].include?("Code generated by")
+    end
+
+    PROTOBUF_EXTENSIONS = ['.py', '.java', '.h', '.cc', '.cpp']
+
+    # Internal: Is the blob a C++, Java or Python source file generated by the
+    # Protocol Buffer compiler?
+    #
+    # Returns true of false.
+    def generated_protocol_buffer?
+      return false unless PROTOBUF_EXTENSIONS.include?(extname)
+      return false unless lines.count > 1
+
+      return lines[0].include?("Generated by the protocol buffer compiler.  DO NOT EDIT!")
+    end
+
+    APACHE_THRIFT_EXTENSIONS = ['.rb', '.py', '.go', '.js', '.m', '.java', '.h', '.cc', '.cpp']
+
+    # Internal: Is the blob generated by Apache Thrift compiler?
+    #
+    # Returns true or false
+    def generated_apache_thrift?
+      return false unless APACHE_THRIFT_EXTENSIONS.include?(extname)
+      return false unless lines.count > 1
+
+      return lines[0].include?("Autogenerated by Thrift Compiler") || lines[1].include?("Autogenerated by Thrift Compiler")
+    end
+
+    # Internal: Is the blob a C/C++ header generated by the Java JNI tool javah?
+    #
+    # Returns true of false.
+    def generated_jni_header?
+      return false unless extname == '.h'
+      return false unless lines.count > 2
+
+      return lines[0].include?("/* DO NOT EDIT THIS FILE - it is machine generated */") &&
+               lines[1].include?("#include <jni.h>")
+    end
+
+    # Internal: Is the blob part of node_modules/, which are not meant for humans in pull requests.
+    #
+    # Returns true or false.
+    def node_modules?
+      !!name.match(/node_modules\//)
+    end
+
+    # Internal: Is the blob part of Godeps/,
+    # which are not meant for humans in pull requests.
+    #
+    # Returns true or false.
+    def godeps?
+      !!name.match(/Godeps\//)
+    end
+
+    # Internal: Is the blob a generated php composer lock file?
+    #
+    # Returns true or false.
+    def composer_lock?
+      !!name.match(/composer\.lock/)
+    end
+
+    # Internal: Is the blob a generated by Zephir
+    #
+    # Returns true or false.
+    def generated_by_zephir?
+      !!name.match(/.\.zep\.(?:c|h|php)$/)
+    end
+
+    # Is the blob a VCR Cassette file?
+    #
+    # Returns true or false
+    def vcr_cassette?
+      return false unless extname == '.yml'
+      return false unless lines.count > 2
+      # VCR Cassettes have "recorded_with: VCR" in the second last line.
+      return lines[-2].include?("recorded_with: VCR")
+    end
+
+    # Internal: Is this a compiled C/C++ file from Cython?
+    #
+    # Cython-compiled C/C++ files typically contain:
+    # /* Generated by Cython x.x.x on ... */
+    # on the first line.
+    #
+    # Return true or false
+    def compiled_cython_file?
+      return false unless ['.c', '.cpp'].include? extname
+      return false unless lines.count > 1
+      return lines[0].include?("Generated by Cython")
+    end
+
+    # Internal: Is it a KiCAD or GFortran module file?
+    #
+    # KiCAD module files contain:
+    # PCBNEW-LibModule-V1  yyyy-mm-dd h:mm:ss XM
+    # on the first line.
+    #
+    # GFortran module files contain:
+    # GFORTRAN module version 'x' created from 
+    # on the first line.
+    #
+    # Return true of false
+    def generated_module?
+      return false unless extname == '.mod'
+      return false unless lines.count > 1
+      return lines[0].include?("PCBNEW-LibModule-V") || 
+              lines[0].include?("GFORTRAN module version '")
+    end
+
+    # Internal: Is this a metadata file from Unity3D?
+    #
+    # Unity3D Meta files start with:
+    #   fileFormatVersion: X
+    #   guid: XXXXXXXXXXXXXXX
+    #
+    # Return true or false
+    def generated_unity3d_meta?
+      return false unless extname == '.meta'
+      return false unless lines.count > 1
+      return lines[0].include?("fileFormatVersion: ")
+    end
  end
 end
--- a/lib/linguist/grammars.rb
+++ b/lib/linguist/grammars.rb
@@ -0,0 +1,13 @@
+# Note: This file is included in the github-linguist-grammars gem, not the
+# github-linguist gem.
+
+module Linguist
+  module Grammars
+    # Get the path to the directory containing the language grammar JSON files.
+    #
+    # Returns a String.
+    def self.path
+      File.expand_path("../../../grammars", __FILE__)
+    end
+  end
+end
--- a/lib/linguist/heuristics.rb
+++ b/lib/linguist/heuristics.rb
@@ -0,0 +1,363 @@
+module Linguist
+  # A collection of simple heuristics that can be used to better analyze languages.
+  class Heuristics
+    # Public: Use heuristics to detect language of the blob.
+    #
+    # blob               - An object that quacks like a blob.
+    # possible_languages - Array of Language objects
+    #
+    # Examples
+    #
+    #   Heuristics.call(FileBlob.new("path/to/file"), [
+    #     Language["Ruby"], Language["Python"]
+    #   ])
+    #
+    # Returns an Array of languages, or empty if none matched or were inconclusive.
+    def self.call(blob, candidates)
+      data = blob.data
+
+      @heuristics.each do |heuristic|
+        if heuristic.matches?(blob.name)
+          languages = Array(heuristic.call(data))
+          return languages if languages.any? || languages.all? { |l| candidates.include?(l) }
+        end
+      end
+
+      [] # No heuristics matched
+    end
+
+    # Internal: Define a new heuristic.
+    #
+    # languages - String names of languages to disambiguate.
+    # heuristic - Block which takes data as an argument and returns a Language or nil.
+    #
+    # Examples
+    #
+    #     disambiguate ".pm" do |data|
+    #       if data.include?("use strict")
+    #         Language["Perl"]
+    #       elsif /^[^#]+:-/.match(data)
+    #         Language["Prolog"]
+    #       end
+    #     end
+    #
+    def self.disambiguate(*extensions, &heuristic)
+      @heuristics << new(extensions, &heuristic)
+    end
+
+    # Internal: Array of defined heuristics
+    @heuristics = []
+
+    # Internal
+    def initialize(extensions, &heuristic)
+      @extensions = extensions
+      @heuristic = heuristic
+    end
+
+    # Internal: Check if this heuristic matches the candidate languages.
+    def matches?(filename)
+      filename = filename.downcase
+      @extensions.any? { |ext| filename.end_with?(ext) }
+    end
+
+    # Internal: Perform the heuristic
+    def call(data)
+      @heuristic.call(data)
+    end
+
+    # Common heuristics
+    ObjectiveCRegex = /^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])/
+
+    disambiguate ".asc" do |data|
+      if /^(----[- ]BEGIN|ssh-(rsa|dss)) /.match(data)
+        Language["Public Key"]
+      elsif /^[=-]+(\s|\n)|{{[A-Za-z]/.match(data)
+        Language["AsciiDoc"]
+      elsif /^(\/\/.+|((import|export)\s+)?(function|int|float|char)\s+((room|repeatedly|on|game)_)?([A-Za-z]+[A-Za-z_0-9]+)\s*[;\(])/.match(data)
+        Language["AGS Script"]
+      end
+    end
+
+    disambiguate ".bb" do |data|
+      if /^\s*; /.match(data) || data.include?("End Function")
+        Language["BlitzBasic"]
+      elsif /^\s*(# |include|require)\b/.match(data)
+        Language["BitBake"]
+      end
+    end
+
+    disambiguate ".ch" do |data|
+      if /^\s*#\s*(if|ifdef|ifndef|define|command|xcommand|translate|xtranslate|include|pragma|undef)\b/i.match(data)
+        Language["xBase"]
+      end
+    end
+
+    disambiguate ".cl" do |data|
+      if /^\s*\((defun|in-package|defpackage) /i.match(data)
+        Language["Common Lisp"]
+      elsif /^class/x.match(data)
+        Language["Cool"]
+      elsif /\/\* |\/\/ |^\}/.match(data)
+        Language["OpenCL"]
+      end
+    end
+
+    disambiguate ".cs" do |data|
+      if /![\w\s]+methodsFor: /.match(data)
+        Language["Smalltalk"]
+      elsif /^\s*namespace\s*[\w\.]+\s*{/.match(data) || /^\s*\/\//.match(data)
+        Language["C#"]
+      end
+    end
+
+    disambiguate ".d" do |data|
+      if /^module /.match(data)
+        Language["D"]
+      elsif /^((dtrace:::)?BEGIN|provider |#pragma (D (option|attributes)|ident)\s)/.match(data)
+        Language["DTrace"]
+      elsif /(\/.*:( .* \\)$| : \\$|^ : |: \\$)/.match(data)
+        Language["Makefile"]
+      end
+    end
+
+    disambiguate ".ecl" do |data|
+      if /^[^#]+:-/.match(data)
+        Language["ECLiPSe"]
+      elsif data.include?(":=")
+        Language["ECL"]
+      end
+    end
+
+    disambiguate ".for", ".f" do |data|
+      if /^: /.match(data)
+        Language["Forth"]
+      elsif /^([c*][^a-z]|      (subroutine|program)\s|\s*!)/i.match(data)
+        Language["FORTRAN"]
+      end
+    end
+
+    disambiguate ".fr" do |data|
+      if /^(: |also |new-device|previous )/.match(data)
+        Language["Forth"]
+      elsif /^\s*(import|module|package|data|type) /.match(data)
+        Language["Frege"]
+      else
+        Language["Text"]
+      end
+    end
+
+    disambiguate ".fs" do |data|
+      if /^(: |new-device)/.match(data)
+        Language["Forth"]
+      elsif /^\s*(#light|import|let|module|namespace|open|type)/.match(data)
+        Language["F#"]
+      elsif /^\s*(#version|precision|uniform|varying|vec[234])/.match(data)
+        Language["GLSL"]
+      elsif /#include|#pragma\s+(rs|version)|__attribute__/.match(data)
+        Language["Filterscript"]
+      end
+    end
+
+    disambiguate ".gs" do |data|
+      Language["Gosu"] if /^uses java\./.match(data)
+    end
+
+    disambiguate ".h" do |data|
+      if ObjectiveCRegex.match(data)
+        Language["Objective-C"]
+      elsif (/^\s*#\s*include <(cstdint|string|vector|map|list|array|bitset|queue|stack|forward_list|unordered_map|unordered_set|(i|o|io)stream)>/.match(data) ||
+        /^\s*template\s*</.match(data) || /^[ \t]*try/.match(data) || /^[ \t]*catch\s*\(/.match(data) || /^[ \t]*(class|(using[ \t]+)?namespace)\s+\w+/.match(data) || /^[ \t]*(private|public|protected):$/.match(data) || /std::\w+/.match(data))
+        Language["C++"]
+      end
+    end
+
+    disambiguate ".l" do |data|
+      if /\(def(un|macro)\s/.match(data)
+        Language["Common Lisp"]
+      elsif /^(%[%{}]xs|<.*>)/.match(data)
+        Language["Lex"]
+      elsif /^\.[a-z][a-z](\s|$)/i.match(data)
+        Language["Groff"]
+      elsif /^\((de|class|rel|code|data|must)\s/.match(data)
+        Language["PicoLisp"]
+      end
+    end
+
+    disambiguate ".ls" do |data|
+      if /^\s*package\s*[\w\.\/\*\s]*\s*{/.match(data)
+        Language["LoomScript"]
+      else
+        Language["LiveScript"]
+      end
+    end
+
+    disambiguate ".lsp", ".lisp" do |data|
+      if /^\s*\((defun|in-package|defpackage) /i.match(data)
+        Language["Common Lisp"]
+      elsif /^\s*\(define /.match(data)
+        Language["NewLisp"]
+      end
+    end
+
+    disambiguate ".m" do |data|
+      if ObjectiveCRegex.match(data)
+        Language["Objective-C"]
+      elsif data.include?(":- module")
+        Language["Mercury"]
+      elsif /^: /.match(data)
+        Language["MUF"]
+      elsif /^\s*;/.match(data)
+        Language["M"]
+      elsif /^\s*\(\*/.match(data)
+        Language["Mathematica"]
+      elsif /^\s*%/.match(data)
+        Language["Matlab"]
+      elsif /^\w+\s*:\s*module\s*{/.match(data)
+        Language["Limbo"]
+      end
+    end
+
+    disambiguate ".ml" do |data|
+      if /(^\s*module)|let rec |match\s+(\S+\s)+with/.match(data)
+        Language["OCaml"]
+      elsif /=> |case\s+(\S+\s)+of/.match(data)
+        Language["Standard ML"]
+      end
+    end
+
+    disambiguate ".mod" do |data|
+      if data.include?('<!ENTITY ')
+        Language["XML"]
+      elsif /MODULE\s\w+\s*;/i.match(data) || /^\s*END \w+;$/i.match(data)
+        Language["Modula-2"]
+      else
+        [Language["Linux Kernel Module"], Language["AMPL"]]
+      end
+    end
+
+    disambiguate ".ms" do |data|
+      if /^[.'][a-z][a-z](\s|$)/i.match(data)
+        Language["Groff"]
+      elsif /((^|\s)move?[. ])|\.(include|globa?l)\s/.match(data)
+        Language["GAS"]
+      end
+    end
+
+    disambiguate ".n" do |data|
+      if /^[.']/.match(data)
+        Language["Groff"]
+      elsif /^(module|namespace|using)\s/.match(data)
+        Language["Nemerle"]
+      end
+    end
+
+    disambiguate ".ncl" do |data|
+      if data.include?("THE_TITLE")
+        Language["Text"]
+      end
+    end
+
+    disambiguate ".nl" do |data|
+      if /^(b|g)[0-9]+ /.match(data)
+        Language["NL"]
+      else
+        Language["NewLisp"]
+      end
+    end
+
+    disambiguate ".php" do |data|
+      if data.include?("<?hh")
+        Language["Hack"]
+      elsif /<?[^h]/.match(data)
+        Language["PHP"]
+      end
+    end
+
+    disambiguate ".pl" do |data|
+      if /^(use v6|(my )?class|module)/.match(data)
+        Language["Perl6"]
+      elsif /use strict|use\s+v?5\./.match(data)
+        Language["Perl"]
+      elsif /^[^#]+:-/.match(data)
+        Language["Prolog"]
+      end
+    end
+
+    disambiguate ".pm", ".t" do |data|
+      if /^(use v6|(my )?class|module)/.match(data)
+        Language["Perl6"]
+      elsif /use strict|use\s+v?5\./.match(data)
+        Language["Perl"]
+      end
+    end
+
+    disambiguate ".pro" do |data|
+      if /^[^#]+:-/.match(data)
+        Language["Prolog"]
+      elsif data.include?("last_client=")
+        Language["INI"]
+      elsif data.include?("HEADERS") && data.include?("SOURCES")
+        Language["QMake"]
+      elsif /^\s*function[ \w,]+$/.match(data)
+        Language["IDL"]
+      end
+    end
+
+    disambiguate ".r" do |data|
+      if /\bRebol\b/i.match(data)
+        Language["Rebol"]
+      elsif data.include?("<-")
+        Language["R"]
+      end
+    end
+
+    disambiguate ".rs" do |data|
+      if /^(use |fn |mod |pub |macro_rules|impl|#!?\[)/.match(data)
+        Language["Rust"]
+      elsif /#include|#pragma\s+(rs|version)|__attribute__/.match(data)
+        Language["RenderScript"]
+      end
+    end
+
+    disambiguate ".sc" do |data|
+      if /\^(this|super)\./.match(data) || /^\s*(\+|\*)\s*\w+\s*{/.match(data) || /^\s*~\w+\s*=\./.match(data)
+        Language["SuperCollider"]
+      elsif /^\s*import (scala|java)\./.match(data) || /^\s*val\s+\w+\s*=/.match(data) || /^\s*class\b/.match(data)
+        Language["Scala"]
+      end
+    end
+
+    disambiguate ".sql" do |data|
+      if /^\\i\b|AS \$\$|LANGUAGE '+plpgsql'+/i.match(data) || /SECURITY (DEFINER|INVOKER)/i.match(data) || /BEGIN( WORK| TRANSACTION)?;/i.match(data)
+        #Postgres
+        Language["PLpgSQL"]
+      elsif /(alter module)|(language sql)|(begin( NOT)+ atomic)/i.match(data)  || /signal SQLSTATE '[0-9]+'/i.match(data)
+        #IBM db2
+        Language["SQLPL"]
+      elsif /pragma|\$\$PLSQL_|XMLTYPE|sysdate|systimestamp|\.nextval|connect by|AUTHID (DEFINER|CURRENT_USER)/i.match(data) || /constructor\W+function/i.match(data)
+        #Oracle
+        Language["PLSQL"]
+      elsif ! /begin|boolean|package|exception/i.match(data)
+        #Generic SQL
+        Language["SQL"]
+      end
+    end
+
+    disambiguate ".ts" do |data|
+      if data.include?("<TS ")
+        Language["XML"]
+      else
+        Language["TypeScript"]
+      end
+    end
+
+    disambiguate ".tst" do |data|
+      if (data.include?("gap> "))
+        Language["GAP"]
+      # Heads up - we don't usually write heuristics like this (with no regex match)
+      else
+        Language["Scilab"]
+      end
+    end
+  end
+end
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -1,9 +1,18 @@
 require 'escape_utils'
-require 'pygments'
 require 'yaml'
+begin
+  require 'yajl'
+rescue LoadError
+end

 require 'linguist/classifier'
+require 'linguist/heuristics'
 require 'linguist/samples'
+require 'linguist/file_blob'
+require 'linguist/blob_helper'
+require 'linguist/strategy/filename'
+require 'linguist/strategy/modeline'
+require 'linguist/shebang'

 module Linguist
  # Language names that are recognizable by GitHub. Defined languages
@@ -15,11 +24,22 @@ module Linguist
    @index           = {}
    @name_index      = {}
    @alias_index     = {}
-    @extension_index = Hash.new { |h,k| h[k] = [] }
-    @filename_index  = Hash.new { |h,k| h[k] = [] }
+
+    @extension_index          = Hash.new { |h,k| h[k] = [] }
+    @interpreter_index        = Hash.new { |h,k| h[k] = [] }
+    @filename_index           = Hash.new { |h,k| h[k] = [] }

    # Valid Languages types
-    TYPES = [:data, :markup, :programming]
+    TYPES = [:data, :markup, :programming, :prose]
+
+    # Detect languages by a specific type
+    #
+    # type - A symbol that exists within TYPES
+    #
+    # Returns an array
+    def self.by_type(type)
+      all.select { |h| h.type == type }
+    end

    # Internal: Create a new Language object
    #
@@ -37,7 +57,7 @@ module Linguist
      end

      # Language name index
-      @index[language.name] = @name_index[language.name] = language
+      @index[language.name.downcase] = @name_index[language.name.downcase] = language

      language.aliases.each do |name|
        # All Language aliases should be unique. Raise if there is a duplicate.
@@ -45,7 +65,7 @@ module Linguist
          raise ArgumentError, "Duplicate alias: #{name}"
        end

-        @index[name] = @alias_index[name] = language
+        @index[name.downcase] = @alias_index[name.downcase] = language
      end

      language.extensions.each do |extension|
@@ -53,7 +73,11 @@ module Linguist
          raise ArgumentError, "Extension is missing a '.': #{extension.inspect}"
        end

-        @extension_index[extension] << language
+        @extension_index[extension.downcase] << language
+      end
+
+      language.interpreters.each do |interpreter|
+        @interpreter_index[interpreter] << language
      end

      language.filenames.each do |filename|
@@ -63,32 +87,48 @@ module Linguist
      language
    end

+    STRATEGIES = [
+      Linguist::Strategy::Modeline,
+      Linguist::Shebang,
+      Linguist::Strategy::Filename,
+      Linguist::Heuristics,
+      Linguist::Classifier
+    ]
+
    # Public: Detects the Language of the blob.
    #
-    # name - String filename
-    # data - String blob data. A block also maybe passed in for lazy
-    #        loading. This behavior is deprecated and you should always
-    #        pass in a String.
-    # mode - Optional String mode (defaults to nil)
+    # blob - an object that includes the Linguist `BlobHelper` interface;
+    #       see Linguist::LazyBlob and Linguist::FileBlob for examples
    #
    # Returns Language or nil.
-    def self.detect(name, data, mode = nil)
-      # A bit of an elegant hack. If the file is exectable but extensionless,
-      # append a "magic" extension so it can be classified with other
-      # languages that have shebang scripts.
-      if File.extname(name).empty? && mode && (mode.to_i(8) & 05) == 05
-        name += ".script!"
-      end
+    def self.detect(blob)
+      # Bail early if the blob is binary or empty.
+      return nil if blob.likely_binary? || blob.binary? || blob.empty?

-      possible_languages = find_by_filename(name)
+      Linguist.instrument("linguist.detection", :blob => blob) do
+        # Call each strategy until one candidate is returned.
+        languages = []
+        returning_strategy = nil

-      if possible_languages.length > 1
-        data = data.call() if data.respond_to?(:call)
-        if result = Classifier.classify(Samples::DATA, data, possible_languages.map(&:name)).first
-          Language[result[0]]
+        STRATEGIES.each do |strategy|
+          returning_strategy = strategy
+          candidates = Linguist.instrument("linguist.strategy", :blob => blob, :strategy => strategy, :candidates => languages) do
+            strategy.call(blob, languages)
+          end
+          if candidates.size == 1
+            languages = candidates
+            break
+          elsif candidates.size > 1
+            # More than one candidate was found, pass them to the next strategy.
+            languages = candidates
+          else
+            # No candidates, try the next strategy
+          end
        end
-      else
-        possible_languages.first
+
+        Linguist.instrument("linguist.detected", :blob => blob, :strategy => returning_strategy, :language => languages.first)
+
+        languages.first
      end
    end

@@ -110,7 +150,8 @@ module Linguist
    #
    # Returns the Language or nil if none was found.
    def self.find_by_name(name)
-      @name_index[name]
+      return nil if name.to_s.empty?
+      name && (@name_index[name.downcase] || @name_index[name.split(',').first.downcase])
    end

    # Public: Look up Language by one of its aliases.
@@ -122,9 +163,10 @@ module Linguist
    #   Language.find_by_alias('cpp')
    #   # => #<Language name="C++">
    #
-    # Returns the Lexer or nil if none was found.
+    # Returns the Language or nil if none was found.
    def self.find_by_alias(name)
-      @alias_index[name]
+      return nil if name.to_s.empty?
+      name && (@alias_index[name.downcase] || @alias_index[name.split(',').first.downcase])
    end

    # Public: Look up Languages by filename.
@@ -138,11 +180,55 @@ module Linguist
    #
    # Returns all matching Languages or [] if none were found.
    def self.find_by_filename(filename)
-      basename, extname = File.basename(filename), File.extname(filename)
-      @filename_index[basename] + @extension_index[extname]
+      basename = File.basename(filename)
+
+      # find the first extension with language definitions
+      extname = FileBlob.new(filename).extensions.detect do |e|
+        !@extension_index[e].empty?
+      end
+
+      (@filename_index[basename] + @extension_index[extname]).compact.uniq
    end

-    # Public: Look up Language by its name or lexer.
+    # Public: Look up Languages by file extension.
+    #
+    # extname - The extension String.
+    #
+    # Examples
+    #
+    #   Language.find_by_extension('.rb')
+    #   # => [#<Language name="Ruby">]
+    #
+    #   Language.find_by_extension('rb')
+    #   # => [#<Language name="Ruby">]
+    #
+    # Returns all matching Languages or [] if none were found.
+    def self.find_by_extension(extname)
+      extname = ".#{extname}" unless extname.start_with?(".")
+      @extension_index[extname.downcase]
+    end
+
+    # DEPRECATED
+    def self.find_by_shebang(data)
+      @interpreter_index[Shebang.interpreter(data)]
+    end
+
+    # Public: Look up Languages by interpreter.
+    #
+    # interpreter - String of interpreter name
+    #
+    # Examples
+    #
+    #   Language.find_by_interpreter("bash")
+    #   # => [#<Language name="Bash">]
+    #
+    # Returns the matching Language
+    def self.find_by_interpreter(interpreter)
+      @interpreter_index[interpreter]
+    end
+
+
+    # Public: Look up Language by its name.
    #
    # name - The String name of the Language
    #
@@ -156,7 +242,8 @@ module Linguist
    #
    # Returns the Language or nil if none was found.
    def self.[](name)
-      @index[name]
+      return nil if name.to_s.empty?
+      name && (@index[name.downcase] || @index[name.split(',').first.downcase])
    end

    # Public: A List of popular languages
@@ -166,7 +253,7 @@ module Linguist
    #
    # This list is configured in "popular.yml".
    #
-    # Returns an Array of Lexers.
+    # Returns an Array of Languages.
    def self.popular
      @popular ||= all.select(&:popular?).sort_by { |lang| lang.name.downcase }
    end
@@ -178,7 +265,7 @@ module Linguist
    #
    # This list is created from all the languages not listed in "popular.yml".
    #
-    # Returns an Array of Lexers.
+    # Returns an Array of Languages.
    def self.unpopular
      @unpopular ||= all.select(&:unpopular?).sort_by { |lang| lang.name.downcase }
    end
@@ -192,8 +279,12 @@ module Linguist

    # Public: A List of languages compatible with Ace.
    #
+    # TODO: Remove this method in a 5.x release. Every language now needs an ace_mode
+    # key, so this function isn't doing anything unique anymore.
+    #
    # Returns an Array of Languages.
    def self.ace_modes
+      warn "This method will be deprecated in a future 5.x release. Every language now has an `ace_mode` set."
      @ace_modes ||= all.select(&:ace_mode).sort_by { |lang| lang.name.downcase }
    end

@@ -215,28 +306,28 @@ module Linguist
      # Set aliases
      @aliases = [default_alias_name] + (attributes[:aliases] || [])

-      # Lookup Lexer object
-      @lexer = Pygments::Lexer.find_by_name(attributes[:lexer] || name) ||
-        raise(ArgumentError, "#{@name} is missing lexer")
+      # Load the TextMate scope name or try to guess one
+      @tm_scope = attributes[:tm_scope] || begin
+        context = case @type
+                  when :data, :markup, :prose
+                    'text'
+                  when :programming, nil
+                    'source'
+                  end
+        "#{context}.#{@name.downcase}"
+      end

      @ace_mode = attributes[:ace_mode]
+      @wrap = attributes[:wrap] || false

      # Set legacy search term
      @search_term = attributes[:search_term] || default_alias_name

      # Set extensions or default to [].
      @extensions = attributes[:extensions] || []
+      @interpreters = attributes[:interpreters]   || []
      @filenames  = attributes[:filenames]  || []

-      unless @primary_extension = attributes[:primary_extension]
-        raise ArgumentError, "#{@name} is missing primary extension"
-      end
-
-      # Prepend primary extension unless its already included
-      if primary_extension && !extensions.include?(primary_extension)
-        @extensions = [primary_extension] + extensions
-      end
-
      # Set popular, and searchable flags
      @popular    = attributes.key?(:popular)    ? attributes[:popular]    : false
      @searchable = attributes.key?(:searchable) ? attributes[:searchable] : true
@@ -294,10 +385,10 @@ module Linguist
    # Returns the name String
    attr_reader :search_term

-    # Public: Get Lexer
+    # Public: Get the name of a TextMate-compatible scope
    #
-    # Returns the Lexer
-    attr_reader :lexer
+    # Returns the scope
+    attr_reader :tm_scope

    # Public: Get Ace mode
    #
@@ -310,6 +401,11 @@ module Linguist
    # Returns a String name or nil
    attr_reader :ace_mode

+    # Public: Should language lines be wrapped
+    #
+    # Returns true or false
+    attr_reader :wrap
+
    # Public: Get extensions
    #
    # Examples
@@ -319,19 +415,14 @@ module Linguist
    # Returns the extensions Array
    attr_reader :extensions

-    # Deprecated: Get primary extension
+    # Public: Get interpreters
    #
-    # Defaults to the first extension but can be overriden
-    # in the languages.yml.
+    # Examples
    #
-    # The primary extension can not be nil. Tests should verify this.
+    #   # => ['awk', 'gawk', 'mawk' ...]
    #
-    # This attribute is only used by app/helpers/gists_helper.rb for
-    # creating the language dropdown. It really should be using `name`
-    # instead. Would like to drop primary extension.
-    #
-    # Returns the extension String.
-    attr_reader :primary_extension
+    # Returns the interpreters Array
+    attr_reader :interpreters

    # Public: Get filenames
    #
@@ -342,6 +433,22 @@ module Linguist
    # Returns the extensions Array
    attr_reader :filenames

+    # Deprecated: Get primary extension
+    #
+    # Defaults to the first extension but can be overridden
+    # in the languages.yml.
+    #
+    # The primary extension can not be nil. Tests should verify this.
+    #
+    # This method is only used by app/helpers/gists_helper.rb for creating
+    # the language dropdown. It really should be using `name` instead.
+    # Would like to drop primary extension.
+    #
+    # Returns the extension String.
+    def primary_extension
+      extensions.first
+    end
+
    # Public: Get URL escaped name.
    #
    # Examples
@@ -393,16 +500,6 @@ module Linguist
      @searchable
    end

-    # Public: Highlight syntax of text
-    #
-    # text    - String of code to be highlighted
-    # options - A Hash of options (defaults to {})
-    #
-    # Returns html String
-    def colorize(text, options = {})
-      lexer.highlight(text, options = {})
-    end
-
    # Public: Return name as String representation
    def to_s
      name
@@ -425,20 +522,42 @@ module Linguist
    end
  end

-  extensions = Samples::DATA['extnames']
-  filenames = Samples::DATA['filenames']
+  extensions = Samples.cache['extnames']
+  interpreters = Samples.cache['interpreters']
+  filenames = Samples.cache['filenames']
  popular = YAML.load_file(File.expand_path("../popular.yml", __FILE__))

-  YAML.load_file(File.expand_path("../languages.yml", __FILE__)).each do |name, options|
+  languages_yml = File.expand_path("../languages.yml", __FILE__)
+  languages_json = File.expand_path("../languages.json", __FILE__)
+
+  if File.exist?(languages_json) && defined?(Yajl)
+    languages = Yajl.load(File.read(languages_json))
+  else
+    languages = YAML.load_file(languages_yml)
+  end
+
+  languages.each do |name, options|
    options['extensions'] ||= []
+    options['interpreters'] ||= []
    options['filenames'] ||= []

    if extnames = extensions[name]
      extnames.each do |extname|
-        if !options['extensions'].include?(extname)
+        if !options['extensions'].index { |x| x.downcase.end_with? extname.downcase }
+          warn "#{name} has a sample with extension (#{extname.downcase}) that isn't explicitly defined in languages.yml"
          options['extensions'] << extname
-        else
-          warn "#{name} #{extname.inspect} is already defined in samples/. Remove from languages.yml."
+        end
+      end
+    end
+
+    if interpreters == nil
+      interpreters = {}
+    end
+
+    if interpreter_names = interpreters[name]
+      interpreter_names.each do |interpreter|
+        if !options['interpreters'].include?(interpreter)
+          options['interpreters'] << interpreter
        end
      end
    end
@@ -447,8 +566,6 @@ module Linguist
      fns.each do |filename|
        if !options['filenames'].include?(filename)
          options['filenames'] << filename
-        else
-          warn "#{name} #{filename.inspect} is already defined in samples/. Remove from languages.yml."
        end
      end
    end
@@ -458,13 +575,14 @@ module Linguist
      :color             => options['color'],
      :type              => options['type'],
      :aliases           => options['aliases'],
-      :lexer             => options['lexer'],
+      :tm_scope          => options['tm_scope'],
      :ace_mode          => options['ace_mode'],
+      :wrap              => options['wrap'],
      :group_name        => options['group'],
-      :searchable        => options.key?('searchable') ? options['searchable'] : true,
+      :searchable        => options.fetch('searchable', true),
      :search_term       => options['search_term'],
-      :extensions        => options['extensions'].sort,
-      :primary_extension => options['primary_extension'],
+      :extensions        => Array(options['extensions']),
+      :interpreters      => options['interpreters'].sort,
      :filenames         => options['filenames'],
      :popular           => popular.include?(name)
    )
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
--- a/lib/linguist/lazy_blob.rb
+++ b/lib/linguist/lazy_blob.rb
@@ -0,0 +1,97 @@
+require 'linguist/blob_helper'
+require 'linguist/language'
+require 'rugged'
+
+module Linguist
+  class LazyBlob
+    GIT_ATTR = ['linguist-documentation',
+                'linguist-language',
+                'linguist-vendored',
+                'linguist-generated']
+
+    GIT_ATTR_OPTS = { :priority => [:index], :skip_system => true }
+    GIT_ATTR_FLAGS = Rugged::Repository::Attributes.parse_opts(GIT_ATTR_OPTS)
+
+    include BlobHelper
+
+    MAX_SIZE = 128 * 1024
+
+    attr_reader :repository
+    attr_reader :oid
+    attr_reader :path
+    attr_reader :mode
+
+    alias :name :path
+
+    def initialize(repo, oid, path, mode = nil)
+      @repository = repo
+      @oid = oid
+      @path = path
+      @mode = mode
+    end
+
+    def git_attributes
+      @git_attributes ||= repository.fetch_attributes(
+        name, GIT_ATTR, GIT_ATTR_FLAGS)
+    end
+
+    def documentation?
+      if attr = git_attributes['linguist-documentation']
+        boolean_attribute(attr)
+      else
+        super
+      end
+    end
+
+    def generated?
+      if attr = git_attributes['linguist-generated']
+        boolean_attribute(attr)
+      else
+        super
+      end
+    end
+
+    def vendored?
+      if attr = git_attributes['linguist-vendored']
+        return boolean_attribute(attr)
+      else
+        super
+      end
+    end
+
+    def language
+      return @language if defined?(@language)
+
+      @language = if lang = git_attributes['linguist-language']
+        Language.find_by_alias(lang)
+      else
+        super
+      end
+    end
+
+    def data
+      load_blob!
+      @data
+    end
+
+    def size
+      load_blob!
+      @size
+    end
+
+    def cleanup!
+      @data.clear if @data
+    end
+
+    protected
+
+    # Returns true if the attribute is present and not the string "false".
+    def boolean_attribute(attr)
+      attr != "false"
+    end
+
+    def load_blob!
+      @data, @size = Rugged::Blob.to_buffer(repository, oid, MAX_SIZE) if @data.nil?
+    end
+  end
+end
--- a/lib/linguist/md5.rb
+++ b/lib/linguist/md5.rb
@@ -4,7 +4,7 @@ module Linguist
  module MD5
    # Public: Create deep nested digest of value object.
    #
-    # Useful for object comparsion.
+    # Useful for object comparison.
    #
    # obj - Object to digest.
    #
--- a/lib/linguist/popular.yml
+++ b/lib/linguist/popular.yml
@@ -3,27 +3,27 @@
 # This file should only be edited by GitHub staff

 - ActionScript
- Bash
 - C
 - C#
 - C++
 - CSS
- Common Lisp
- Diff
- Emacs Lisp
- Erlang
+- Clojure
+- CoffeeScript
+- Go
 - HTML
 - Haskell
 - Java
 - JavaScript
 - Lua
+- Matlab
 - Objective-C
 - PHP
 - Perl
 - Python
+- R
 - Ruby
- SQL
 - Scala
- Scheme
+- Shell
+- Swift
 - TeX
- XML
+- VimL
--- a/lib/linguist/repository.rb
+++ b/lib/linguist/repository.rb
@@ -1,4 +1,5 @@
-require 'linguist/file_blob'
+require 'linguist/lazy_blob'
+require 'rugged'

 module Linguist
  # A Repository is an abstraction of a Grit::Repo or a basic file
@@ -7,89 +8,165 @@ module Linguist
  # Its primary purpose is for gathering language statistics across
  # the entire project.
  class Repository
-    # Public: Initialize a new Repository from a File directory
-    #
-    # base_path - A path String
-    #
-    # Returns a Repository
-    def self.from_directory(base_path)
-      new Dir["#{base_path}/**/*"].
-        select { |f| File.file?(f) }.
-        map { |path| FileBlob.new(path, base_path) }
+    attr_reader :repository
+
+    # Public: Create a new Repository based on the stats of
+    # an existing one
+    def self.incremental(repo, commit_oid, old_commit_oid, old_stats)
+      repo = self.new(repo, commit_oid)
+      repo.load_existing_stats(old_commit_oid, old_stats)
+      repo
    end

-    # Public: Initialize a new Repository
+    # Public: Initialize a new Repository to be analyzed for language
+    # data
    #
-    # enum - Enumerator that responds to `each` and
-    #        yields Blob objects
+    # repo - a Rugged::Repository object
+    # commit_oid - the sha1 of the commit that will be analyzed;
+    #              this is usually the master branch
    #
    # Returns a Repository
-    def initialize(enum)
-      @enum = enum
-      @computed_stats = false
-      @language = @size = nil
-      @sizes = Hash.new { 0 }
+    def initialize(repo, commit_oid)
+      @repository = repo
+      @commit_oid = commit_oid
+
+      raise TypeError, 'commit_oid must be a commit SHA1' unless commit_oid.is_a?(String)
+    end
+
+    # Public: Load the results of a previous analysis on this repository
+    # to speed up the new scan.
+    #
+    # The new analysis will be performed incrementally as to only take
+    # into account the file changes since the last time the repository
+    # was scanned
+    #
+    # old_commit_oid - the sha1 of the commit that was previously analyzed
+    # old_stats - the result of the previous analysis, obtained by calling
+    #             Repository#cache on the old repository
+    #
+    # Returns nothing
+    def load_existing_stats(old_commit_oid, old_stats)
+      @old_commit_oid = old_commit_oid
+      @old_stats = old_stats
+      nil
    end

    # Public: Returns a breakdown of language stats.
    #
    # Examples
    #
-    #   # => { Language['Ruby'] => 46319,
-    #          Language['JavaScript'] => 258 }
+    #   # => { 'Ruby' => 46319,
+    #          'JavaScript' => 258 }
    #
-    # Returns a Hash of Language keys and Integer size values.
+    # Returns a Hash of language names and Integer size values.
    def languages
-      compute_stats
-      @sizes
+      @sizes ||= begin
+        sizes = Hash.new { 0 }
+        cache.each do |_, (language, size)|
+          sizes[language] += size
+        end
+        sizes
+      end
    end

    # Public: Get primary Language of repository.
    #
-    # Returns a Language
+    # Returns a language name
    def language
-      compute_stats
-      @language
+      @language ||= begin
+        primary = languages.max_by { |(_, size)| size }
+        primary && primary[0]
+      end
    end

    # Public: Get the total size of the repository.
    #
    # Returns a byte size Integer
    def size
-      compute_stats
-      @size
+      @size ||= languages.inject(0) { |s,(_,v)| s + v }
    end

-    # Internal: Compute language breakdown for each blob in the Repository.
+    # Public: Return the language breakdown of this repository by file
    #
-    # Returns nothing
-    def compute_stats
-      return if @computed_stats
+    # Returns a map of language names => [filenames...]
+    def breakdown_by_file
+      @file_breakdown ||= begin
+        breakdown = Hash.new { |h,k| h[k] = Array.new }
+        cache.each do |filename, (language, _)|
+          breakdown[language] << filename
+        end
+        breakdown
+      end
+    end

-      @enum.each do |blob|
-        # Skip binary file extensions
-        next if blob.binary_mime_type?
+    # Public: Return the cached results of the analysis
+    #
+    # This is a per-file breakdown that can be passed to other instances
+    # of Linguist::Repository to perform incremental scans
+    #
+    # Returns a map of filename => [language, size]
+    def cache
+      @cache ||= begin
+        if @old_commit_oid == @commit_oid
+          @old_stats
+        else
+          compute_stats(@old_commit_oid, @old_stats)
+        end
+      end
+    end

-        # Skip vendored or generated blobs
-        next if blob.vendored? || blob.generated? || blob.language.nil?
+    def read_index
+      attr_index = Rugged::Index.new
+      attr_index.read_tree(current_tree)
+      repository.index = attr_index
+    end

-        # Only include programming languages
-        if blob.language.type == :programming
-          @sizes[blob.language.group] += blob.size
+    def current_tree
+      @tree ||= Rugged::Commit.lookup(repository, @commit_oid).tree
+    end
+
+    protected
+    MAX_TREE_SIZE = 100_000
+
+    def compute_stats(old_commit_oid, cache = nil)
+      return {} if current_tree.count_recursive(MAX_TREE_SIZE) >= MAX_TREE_SIZE
+
+      old_tree = old_commit_oid && Rugged::Commit.lookup(repository, old_commit_oid).tree
+      read_index
+      diff = Rugged::Tree.diff(repository, old_tree, current_tree)
+
+      # Clear file map and fetch full diff if any .gitattributes files are changed
+      if cache && diff.each_delta.any? { |delta| File.basename(delta.new_file[:path]) == ".gitattributes" }
+        diff = Rugged::Tree.diff(repository, old_tree = nil, current_tree)
+        file_map = {}
+      else
+        file_map = cache ? cache.dup : {}
+      end
+
+      diff.each_delta do |delta|
+        old = delta.old_file[:path]
+        new = delta.new_file[:path]
+
+        file_map.delete(old)
+        next if delta.binary
+
+        if [:added, :modified].include? delta.status
+          # Skip submodules and symlinks
+          mode = delta.new_file[:mode]
+          mode_format = (mode & 0170000)
+          next if mode_format == 0120000 || mode_format == 040000 || mode_format == 0160000
+
+          blob = Linguist::LazyBlob.new(repository, delta.new_file[:oid], new, mode.to_s(8))
+
+          if blob.include_in_language_stats?
+            file_map[new] = [blob.language.group.name, blob.size]
+          end
+
+          blob.cleanup!
        end
      end

-      # Compute total size
-      @size = @sizes.inject(0) { |s,(_,v)| s + v }
-
-      # Get primary language
-      if primary = @sizes.max_by { |(_, size)| size }
-        @language = primary[0]
-      end
-
-      @computed_stats = true
-
-      nil
+      file_map
    end
  end
 end
--- a/lib/linguist/samples.json
+++ b/lib/linguist/samples.json
--- a/lib/linguist/samples.rb
+++ b/lib/linguist/samples.rb
@@ -1,7 +1,12 @@
-require 'yaml'
+begin
+  require 'yajl'
+rescue LoadError
+  require 'yaml'
+end

 require 'linguist/md5'
 require 'linguist/classifier'
+require 'linguist/shebang'

 module Linguist
  # Model for accessing classifier training data.
@@ -13,8 +18,11 @@ module Linguist
    PATH = File.expand_path('../samples.json', __FILE__)

    # Hash of serialized samples object
-    if File.exist?(PATH)
-      DATA = YAML.load_file(PATH)
+    def self.cache
+      @cache ||= begin
+        serializer = defined?(Yajl) ? Yajl : YAML
+        serializer.load(File.read(PATH))
+      end
    end

    # Public: Iterate over each sample.
@@ -23,13 +31,9 @@ module Linguist
    #
    # Returns nothing.
    def self.each(&block)
-      Dir.entries(ROOT).each do |category|
+      Dir.entries(ROOT).sort!.each do |category|
        next if category == '.' || category == '..'

-        # Skip text and binary for now
-        # Possibly reconsider this later
-        next if category == 'Text' || category == 'Binary'
-
        dirname = File.join(ROOT, category)
        Dir.entries(dirname).each do |filename|
          next if filename == '.' || filename == '..'
@@ -45,14 +49,14 @@ module Linguist
              })
            end
          else
-            if File.extname(filename) == ""
-              raise "#{File.join(dirname, filename)} is missing an extension, maybe it belongs in filenames/ subdir"
-            end
+            path = File.join(dirname, filename)
+            extname = File.extname(filename)

            yield({
-              :path     => File.join(dirname, filename),
+              :path     => path,
              :language => category,
-              :extname  => File.extname(filename)
+              :interpreter => Shebang.interpreter(File.read(path)),
+              :extname  => extname.empty? ? nil : extname
            })
          end
        end
@@ -67,6 +71,7 @@ module Linguist
    def self.data
      db = {}
      db['extnames'] = {}
+      db['interpreters'] = {}
      db['filenames'] = {}

      each do |sample|
@@ -76,12 +81,22 @@ module Linguist
          db['extnames'][language_name] ||= []
          if !db['extnames'][language_name].include?(sample[:extname])
            db['extnames'][language_name] << sample[:extname]
+            db['extnames'][language_name].sort!
+          end
+        end
+
+        if sample[:interpreter]
+          db['interpreters'][language_name] ||= []
+          if !db['interpreters'][language_name].include?(sample[:interpreter])
+            db['interpreters'][language_name] << sample[:interpreter]
+            db['interpreters'][language_name].sort!
          end
        end

        if sample[:filename]
          db['filenames'][language_name] ||= []
          db['filenames'][language_name] << sample[:filename]
+          db['filenames'][language_name].sort!
        end

        data = File.read(sample[:path])
--- a/lib/linguist/shebang.rb
+++ b/lib/linguist/shebang.rb
@@ -0,0 +1,59 @@
+module Linguist
+  class Shebang
+    # Public: Use shebang to detect language of the blob.
+    #
+    # blob               - An object that quacks like a blob.
+    #
+    # Examples
+    #
+    #   Shebang.call(FileBlob.new("path/to/file"))
+    #
+    # Returns an Array with one Language if the blob has a shebang with a valid
+    # interpreter, or empty if there is no shebang.
+    def self.call(blob, _ = nil)
+      Language.find_by_interpreter interpreter(blob.data)
+    end
+
+    # Public: Get the interpreter from the shebang
+    #
+    # Returns a String or nil
+    def self.interpreter(data)
+      shebang = data.lines.first
+
+      # First line must start with #!
+      return unless shebang && shebang.start_with?("#!")
+
+      s = StringScanner.new(shebang)
+
+      # There was nothing after the #!
+      return unless path = s.scan(/^#!\s*\S+/)
+
+      # Keep going
+      script = path.split('/').last
+
+      # if /usr/bin/env type shebang then walk the string
+      if script == 'env'
+        s.scan(/\s+/)
+        s.scan(/.*=[^\s]+\s+/) # skip over variable arguments e.g. foo=bar
+        script = s.scan(/\S+/)
+      end
+
+      # Interpreter was /usr/bin/env with no arguments
+      return unless script
+
+      # "python2.6" -> "python2"
+      script.sub! /(\.\d+)$/, ''
+
+      # #! perl -> perl
+      script.sub! /^#!\s*/, ''
+
+      # Check for multiline shebang hacks that call `exec`
+      if script == 'sh' &&
+        data.lines.first(5).any? { |l| l.match(/exec (\w+).+\$0.+\$@/) }
+        script = $1
+      end
+
+      File.basename(script)
+    end
+  end
+end
--- a/lib/linguist/strategy/filename.rb
+++ b/lib/linguist/strategy/filename.rb
@@ -0,0 +1,10 @@
+module Linguist
+  module Strategy
+    # Detects language based on filename and/or extension
+    class Filename
+      def self.call(blob, _)
+        Language.find_by_filename(blob.name.to_s)
+      end
+    end
+  end
+end
--- a/lib/linguist/strategy/modeline.rb
+++ b/lib/linguist/strategy/modeline.rb
@@ -0,0 +1,30 @@
+module Linguist
+  module Strategy
+    class Modeline
+      EmacsModeline = /-\*-\s*(?:(?!mode)[\w-]+\s*:\s*(?:[\w+-]+)\s*;?\s*)*(?:mode\s*:)?\s*([\w+-]+)\s*(?:;\s*(?!mode)[\w-]+\s*:\s*[\w+-]+\s*)*;?\s*-\*-/i
+      VimModeline = /vim:\s*set.*\s(?:ft|filetype)=(\w+)\s?.*:/i
+
+      # Public: Detects language based on Vim and Emacs modelines
+      #
+      # blob               - An object that quacks like a blob.
+      #
+      # Examples
+      #
+      #   Modeline.call(FileBlob.new("path/to/file"))
+      #
+      # Returns an Array with one Language if the blob has a Vim or Emacs modeline
+      # that matches a Language name or alias. Returns an empty array if no match.
+      def self.call(blob, _ = nil)
+        Array(Language.find_by_alias(modeline(blob.data)))
+      end
+
+      # Public: Get the modeline from the first n-lines of the file
+      #
+      # Returns a String or nil
+      def self.modeline(data)
+        match = data.match(EmacsModeline) || data.match(VimModeline)
+        match[1] if match
+      end
+    end
+  end
+end
--- a/lib/linguist/tokenizer.rb
+++ b/lib/linguist/tokenizer.rb
@@ -22,8 +22,10 @@ module Linguist
    # Start state on token, ignore anything till the next newline
    SINGLE_LINE_COMMENTS = [
      '//', # C
+      '--', # Ada, Haskell, AppleScript
      '#',  # Ruby
      '%',  # Tex
+      '"',  # Vim
    ]

    # Start state on opening token, ignore anything until the closing
@@ -32,7 +34,9 @@ module Linguist
      ['/*', '*/'],    # C
      ['<!--', '-->'], # XML
      ['{-', '-}'],    # Haskell
-      ['(*', '*)']     # Coq
+      ['(*', '*)'],    # Coq
+      ['"""', '"""'],  # Python
+      ["'''", "'''"]   # Python
    ]

    START_SINGLE_LINE_COMMENT =  Regexp.compile(SINGLE_LINE_COMMENTS.map { |c|
@@ -92,7 +96,7 @@ module Linguist
          end

        # Skip number literals
-        elsif s.scan(/(0x)?\d(\d|\.)*/)
+        elsif s.scan(/(0x\h(\h|\.)*|\d(\d|\.)*)([uU][lL]{0,2}|([eE][-+]\d*)?[fFlL]*)/)

        # SGML style brackets
        elsif token = s.scan(/<[^\s<>][^<>]*>/)
@@ -128,6 +132,9 @@ module Linguist
    #   extract_shebang("#!/usr/bin/env node")
    #   # => "node"
    #
+    #   extract_shebang("#!/usr/bin/env A=B foo=bar awk -f")
+    #   # => "awk"
+    #
    # Returns String token or nil it couldn't be parsed.
    def extract_shebang(data)
      s = StringScanner.new(data)
@@ -136,9 +143,10 @@ module Linguist
        script = path.split('/').last
        if script == 'env'
          s.scan(/\s+/)
+          s.scan(/.*=[^\s]+\s+/)
          script = s.scan(/\S+/)
        end
-        script = script[/[^\d]+/, 0]
+        script = script[/[^\d]+/, 0] if script
        return script
      end

--- a/lib/linguist/vendor.yml
+++ b/lib/linguist/vendor.yml
@@ -10,25 +10,114 @@
 ## Vendor Conventions ##

 # Caches
- cache/
+- (^|/)cache/
+
+# Dependencies
+- ^[Dd]ependencies/

 # C deps
 #  https://github.com/joyent/node
 - ^deps/
 - ^tools/
+- (^|/)configure$
+- (^|/)configure.ac$
+- (^|/)config.guess$
+- (^|/)config.sub$

-# Node depedencies
+# Linters
+- cpplint.py
+
+# Node dependencies
 - node_modules/

-# Vendored depedencies
- vendor/
+# Bower Components
+- bower_components/

+# Erlang bundles
+- ^rebar$
+- erlang.mk
+
+# Go dependencies
+- Godeps/_workspace/
+
+# Minified JavaScript and CSS
+- (\.|-)min\.(js|css)$
+
+# Stylesheets imported from packages
+- ([^\s]*)import\.(css|less|scss|styl)$
+
+# Bootstrap css and js
+- (^|/)bootstrap([^.]*)\.(js|css|less|scss|styl)$
+- (^|/)custom\.bootstrap([^\s]*)(js|css|less|scss|styl)$
+
+# Font Awesome
+- (^|/)font-awesome\.(css|less|scss|styl)$
+
+# Foundation css
+- (^|/)foundation\.(css|less|scss|styl)$
+
+# Normalize.css
+- (^|/)normalize\.(css|less|scss|styl)$
+
+# Bourbon css
+- (^|/)[Bb]ourbon/.*\.(css|less|scss|styl)$
+
+# Animate.css
+- (^|/)animate\.(css|less|scss|styl)$
+
+# Vendored dependencies
+- third[-_]?party/
+- 3rd[-_]?party/
+- vendors?/
+- extern(al)?/
+- (^|/)[Vv]+endor/
+
+# Debian packaging
+- ^debian/
+
+# Haxelib projects often contain a neko bytecode file named run.n
+- run.n$
+
+# Bootstrap Datepicker
+- bootstrap-datepicker/

 ## Commonly Bundled JavaScript frameworks ##

 # jQuery
- (^|/)jquery([^.]*)(\.min)?\.js$
- (^|/)jquery\-\d\.\d(\.\d)?(\.min)?\.js$
+- (^|/)jquery([^.]*)\.js$
+- (^|/)jquery\-\d\.\d+(\.\d+)?\.js$
+
+# jQuery UI
+- (^|/)jquery\-ui(\-\d\.\d+(\.\d+)?)?(\.\w+)?\.(js|css)$
+- (^|/)jquery\.(ui|effects)\.([^.]*)\.(js|css)$
+
+# jQuery Gantt
+- jquery.fn.gantt.js
+
+# jQuery fancyBox
+- jquery.fancybox.js
+
+# Fuel UX
+- fuelux.js
+
+# jQuery File Upload
+- (^|/)jquery\.fileupload(-\w+)?\.js$
+
+# Slick
+- (^|/)slick\.\w+.js$
+
+# Leaflet plugins
+- (^|/)Leaflet\.Coordinates-\d+\.\d+\.\d+\.src\.js$
+- leaflet.draw-src.js
+- leaflet.draw.css
+- Control.FullScreen.css
+- Control.FullScreen.js
+- leaflet.spin.js
+- wicket-leaflet.js
+
+# Sublime Text workspace files
+- .sublime-project
+- .sublime-workspace

 # Prototype
 - (^|/)prototype(.*)\.js$
@@ -36,6 +125,9 @@
 - (^|/)controls\.js$
 - (^|/)dragdrop\.js$

+# Typescript definition files
+- (.*?)\.d\.ts$
+
 # MooTools
 - (^|/)mootools([^.]*)\d+\.\d+.\d+([^.]*)\.js$

@@ -49,10 +141,6 @@
 - (^|/)yahoo-([^.]*)\.js$
 - (^|/)yui([^.]*)\.js$

-# LESS css
- (^|/)less([^.]*)(\.min)?\.js$
- (^|/)less\-\d+\.\d+\.\d+(\.min)?\.js$
-
 # WYS editors
 - (^|/)ckeditor\.js$
 - (^|/)tiny_mce([^.]*)\.js$
@@ -61,36 +149,156 @@
 # MathJax
 - (^|/)MathJax/

+# Chart.js
+- (^|/)Chart\.js$
+
+# Codemirror
+- (^|/)[Cc]ode[Mm]irror/(\d+\.\d+/)?(lib|mode|theme|addon|keymap|demo)
+
+# SyntaxHighlighter - http://alexgorbatchev.com/
+- (^|/)shBrush([^.]*)\.js$
+- (^|/)shCore\.js$
+- (^|/)shLegacy\.js$
+
+# AngularJS
+- (^|/)angular([^.]*)\.js$
+
+# D3.js
+- (^|\/)d3(\.v\d+)?([^.]*)\.js$
+
+# React
+- (^|/)react(-[^.]*)?\.js$
+
+# Modernizr
+- (^|/)modernizr\-\d\.\d+(\.\d+)?\.js$
+- (^|/)modernizr\.custom\.\d+\.js$
+
+# Knockout
+- (^|/)knockout-(\d+\.){3}(debug\.)?js$
+
 ## Python ##

+# Sphinx
+- (^|/)docs?/_?(build|themes?|templates?|static)/
+
+# django
+- (^|/)admin_media/
+
 # Fabric
 - ^fabfile\.py$

 # WAF
 - ^waf$

+# .osx
+- ^.osx$

 ## Obj-C ##

+# Xcode
+
+- \.xctemplate/
+- \.imageset/
+
+# Carthage
+- ^Carthage/
+
+# Cocoapods
+- ^Pods/
+
 # Sparkle
 - (^|/)Sparkle/

+# Crashlytics
+- Crashlytics.framework/
+
+# Fabric
+- Fabric.framework/
+
+# git config files
+- gitattributes$
+- gitignore$
+- gitmodules$
+
+## Groovy ##
+
+# Gradle
+- (^|/)gradlew$
+- (^|/)gradlew\.bat$
+- (^|/)gradle/wrapper/
+
 ## .NET ##

 # Visual Studio IntelliSense
 - -vsdoc\.js$
+- \.intellisense\.js$

 # jQuery validation plugin (MS bundles this with asp.net mvc)
- (^|/)jquery([^.]*)\.validate(\.min)?\.js$
+- (^|/)jquery([^.]*)\.validate(\.unobtrusive)?\.js$
+- (^|/)jquery([^.]*)\.unobtrusive\-ajax\.js$

 # Microsoft Ajax
 - (^|/)[Mm]icrosoft([Mm]vc)?([Aa]jax|[Vv]alidation)(\.debug)?\.js$

 # NuGet
- ^[Pp]ackages/
+- ^[Pp]ackages\/.+\.\d+\/

 # ExtJS
- (^|/)extjs/
+- (^|/)extjs/.*?\.js$
+- (^|/)extjs/.*?\.xml$
+- (^|/)extjs/.*?\.txt$
+- (^|/)extjs/.*?\.html$
+- (^|/)extjs/.*?\.properties$
+- (^|/)extjs/.sencha/
+- (^|/)extjs/docs/
+- (^|/)extjs/builds/
+- (^|/)extjs/cmd/
+- (^|/)extjs/examples/
+- (^|/)extjs/locale/
+- (^|/)extjs/packages/
+- (^|/)extjs/plugins/
+- (^|/)extjs/resources/
+- (^|/)extjs/src/
+- (^|/)extjs/welcome/

-# Samples folders
- ^[Ss]amples/
+# Html5shiv
+- (^|/)html5shiv\.js$
+
+# Test fixtures
+- ^[Tt]ests?/fixtures/
+- ^[Ss]pecs?/fixtures/
+
+# PhoneGap/Cordova
+- (^|/)cordova([^.]*)\.js$
+- (^|/)cordova\-\d\.\d(\.\d)?\.js$
+
+# Foundation js
+- foundation(\..*)?\.js$
+
+# Vagrant
+- ^Vagrantfile$
+
+# .DS_Stores
+- .[Dd][Ss]_[Ss]tore$
+
+# R packages
+- ^vignettes/
+- ^inst/extdata/
+
+# Octicons
+- octicons.css
+- sprockets-octicons.scss
+
+# Typesafe Activator
+- (^|/)activator$
+- (^|/)activator\.bat$
+
+# ProGuard
+- proguard.pro
+- proguard-rules.pro
+
+# PuPHPet
+- ^puphpet/
+
+# Android Google APIs
+- (^|/)\.google_apis/
--- a/lib/linguist/version.rb
+++ b/lib/linguist/version.rb
@@ -0,0 +1,3 @@
+module Linguist
+  VERSION = "4.6.3"
+end
--- a/package.json
+++ b/package.json
@@ -0,0 +1,6 @@
+{
+  "repository": "https://github.com/github/linguist",
+  "dependencies": {
+    "season": "~>5.0"
+  }
+}
--- a/samples/ABAP/cl_csv_parser.abap
+++ b/samples/ABAP/cl_csv_parser.abap
@@ -0,0 +1,219 @@
+*/**
+* The MIT License (MIT)
+* Copyright (c) 2012 René van Mil
+* 
+* 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.
+*/
+
+*----------------------------------------------------------------------*
+*       CLASS CL_CSV_PARSER DEFINITION
+*----------------------------------------------------------------------*
+*
+*----------------------------------------------------------------------*
+class cl_csv_parser definition
+  public
+  inheriting from cl_object
+  final
+  create public .
+
+  public section.
+*"* public components of class CL_CSV_PARSER
+*"* do not include other source files here!!!
+
+    type-pools abap .
+    methods constructor
+      importing
+        !delegate type ref to if_csv_parser_delegate
+        !csvstring type string
+        !separator type c
+        !skip_first_line type abap_bool .
+    methods parse
+      raising
+        cx_csv_parse_error .
+  protected section.
+*"* protected components of class CL_CSV_PARSER
+*"* do not include other source files here!!!
+  private section.
+*"* private components of class CL_CSV_PARSER
+*"* do not include other source files here!!!
+
+    constants _textindicator type c value '"'.              "#EC NOTEXT
+    data _delegate type ref to if_csv_parser_delegate .
+    data _csvstring type string .
+    data _separator type c .
+    type-pools abap .
+    data _skip_first_line type abap_bool .
+
+    methods _lines
+      returning
+        value(returning) type stringtab .
+    methods _parse_line
+      importing
+        !line type string
+      returning
+        value(returning) type stringtab
+      raising
+        cx_csv_parse_error .
+endclass.                    "CL_CSV_PARSER DEFINITION
+
+
+
+*----------------------------------------------------------------------*
+*       CLASS CL_CSV_PARSER IMPLEMENTATION
+*----------------------------------------------------------------------*
+*
+*----------------------------------------------------------------------*
+class cl_csv_parser implementation.
+
+
+* <SIGNATURE>---------------------------------------------------------------------------------------+
+* | Instance Public Method CL_CSV_PARSER->CONSTRUCTOR
+* +-------------------------------------------------------------------------------------------------+
+* | [--->] DELEGATE                       TYPE REF TO IF_CSV_PARSER_DELEGATE
+* | [--->] CSVSTRING                      TYPE        STRING
+* | [--->] SEPARATOR                      TYPE        C
+* | [--->] SKIP_FIRST_LINE                TYPE        ABAP_BOOL
+* +--------------------------------------------------------------------------------------</SIGNATURE>
+  method constructor.
+    super->constructor( ).
+    _delegate = delegate.
+    _csvstring = csvstring.
+    _separator = separator.
+    _skip_first_line = skip_first_line.
+  endmethod.                    "constructor
+
+
+* <SIGNATURE>---------------------------------------------------------------------------------------+
+* | Instance Public Method CL_CSV_PARSER->PARSE
+* +-------------------------------------------------------------------------------------------------+
+* | [!CX!] CX_CSV_PARSE_ERROR
+* +--------------------------------------------------------------------------------------</SIGNATURE>
+  method parse.
+    data msg type string.
+    if _csvstring is initial.
+      message e002(csv) into msg.
+      raise exception type cx_csv_parse_error
+        exporting
+          message = msg.
+    endif.
+
+    " Get the lines
+    data is_first_line type abap_bool value abap_true.
+    data lines type standard table of string.
+    lines = _lines( ).
+    field-symbols <line> type string.
+    loop at lines assigning <line>.
+      " Should we skip the first line?
+      if _skip_first_line = abap_true and is_first_line = abap_true.
+        is_first_line = abap_false.
+        continue.
+      endif.
+      " Parse the line
+      data values type standard table of string.
+      values = _parse_line( <line> ).
+      " Send values to delegate
+      _delegate->values_found( values ).
+    endloop.
+  endmethod.                    "parse
+
+
+* <SIGNATURE>---------------------------------------------------------------------------------------+
+* | Instance Private Method CL_CSV_PARSER->_LINES
+* +-------------------------------------------------------------------------------------------------+
+* | [<-()] RETURNING                      TYPE        STRINGTAB
+* +--------------------------------------------------------------------------------------</SIGNATURE>
+  method _lines.
+    split _csvstring at cl_abap_char_utilities=>cr_lf into table returning.
+  endmethod.                    "_lines
+
+
+* <SIGNATURE>---------------------------------------------------------------------------------------+
+* | Instance Private Method CL_CSV_PARSER->_PARSE_LINE
+* +-------------------------------------------------------------------------------------------------+
+* | [--->] LINE                           TYPE        STRING
+* | [<-()] RETURNING                      TYPE        STRINGTAB
+* | [!CX!] CX_CSV_PARSE_ERROR
+* +--------------------------------------------------------------------------------------</SIGNATURE>
+  method _parse_line.
+    data msg type string.
+
+    data csvvalue type string.
+    data csvvalues type standard table of string.
+
+    data char type c.
+    data pos type i value 0.
+    data len type i.
+    len = strlen( line ).
+    while pos < len.
+      char = line+pos(1).
+      if char <> _separator.
+        if char = _textindicator.
+          data text_ended type abap_bool.
+          text_ended = abap_false.
+          while text_ended = abap_false.
+            pos = pos + 1.
+            if pos < len.
+              char = line+pos(1).
+              if char = _textindicator.
+                text_ended = abap_true.
+              else.
+                if char is initial. " Space
+                  concatenate csvvalue ` ` into csvvalue.
+                else.
+                  concatenate csvvalue char into csvvalue.
+                endif.
+              endif.
+            else.
+              " Reached the end of the line while inside a text value
+              " This indicates an error in the CSV formatting
+              text_ended = abap_true.
+              message e003(csv) into msg.
+              raise exception type cx_csv_parse_error
+                exporting
+                  message = msg.
+            endif.
+          endwhile.
+          " Check if next character is a separator, otherwise the CSV formatting is incorrect
+          data nextpos type i.
+          nextpos = pos + 1.
+          if nextpos < len and line+nextpos(1) <> _separator.
+            message e003(csv) into msg.
+            raise exception type cx_csv_parse_error
+              exporting
+                message = msg.
+          endif.
+        else.
+          if char is initial. " Space
+            concatenate csvvalue ` ` into csvvalue.
+          else.
+            concatenate csvvalue char into csvvalue.
+          endif.
+        endif.
+      else.
+        append csvvalue to csvvalues.
+        clear csvvalue.
+      endif.
+      pos = pos + 1.
+    endwhile.
+    append csvvalue to csvvalues. " Don't forget the last value
+
+    returning = csvvalues.
+  endmethod.                    "_parse_line
+endclass.                    "CL_CSV_PARSER IMPLEMENTATION
--- a/Script/GlobalScript.asc
+++ b/Script/GlobalScript.asc
@@ -0,0 +1,521 @@
+// main global script file
+
+// A function that initializes a bunch of stuff.
+function initialize_control_panel() { 
+  // Centre the control panel
+  gPanel.Centre(); 
+  // Centre the Restart dialog as well
+  gRestartYN.Centre(); 
+  if (!IsSpeechVoxAvailable()) { 
+    // If there is no speech-vox file, and therefore no speech,
+    // disable all the controls related with speech.
+    lblVoice.Visible = false;  
+    btnVoice.Visible = false;  
+    sldVoice.Visible = false;
+  }
+  else {
+    // If there *is*, then set it to voice and text. It's best to use
+    // both whenever possible, for the player's sake.
+    SetVoiceMode(eSpeechVoiceAndText); 
+    // And reflect this in the control panel.
+    btnVoice.Text = "Voice and Text"; 
+  }
+  if (!System.SupportsGammaControl) {
+    // If we can't change the gamma settings, disable the relevant options.
+    sldGamma.Visible = false; 
+    lblGamma.Visible = false;
+  } 
+  
+  //And now, set all the defaults
+  System.Volume = 100;
+  sldAudio.Value = System.Volume;
+  SetGameSpeed(40);
+  sldSpeed.Value = 40;
+  if (IsSpeechVoxAvailable()) {
+     SetVoiceMode(eSpeechVoiceAndText);
+     btnVoice.Text = "Voice and Text";
+     sldVoice.Value = 255;
+     SetSpeechVolume(255);
+  }
+  if (System.SupportsGammaControl) {
+    System.Gamma = 100;
+    sldGamma.Value = 100;
+  }
+}
+
+// Called when the game starts, before the first room is loaded
+function game_start() {   
+  // Put the code all in a function and then just call the function. 
+  // It saves cluttering up places like game_start.
+  initialize_control_panel(); 
+  // Use the KeyboardMovement module to, per default, replicate the standard
+  // keyboard movement of most Sierra games. See KeyboardMovement.txt for more info
+  KeyboardMovement.SetMode(eKeyboardMovement_Tapping); 
+}
+
+function repeatedly_execute() {
+  
+  // Put here anything you want to happen every game cycle, even when
+  // the game is paused. This will not run when the game is blocked
+  // inside a command like a blocking Walk()
+  
+  if (IsGamePaused() == 1) return;
+
+  // Put here anything you want to happen every game cycle, but not
+  // when the game is paused.
+}
+
+function repeatedly_execute_always() {
+  
+  // Put anything you want to happen every game cycle, even
+  // when the game is blocked inside a command like a
+  // blocking Walk().
+  // You cannot run blocking commands from this function.
+  
+}
+
+function show_inventory_window () 
+{
+  gInventory.Visible = true;
+  // switch to the Use cursor (to select items with)
+  mouse.Mode = eModeInteract;
+  // But, override the appearance to look like the arrow
+  mouse.UseModeGraphic(eModePointer);
+}
+
+function show_save_game_dialog()
+{
+  gSaveGame.Visible = true;
+  // Get the list of save games
+  lstSaveGamesList.FillSaveGameList();
+  if (lstSaveGamesList.ItemCount > 0)
+  {
+    // If there is at least one, set the default text
+    // to be the first game's name
+    txtNewSaveName.Text = lstSaveGamesList.Items[0];
+  }
+  else
+  {
+    // No save games yet, default empty text.
+    txtNewSaveName.Text = "";
+  }
+  mouse.UseModeGraphic(eModePointer);
+  gIconbar.Visible = false;
+}
+
+function show_restore_game_dialog()
+{
+  gRestoreGame.Visible = true;
+  lstRestoreGamesList.FillSaveGameList();
+  mouse.UseModeGraphic(eModePointer);
+  gIconbar.Visible = false;
+}
+
+function close_save_game_dialog()
+{
+  gSaveGame.Visible = false;
+  mouse.UseDefaultGraphic();
+  gIconbar.Visible = true;
+}
+
+function close_restore_game_dialog()
+{
+  gRestoreGame.Visible = false;
+  mouse.UseDefaultGraphic();
+  gIconbar.Visible = true;
+}
+
+// Called when a key is pressed. keycode holds the key's ASCII code
+function on_key_press(eKeyCode keycode) {
+  // The following is called before "if game is paused keycode=0", so
+  // it'll happen even when the game is paused.
+  
+  if ((keycode == eKeyEscape) && gRestartYN.Visible) {
+    //Use ESC to cancel restart.
+    gRestartYN.Visible = false; 
+    gIconbar.Visible = true;
+    // If the panel's not ON, then the player must have gotten here by tapping F9,
+    // therefore his cursor needs restoring. If the panel IS on, then it doesn't,
+    // because it's already a pointer. Get used to thinking like this!!
+    if (!gPanel.Visible) mouse.UseDefaultGraphic(); 
+    return;
+  }
+  if ((keycode == eKeyEscape) && gPanel.Visible) {
+    // Use ESC to turn the panel off.
+    gPanel.Visible = false; 
+    mouse.UseDefaultGraphic();
+    gIconbar.Visible = true;
+    return;
+  }
+  if ((keycode == eKeyEscape) && (gSaveGame.Visible))
+  {
+    // Use ESC to close the save game dialog
+    close_save_game_dialog();
+    return;
+  }
+  if ((keycode == eKeyEscape) && (gRestoreGame.Visible))
+  {
+    // Use ESC to close the restore game dialog
+    close_restore_game_dialog();
+    return;
+  }
+  
+  if (keycode == eKeyReturn) { 
+    // ENTER, in this case merely confirms restart
+    if (gRestartYN.Visible) RestartGame();
+  }
+
+  if (IsGamePaused() || (IsInterfaceEnabled() == 0))
+  {
+    // If the game is paused with a modal GUI on the
+    // screen, or the player interface is disabled in
+    // a cut scene, ignore any keypresses.
+    return;
+  }
+
+  // FUNCTION KEYS AND SYSTEM SHORTCUTS
+  if (keycode == eKeyEscape) {
+    // ESC
+    gPanel.Visible = true; 
+    gIconbar.Visible = false;
+    mouse.UseModeGraphic(eModePointer);
+  }
+  if (keycode == eKeyCtrlQ)  QuitGame(1);   // Ctrl-Q
+  if (keycode == eKeyF5) show_save_game_dialog();   // F5
+  if (keycode == eKeyF7) show_restore_game_dialog();  // F7
+  if (keycode == eKeyF9) {
+    // F9, asks the player to confirm restarting (so much better to always confirm first)
+    gRestartYN.Visible = true;  
+    gIconbar.Visible = false;
+    mouse.UseModeGraphic(eModePointer);
+  }
+  if (keycode == eKeyF12) SaveScreenShot("scrnshot.bmp");  // F12
+  if (keycode == eKeyTab)   show_inventory_window();  // Tab, show inventory
+
+  // GAME COMMAND SHORTCUTS
+  if (keycode == 'W') mouse.Mode=eModeWalkto; //Notice this alternate way to indicate keycodes.
+  if (keycode == 'L') mouse.Mode=eModeLookat; //Note that all we do here is set modes.
+  if (keycode == 'U') mouse.Mode=eModeInteract; //If you want something else to happen, such as GUI buttons highlighting,
+  if (keycode == 'T') mouse.Mode=eModeTalkto; //you'll need some more scripting done.
+  if (keycode == 'I') mouse.Mode=eModeUseinv; //But this will, as-is, give you some standard keyboard shortcuts your players will very much appreciate.
+
+  // For extra cursor modes, such as pick up, feel free to add as you will.
+  // Uncomment the line below if you use the "Pick Up" mode.
+  //if (keycode == 'P' || keycode == 'G') mouse.Mode=eModePickup; 
+
+  // DEBUG FUNCTIONS
+  if (keycode == eKeyCtrlS)  Debug(0,0);  // Ctrl-S, give all inventory
+  if (keycode == eKeyCtrlV)  Debug(1,0);  // Ctrl-V, version
+  if (keycode == eKeyCtrlA)  Debug(2,0);  // Ctrl-A, show walkable areas
+  if (keycode == eKeyCtrlX)  Debug(3,0);  // Ctrl-X, teleport to room
+  if (keycode == eKeyCtrlW && game.debug_mode) 
+    player.PlaceOnWalkableArea(); //Ctrl-W, move to walkable area 
+}
+
+
+function on_mouse_click(MouseButton button) {
+  // called when a mouse button is clicked. button is either LEFT or RIGHT
+  if (IsGamePaused() == 1) {
+    // Game is paused, so do nothing (ie. don't allow mouse click)
+  }
+  else if (button == eMouseLeft) {
+    ProcessClick(mouse.x, mouse.y, mouse.Mode );
+  }
+  else if (button == eMouseRight || button == eMouseWheelSouth){
+    // right-click our mouse-wheel down, so cycle cursor
+    mouse.SelectNextMode();
+  }
+  else if (button == eMouseMiddle) { 
+    // Middle-button-click, default make character walk to clicked area (a little shortcut)
+    // Could have been just "player.Walk(mouse.x,mouse.y)", but it's best to
+    // leave our options open - what if you have a special script triggered
+    // on "walking" mode?
+    ProcessClick(mouse.x, mouse.y, eModeWalkto); 
+  }
+  else if (button == eMouseWheelNorth) { 
+    // Mouse-wheel up, cycle cursors 
+    // If mode isn't WALK, set the previous mode (notice usage of numbers instead
+    // of eNums, when it suits us)...
+    if (mouse.Mode>0) mouse.Mode=mouse.Mode-1; 
+    else 
+    { 
+      // ...but if it is WALK mode...
+      if (player.ActiveInventory!=null) 
+      {
+        //...and the player has a selected inventory item, set mouse mode to UseInv. 
+        mouse.Mode=eModeUseinv; 
+      }
+      else 
+      {
+        // If they don't, however, just set it to mode TALK (change this line if you add more cursor modes)
+        mouse.Mode=eModeTalkto; 
+      }
+    }
+  }
+}
+
+function interface_click(int interface, int button) {
+  // This function is obsolete, from 2.62 and earlier versions.
+}
+
+function btnInvUp_Click(GUIControl *control, MouseButton button) {
+  invCustomInv.ScrollUp();
+}
+
+function btnInvDown_Click(GUIControl *control, MouseButton button) {
+  invCustomInv.ScrollDown();
+}
+
+function btnInvOK_Click(GUIControl *control, MouseButton button) {
+	// They pressed the OK button, close the GUI
+	gInventory.Visible = false;
+	mouse.UseDefaultGraphic();
+}
+
+function btnInvSelect_Click(GUIControl *control, MouseButton button) {
+  
+	// They pressed SELECT, so switch to the Get cursor
+	mouse.Mode = eModeInteract;
+	// But, override the appearance to look like the arrow
+	mouse.UseModeGraphic(eModePointer);
+}
+
+function btnIconInv_Click(GUIControl *control, MouseButton button) {
+  
+  show_inventory_window();
+}
+
+function btnIconCurInv_Click(GUIControl *control, MouseButton button) {
+  
+  if (player.ActiveInventory != null)
+    mouse.Mode = eModeUseinv;
+}
+
+function btnIconSave_Click(GUIControl *control, MouseButton button) 
+{
+  show_save_game_dialog();
+}
+
+function btnIconLoad_Click(GUIControl *control, MouseButton button) 
+{
+  show_restore_game_dialog();
+}
+
+function btnIconExit_Click(GUIControl *control, MouseButton button) {
+  
+  QuitGame(1);
+}
+
+function btnIconAbout_Click(GUIControl *control, MouseButton button) {
+  
+  gPanel.Visible=true;
+  gIconbar.Visible=false;
+  mouse.UseModeGraphic(eModePointer);
+}
+
+function cEgo_Look()
+{
+  Display("Damn, I'm looking good!");
+}
+
+function cEgo_Interact()
+{
+  Display("You rub your hands up and down your clothes.");
+}
+
+function cEgo_Talk()
+{
+  Display("Talking to yourself is a sign of madness!");
+}
+
+//START OF CONTROL PANEL FUNCTIONS
+function btnSave_OnClick(GUIControl *control, MouseButton button)
+{
+  gPanel.Visible = false;
+  mouse.UseDefaultGraphic();
+  gIconbar.Visible = true;
+  Wait(1);
+  btnIconSave_Click(btnIconSave, eMouseLeft);
+}
+
+function gControl_OnClick(GUI *theGui, MouseButton button)
+{
+
+}
+
+function btnAbout_OnClick(GUIControl *control, MouseButton button)
+{
+Display("Adventure Game Studio run-time engine default game.");
+}
+
+function btnQuit_OnClick(GUIControl *control, MouseButton button)
+{
+  gPanel.Visible = false;
+  Wait(1);
+  QuitGame(1);
+  gPanel.Visible = true;
+  gIconbar.Visible = false;
+  mouse.UseModeGraphic(eModePointer);
+}
+
+function btnLoad_OnClick(GUIControl *control, MouseButton button)
+{
+  gPanel.Visible = false;
+  mouse.UseDefaultGraphic();
+  gIconbar.Visible = true;
+  Wait(1);
+  btnIconLoad_Click(btnIconLoad, eMouseLeft);
+}
+
+function btnResume_OnClick(GUIControl *control, MouseButton button)
+{
+  gPanel.Visible = false;
+  mouse.UseDefaultGraphic();
+  gIconbar.Visible = true;
+}
+
+function sldAudio_OnChange(GUIControl *control)
+{
+  System.Volume = sldAudio.Value;
+}
+
+function sldVoice_OnChange(GUIControl *control)
+{
+  // Sets voice volume. Note that we don't check for the existence of speech.vox - 
+  // we did that in game_start, so if it's not there the slider won't even be available.
+  SetSpeechVolume(sldVoice.Value); 
+}
+
+function btnVoice_OnClick(GUIControl *control, MouseButton button)
+{
+  // Note that we don't check for the existence of speech.vox - we did that in game_start,
+  // so if it's not there the button won't even be available.
+  if (btnVoice.Text == "Voice and Text") { 
+    SetVoiceMode(eSpeechVoiceOnly); 
+    btnVoice.Text = "Voice only";
+  }
+  else if (btnVoice.Text == "Voice only") {
+    SetVoiceMode(eSpeechTextOnly);
+    btnVoice.Text = "Text only";
+  }
+  else if (btnVoice.Text == "Text only") {
+    SetVoiceMode(eSpeechVoiceAndText);
+    btnVoice.Text = "Voice and Text";
+  }
+}
+
+function sldGamma_OnChange(GUIControl *control)
+{
+  // Set the gamma. Note there's no need to check for anything else, as we ensured,
+  // in game_start, that the slider won't even appear if it's not possible to do this.
+  System.Gamma = sldGamma.Value; 
+}
+
+function btnDefault_OnClick(GUIControl *control, MouseButton button)
+{
+  // Reset everything to default. You'll have to edit these as well as the sliders
+  // if you'd rather have different default parameters.
+  System.Volume = 100;
+  sldAudio.Value = System.Volume;
+  sldSpeed.Value = 40;
+  SetGameSpeed(40);
+  if (IsSpeechVoxAvailable()) {
+     SetVoiceMode(eSpeechVoiceAndText);
+     btnVoice.Text = "Voice and Text";
+     sldVoice.Value = 255;
+     SetSpeechVolume(255);
+  }
+  if (System.SupportsGammaControl) {
+    System.Gamma = 100;
+    sldGamma.Value = 100;
+  }
+}
+//END OF CONTROL PANEL FUNCTIONS
+
+function dialog_request(int param) 
+{
+  // This is used by the dialog text parser if you need to process
+  // text that the player types in to the parser.
+  // It is not used by default.
+}
+
+function sldSpeed_OnChange(GUIControl *control)
+{
+  SetGameSpeed(sldSpeed.Value);
+}
+
+function btnRestart_OnClick(GUIControl *control, MouseButton button)
+{
+  gRestartYN.Visible=true;
+  gIconbar.Visible=false;
+}
+
+function btnRestartYes_OnClick(GUIControl *control, MouseButton button)
+{
+  RestartGame();
+}
+
+function btnRestartNo_OnClick(GUIControl *control, MouseButton button)
+{
+  gRestartYN.Visible = false;
+  gIconbar.Visible = true;
+  // If the panel's not ON, then the player must have gotten here by tapping F9,
+  // therefore his cursor needs restoring. If the panel IS on, then it doesn't,
+  // because it's already a pointer. Get used to thinking like this!!
+  if (!gPanel.Visible) mouse.UseDefaultGraphic(); 
+}
+
+function btnCancelSave_OnClick(GUIControl *control, MouseButton button)
+{
+  close_save_game_dialog();
+}
+
+function btnSaveGame_OnClick(GUIControl *control, MouseButton button)
+{
+  int gameSlotToSaveInto = lstSaveGamesList.ItemCount + 1;
+  int i = 0;
+  while (i < lstSaveGamesList.ItemCount)
+  {
+    if (lstSaveGamesList.Items[i] == txtNewSaveName.Text)
+    {
+      gameSlotToSaveInto = lstSaveGamesList.SaveGameSlots[i];
+    }
+    i++;
+  }
+  SaveGameSlot(gameSlotToSaveInto, txtNewSaveName.Text);
+  close_save_game_dialog();
+}
+
+function btnCancelRestore_OnClick(GUIControl *control, MouseButton button)
+{
+  close_restore_game_dialog();
+}
+
+function btnRestoreGame_OnClick(GUIControl *control, MouseButton button)
+{
+  if (lstRestoreGamesList.SelectedIndex >= 0)
+  {
+    RestoreGameSlot(lstRestoreGamesList.SaveGameSlots[lstRestoreGamesList.SelectedIndex]);
+  }
+  close_restore_game_dialog();
+}
+
+function lstSaveGamesList_OnSelectionCh(GUIControl *control)
+{
+  txtNewSaveName.Text = lstSaveGamesList.Items[lstSaveGamesList.SelectedIndex];
+}
+
+function txtNewSaveName_OnActivate(GUIControl *control)
+{
+  // Pressing return in the text box simulates clicking the Save button
+  btnSaveGame_OnClick(control, eMouseLeft);
+}
+
+function btnDeleteSave_OnClick(GUIControl *control, MouseButton button)
+{
+  if (lstSaveGamesList.SelectedIndex >= 0)
+  {
+    DeleteSaveSlot(lstSaveGamesList.SaveGameSlots[lstSaveGamesList.SelectedIndex]);
+    lstSaveGamesList.FillSaveGameList();
+  }
+}
--- a/Script/GlobalScript.ash
+++ b/Script/GlobalScript.ash
@@ -0,0 +1,4 @@
+// Main header script - this will be included into every script in
+// the game (local and global). Do not place functions here; rather,
+// place import definitions and #define names here to be used by all
+// scripts.
--- a/Script/KeyboardMovement_102.asc
+++ b/Script/KeyboardMovement_102.asc
@@ -0,0 +1,216 @@
+// Main script for module 'KeyboardMovement'
+
+//****************************************************************************************************
+// DEFINITIONS
+//****************************************************************************************************
+
+#define DISTANCE 10000// distance player walks in Tapping mode before he stops
+
+enum KeyboardMovement_Directions {
+	eKeyboardMovement_Stop, 
+	eKeyboardMovement_DownLeft, 
+	eKeyboardMovement_Down, 
+	eKeyboardMovement_DownRight, 
+	eKeyboardMovement_Left, 
+	eKeyboardMovement_Right, 
+	eKeyboardMovement_UpLeft, 
+	eKeyboardMovement_Up, 
+	eKeyboardMovement_UpRight
+};
+
+//****************************************************************************************************
+// VARIABLES
+//****************************************************************************************************
+
+// keycodes as variables for future key customization functions (static variables?):
+int KeyboardMovement_KeyDown = 380; // down arrow
+int KeyboardMovement_KeyLeft = 375; // left arrow
+int KeyboardMovement_KeyRight = 377; // right arrow
+int KeyboardMovement_KeyUp = 372; // up arrow
+int KeyboardMovement_KeyDownRight = 381; // PgDn (numpad)
+int KeyboardMovement_KeyUpRight = 373; // PgUp (numpad)
+int KeyboardMovement_KeyDownLeft = 379; // End (numpad)
+int KeyboardMovement_KeyUpLeft = 371; // Home (numpad)
+int KeyboardMovement_KeyStop = 376; // 5 (numpad)
+
+KeyboardMovement_Modes KeyboardMovement_Mode = eKeyboardMovement_None; // stores current keyboard control mode (disabled by default)
+
+KeyboardMovement_Directions KeyboardMovement_CurrentDirection = eKeyboardMovement_Stop; // stores current walking direction of player character
+
+//****************************************************************************************************
+// USER FUNCTIONS
+//****************************************************************************************************
+
+//====================================================================================================
+
+static function KeyboardMovement::SetMode(KeyboardMovement_Modes mode) {
+	KeyboardMovement_Mode = mode;
+}
+
+//====================================================================================================
+
+// key customization functions here
+
+//====================================================================================================
+
+//****************************************************************************************************
+// EVENT HANDLER FUNCTIONS
+//****************************************************************************************************
+
+//====================================================================================================
+
+function repeatedly_execute() {
+
+	//--------------------------------------------------
+	// Pressing mode
+	//--------------------------------------------------
+
+	if ((IsGamePaused() == true) || (KeyboardMovement_Mode != eKeyboardMovement_Pressing) || (IsInterfaceEnabled() == false) || (player.on == false)) return 0;
+	  // if game is paused, module or mode disabled, interface disabled or player character hidden, quit function
+
+	KeyboardMovement_Directions newdirection; // declare variable storing new direction
+
+	// get new direction:
+	if ( ((IsKeyPressed(KeyboardMovement_KeyDown)) && (IsKeyPressed(KeyboardMovement_KeyRight))) || (IsKeyPressed(KeyboardMovement_KeyDownRight)) ) newdirection = eKeyboardMovement_DownRight; // if down&right arrows or PgDn (numeric pad) held down, set new direction to Down-Right
+	else if ( ((IsKeyPressed(KeyboardMovement_KeyUp)) && (IsKeyPressed(KeyboardMovement_KeyRight))) || (IsKeyPressed(KeyboardMovement_KeyUpRight)) ) newdirection = eKeyboardMovement_UpRight; // up&right arrows or PgUp (numpad)
+	else if ( ((IsKeyPressed(KeyboardMovement_KeyDown)) && (IsKeyPressed(KeyboardMovement_KeyLeft))) || (IsKeyPressed(KeyboardMovement_KeyDownLeft)) ) newdirection = eKeyboardMovement_DownLeft; // down&left arrows or End (numpad)
+	else if ( ((IsKeyPressed(KeyboardMovement_KeyUp)) && (IsKeyPressed(KeyboardMovement_KeyLeft))) || (IsKeyPressed(KeyboardMovement_KeyUpLeft)) ) newdirection = eKeyboardMovement_UpLeft; // up&left arrows or Home (numpad)
+	else if (IsKeyPressed(KeyboardMovement_KeyDown)) newdirection = eKeyboardMovement_Down; // down arrow
+	else if (IsKeyPressed(KeyboardMovement_KeyLeft)) newdirection = eKeyboardMovement_Left; // left arrow
+	else if (IsKeyPressed(KeyboardMovement_KeyRight)) newdirection = eKeyboardMovement_Right; // right arrow
+	else if (IsKeyPressed(KeyboardMovement_KeyUp)) newdirection = eKeyboardMovement_Up; // up arrow
+	else newdirection = eKeyboardMovement_Stop; // if none of the above held down, set it to stop player character
+
+	if (IsKeyPressed(KeyboardMovement_KeyStop)) newdirection = eKeyboardMovement_Stop; // if 5 (numeric pad) held down, stop player character, regardless of whether some of the above are held down
+
+	if (newdirection != KeyboardMovement_CurrentDirection) { // if new direction is different from current direction
+
+		if (newdirection == eKeyboardMovement_Stop) player.StopMoving(); // if new direction is the Stop command, stop movement of player character
+		else { // if new direction is NOT the Stop command
+
+			int dx, dy; // declare variables storing new walk coordinates
+			if (newdirection == eKeyboardMovement_DownRight) {
+				dx = DISTANCE;
+				dy = DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_UpRight) {
+				dx = DISTANCE;
+				dy = -DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_DownLeft) {
+				dx = -DISTANCE;
+				dy = DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_UpLeft) {
+				dx = -DISTANCE;
+				dy = -DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_Down) {
+				dx = 0;
+				dy = DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_Left) {
+				dx = -DISTANCE;
+				dy = 0;
+			}
+			else if (newdirection == eKeyboardMovement_Right) {
+				dx = DISTANCE;
+				dy = 0;
+			}
+			else if (newdirection == eKeyboardMovement_Up) {
+				dx = 0;
+				dy = -DISTANCE;
+			}
+
+			player.WalkStraight(player.x + dx, player.y + dy, eNoBlock); // walk player character to the new coordinates
+		}
+		KeyboardMovement_CurrentDirection = newdirection; // update current direction to new direction
+
+	}
+
+}
+
+//====================================================================================================
+
+function on_key_press(int keycode) {
+
+	//--------------------------------------------------
+	// Tapping mode
+	//--------------------------------------------------
+
+	if ((IsGamePaused() == true) || (KeyboardMovement_Mode != eKeyboardMovement_Tapping) || (IsInterfaceEnabled() == false) || (player.on == false)) return 0;
+	  // if game is paused, module or mode disabled, interface disabled or player character hidden, quit function
+
+	KeyboardMovement_Directions newdirection; // declare variable storing new direction
+
+	// get new direction:
+	if (keycode == KeyboardMovement_KeyDownRight) newdirection = eKeyboardMovement_DownRight; // if down-right key pressed, set new direction to Down-Right
+	else if (keycode == KeyboardMovement_KeyUpRight) newdirection = eKeyboardMovement_UpRight;
+	else if (keycode == KeyboardMovement_KeyDownLeft) newdirection = eKeyboardMovement_DownLeft;
+	else if (keycode == KeyboardMovement_KeyUpLeft) newdirection = eKeyboardMovement_UpLeft;
+	else if (keycode == KeyboardMovement_KeyDown) newdirection = eKeyboardMovement_Down;
+	else if (keycode == KeyboardMovement_KeyLeft) newdirection = eKeyboardMovement_Left;
+	else if (keycode == KeyboardMovement_KeyRight) newdirection = eKeyboardMovement_Right;
+	else if (keycode == KeyboardMovement_KeyUp) newdirection = eKeyboardMovement_Up;
+	else if (keycode == KeyboardMovement_KeyStop) newdirection = eKeyboardMovement_Stop; // if stop key pressed, set to stop player character
+
+	if (newdirection != KeyboardMovement_CurrentDirection) { // if new direction is different from current direction
+
+		if (newdirection == eKeyboardMovement_Stop) player.StopMoving(); // if new direction is the Stop command, stop movement of player character
+		else { // if new direction is NOT the Stop command
+
+			int dx, dy; // declare variables storing new walk coordinates
+			if (newdirection == eKeyboardMovement_DownRight) {
+				dx = DISTANCE;
+				dy = DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_UpRight) {
+				dx = DISTANCE;
+				dy = -DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_DownLeft) {
+				dx = -DISTANCE;
+				dy = DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_UpLeft) {
+				dx = -DISTANCE;
+				dy = -DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_Down) {
+				dx = 0;
+				dy = DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_Left) {
+				dx = -DISTANCE;
+				dy = 0;
+			}
+			else if (newdirection == eKeyboardMovement_Right) {
+				dx = DISTANCE;
+				dy = 0;
+			}
+			else if (newdirection == eKeyboardMovement_Up) {
+				dx = 0;
+				dy = -DISTANCE;
+			}
+
+			player.WalkStraight(player.x + dx, player.y + dy, eNoBlock); // walk player character to the new coordinates
+		}
+		KeyboardMovement_CurrentDirection = newdirection; // update current direction to new direction
+
+	}
+	else { // if new direction is same as current direction
+		player.StopMoving(); // stop player character
+		KeyboardMovement_CurrentDirection = eKeyboardMovement_Stop; // update current direction
+	}
+
+}
+
+//====================================================================================================
+
+function on_event(EventType event, int data) {
+
+	if (event == eEventLeaveRoom) KeyboardMovement_CurrentDirection = eKeyboardMovement_Stop;
+
+}
+
+//====================================================================================================
--- a/Script/KeyboardMovement_102.ash
+++ b/Script/KeyboardMovement_102.ash
@@ -0,0 +1,13 @@
+// Script header for module 'KeyboardMovement'
+
+#define KeyboardMovement_VERSION 101
+
+enum KeyboardMovement_Modes {
+	eKeyboardMovement_None, 
+	eKeyboardMovement_Tapping, 
+	eKeyboardMovement_Pressing
+};
+
+struct KeyboardMovement {
+	import static function SetMode(KeyboardMovement_Modes mode);
+};
--- a/samples/AMPL/CT2.mod
+++ b/samples/AMPL/CT2.mod
@@ -0,0 +1,58 @@
+param num_beams;                  # number of beams
+
+param num_rows >= 1, integer;     # number of rows
+param num_cols >= 1, integer;     # number of columns 
+
+set BEAMS   := 1 .. num_beams;    # set of beams
+
+set ROWS    := 1 .. num_rows;	  # set of rows
+set COLUMNS := 1 .. num_cols;	  # set of columns
+
+# values for entries of each beam
+param beam_values {BEAMS, ROWS, COLUMNS} >= 0; 
+
+# values of tumor
+param tumor_values {ROWS, COLUMNS} >= 0; 
+
+# values of critical area
+param critical_values {ROWS, COLUMNS} >= 0; 
+
+# critical maximum dosage requirement
+param critical_max;
+
+# tumor minimum dosage requirement
+param tumor_min;
+
+# dosage scalar of each beam
+var X {i in BEAMS} >= 0;
+
+
+# define the tumor area which includes the locations where tumor exists
+set tumor_area := {k in ROWS, h in COLUMNS: tumor_values[k,h] > 0};
+
+# define critical area 
+set critical_area := {k in ROWS, h in COLUMNS: critical_values[k,h] > 0};
+
+var S {(k,h) in tumor_area} >= 0;
+var T {(k,h) in critical_area} >= 0;
+
+# maximize total dosage in tumor area
+maximize total_tumor_dosage: sum {i in BEAMS} sum {(k,h) in tumor_area} X[i] * beam_values[i,k,h];
+
+# minimize total dosage in critical area
+minimize total_critical_dosage: sum {i in BEAMS} sum {(k,h) in critical_area} X[i] * beam_values[i,k,h];
+
+# minimize total tumor slack
+minimize total_tumor_slack: sum {(k,h) in tumor_area} S[k,h];
+
+# minimize total critical area slack
+minimize total_critical_slack: sum {(k,h) in critical_area} T[k,h];
+
+# total dosage at each tumor location [k,h] should be >= min tumor dosage with slack variable
+subject to tumor_limit {(k,h) in tumor_area} : sum {i in BEAMS} X[i] * beam_values[i,k,h] == tumor_min - S[k,h];
+
+# total dosage at each critical location [k,h] should be = max critical dosage with slack variable
+subject to critical_limit {(k,h) in critical_area} : sum {i in BEAMS} X[i] * beam_values[i,k,h] == critical_max + T[k,h];
+
+
+
--- a/samples/AMPL/toy.ampl
+++ b/samples/AMPL/toy.ampl
@@ -0,0 +1,25 @@
+# A toy knapsack problem from the LocalSolver docs written in AMPL.
+
+set I;
+param Value{I};
+param Weight{I};
+param KnapsackBound;
+var Take{I} binary;
+
+maximize TotalValue: sum{i in I} Take[i] * Value[i];
+s.t. WeightLimit: sum{i in I} Take[i] * Weight[i] <= KnapsackBound;
+
+data;
+
+param:
+I: Weight Value :=
+0    10     1
+1    60    10
+2    30    15
+3    40    40
+4    30    60
+5    20    90
+6    20   100
+7     2    15;
+
+param KnapsackBound := 102;
--- a/Blueprint/actions.apib
+++ b/Blueprint/actions.apib
@@ -0,0 +1,55 @@
+FORMAT: 1A
+
+# Advanced Action API
+A resource action is – in fact – a state transition. This API example demonstrates an action - state transition - to another resource.
+
+## API Blueprint
+ [Previous: Resource Model](11.%20Resource%20Model.md)
+ [This: Raw API Blueprint](https://raw.github.com/apiaryio/api-blueprint/master/examples/11.%20Advanced%20Action.md)
+
+# Tasks [/tasks/tasks{?status,priority}]
+
+ Parameters
+    + status (string)
+    + priority (number)
+
+## List All Tasks [GET]
+
+ Response 200 (application/json)
+
+        [
+            {
+                "id": 123,
+                "name": "Exercise in gym",
+                "done": false,
+                "type": "task"
+            },
+            {
+                "id": 124,
+                "name": "Shop for groceries",
+                "done": true,
+                "type": "task"
+            }
+        ]
+
+## Retrieve Task [GET /task/{id}]
+This is a state transition to another resource
+
+ Parameters
+    + id (string)
+
+ Response 200 (application/json)
+
+        {
+            "id": 123,
+            "name": "Go to gym",
+            "done": false,
+            "type": "task"
+        }
+
+## Delete Task [DELETE /task/{id}]
+
+ Parameters
+    + id (string)
+
+ Response 204
--- a/Blueprint/attributes.apib
+++ b/Blueprint/attributes.apib
@@ -0,0 +1,39 @@
+FORMAT: 1A
+
+# Attributes API
+This API example demonstrates how to describe body attributes of a request or response message.
+
+In this case, the description is complementary (and duplicate!) to the provided JSON example in the body section. The [Advanced Attributes](09.%20Advanced%20Attributes.md) API example will demonstrate how to avoid duplicates and how to reuse attributes descriptions.
+
+## API Blueprint
+ [Previous: Parameters](07.%20Parameters.md)
+ [This: Raw API Blueprint](https://raw.github.com/apiaryio/api-blueprint/master/examples/08.%20Attributes.md)
+ [Next: Advanced Attributes](09.%20Advanced%20Attributes.md)
+
+# Group Coupons
+
+## Coupon [/coupons/{id}]
+A coupon contains information about a percent-off or amount-off discount you might want to apply to a customer.
+
+### Retrieve a Coupon [GET]
+Retrieves the coupon with the given ID.
+
+ Response 200 (application/json)
+
+    + Attributes (object)
+        + id: 250FF (string)
+        + created: 1415203908 (number) - Time stamp
+        + percent_off: 25 (number)
+
+            A positive integer between 1 and 100 that represents the discount the coupon will apply.
+
+        + redeem_by (number) - Date after which the coupon can no longer be redeemed
+
+    + Body
+
+            {
+                "id": "250FF",
+                "created": 1415203908,
+                "percent_off": 25,
+                "redeem_by:" null
+            }
--- a/Blueprint/simple.apib
+++ b/Blueprint/simple.apib
@@ -0,0 +1,18 @@
+FORMAT: 1A
+
+# The Simplest API
+This is one of the simplest APIs written in the **API Blueprint**.
+One plain resource combined with a method and that's it! We will explain what is going on in the next installment - [Resource and Actions](02.%20Resource%20and%20Actions.md).
+
+**Note:** As we progress through the examples, do not also forget to view the [Raw](https://raw.github.com/apiaryio/api-blueprint/master/examples/01.%20Simplest%20API.md) code to see what is really going on in the API Blueprint, as opposed to just seeing the output of the Github Markdown parser.
+
+Also please keep in mind that every single example in this course is a **real API Blueprint** and as such you can **parse** it with the [API Blueprint parser](https://github.com/apiaryio/drafter) or one of its [bindings](https://github.com/apiaryio/drafter#bindings).
+
+## API Blueprint
+ [This: Raw API Blueprint](https://raw.github.com/apiaryio/api-blueprint/master/examples/01.%20Simplest%20API.md)
+ [Next: Resource and Actions](02.%20Resource%20and%20Actions.md)
+
+# GET /message
+ Response 200 (text/plain)
+
+        Hello World!
--- a/samples/APL/DeepakChopra.apl
+++ b/samples/APL/DeepakChopra.apl
@@ -0,0 +1,18 @@
+⍝   You can try this at http://tryapl.org/
+⍝   I can not explain how much I suddenly love this crypto-language
+
+
+
+Starts     ← 'Experiential truth ' 'The physical world ' 'Non-judgment '       'Quantum physics '
+Middles    ← 'nurtures an '        'projects onto '      'imparts reality to ' 'constructs with '
+Qualifiers ← 'abundance of '       'the barrier of '     'self-righteous '     'potential '
+Finishes   ← 'marvel.'             'choices.'            'creativity.'         'actions.'
+
+rf     ← {(?⍴⍵)⊃⍵}
+erf    ← {rf ¨ ⍵}
+
+deepak ← {erf Starts Middles Qualifiers Finishes}
+
+
+
+deepak ⍬
--- a/samples/APL/UT.dyalog
+++ b/samples/APL/UT.dyalog
@@ -0,0 +1,367 @@
+:NameSpace UT
+
+    sac ← 0
+    expect_orig ← expect ← ⎕NS⍬
+    exception ← ⍬
+    nexpect_orig ← nexpect ← ⎕NS⍬
+
+    ∇ {Z}←{Conf}run Argument;PRE_test;POST_test;TEST_step;COVER_step;FromSpace
+     
+      load_display_if_not_already_loaded
+      load_salt_scripts_into_current_namespace_if_configured
+     
+      FromSpace←1⊃⎕RSI
+     
+      PRE_test←{}
+      POST_test←{}
+      COVER_step←{}
+      :If 0≠⎕NC'Conf'
+          :If Conf has'cover_target'
+              PRE_test←{{}⎕PROFILE'start'}
+              POST_test←{{}⎕PROFILE'stop'}
+          :EndIf
+      :EndIf
+     
+      :If is_function Argument
+          TEST_step←single_function_test_function
+          COVER_file←Argument,'_coverage.html'
+     
+      :ElseIf is_list_of_functions Argument
+          TEST_step←list_of_functions_test_function
+          COVER_file←'list_coverage.html'
+     
+      :ElseIf is_file Argument
+          TEST_step←file_test_function
+          COVER_file←(get_file_name Argument),'_coverage.html'
+     
+      :ElseIf is_dir Argument
+          test_files←test_files_in_dir Argument
+          TEST_step←test_dir_function
+          Argument←test_files
+      :EndIf
+     
+      :If 0≠⎕NC'Conf'
+          :If Conf has'cover_target'
+              COVER_step←{Conf,←⊂('cover_file'COVER_file)
+                  generate_coverage_page Conf}
+          :EndIf
+      :EndIf
+     
+      PRE_test ⍬
+      Z←FromSpace TEST_step Argument
+      POST_test ⍬
+      COVER_step ⍬
+    ∇
+
+    ∇ load_display_if_not_already_loaded
+      :If 0=⎕NC'#.DISPLAY'
+          'DISPLAY'#.⎕CY'display'
+      :EndIf
+    ∇
+
+    ∇ load_salt_scripts_into_current_namespace_if_configured
+      :If 0≠⎕NC'#.UT.appdir'
+          :If ⍬≢#.UT.appdir
+              ⎕SE.SALT.Load #.UT.appdir,'src/*.dyalog -target=#'
+              ⎕SE.SALT.Load #.UT.appdir,'test/*.dyalog -target=#'
+          :EndIf
+      :EndIf
+    ∇
+
+    ∇ Z←FromSpace single_function_test_function TestName
+      Z←run_ut FromSpace TestName
+    ∇
+
+    ∇ Z←FromSpace list_of_functions_test_function ListOfNames;t
+      t←⎕TS
+      Z←run_ut¨{FromSpace ⍵}¨ListOfNames
+      t←⎕TS-t
+      ('Test execution report')print_passed_crashed_failed Z t
+    ∇
+
+    ∇ Z←FromSpace file_test_function FilePath;FileNS;Functions;TestFunctions;t
+      FileNS←⎕SE.SALT.Load FilePath,' -target=#'
+      Functions←↓FileNS.⎕NL 3
+      TestFunctions←(is_test¨Functions)/Functions
+      :If (0/⍬,⊂0/'')≡TestFunctions
+          ⎕←'No test functions found'
+          Z←⍬
+      :Else
+          t←⎕TS
+          Z←run_ut¨{FileNS ⍵}¨TestFunctions
+          t←⎕TS-t
+          (FilePath,' tests')print_passed_crashed_failed Z t
+      :EndIf
+    ∇
+
+    ∇ Z←FromSpace test_dir_function Test_files
+      :If Test_files≡⍬/⍬,⊂''
+          ⎕←'No test files found'
+          Z←⍬
+      :Else
+          Z←#.UT.run¨Test_files
+      :EndIf
+    ∇
+
+    ∇ Z←get_file_name Argument;separator
+      separator←⊃⌽(Argument∊'/\')/⍳⍴Argument
+      Z←¯7↓separator↓Argument
+    ∇
+
+    ∇ generate_coverage_page Conf;ProfileData;CoverResults;HTML
+      ProfileData←⎕PROFILE'data'
+      ToCover←retrieve_coverables¨(⊃'cover_target'in Conf)
+      :If (⍴ToCover)≡(⍴⊂1)
+          ToCover←⊃ToCover
+      :EndIf
+      Representations←get_representation¨ToCover
+      CoverResults←ProfileData∘generate_cover_result¨↓ToCover,[1.5]Representations
+      HTML←generate_html CoverResults
+      Conf write_html_to_page HTML
+      ⎕PROFILE'clear'
+    ∇
+
+    ∇ Z←retrieve_coverables Something;nc;functions
+      nc←⎕NC Something
+      :If nc=3
+          Z←Something
+      :ElseIf nc=9
+          functions←strip¨↓⍎Something,'.⎕NL 3'
+          Z←{(Something,'.',⍵)}¨functions
+      :EndIf
+    ∇
+
+    ∇ Z←strip input
+      Z←(input≠' ')/input
+    ∇
+
+    ∇ Z←get_representation Function;nc;rep
+      nc←⎕NC⊂Function
+      :If nc=3.1
+          rep←↓⎕CR Function
+          rep[1]←⊂'∇',⊃rep[1]
+          rep,←⊂'∇'
+          rep←↑rep
+      :Else
+          rep←⎕CR Function
+      :EndIf
+      Z←rep
+    ∇
+
+    ∇ Z←ProfileData generate_cover_result(name representation);Indices;lines;functionlines;covered_lines
+      Indices←({name≡⍵}¨ProfileData[;1])/⍳⍴ProfileData[;1]
+      lines←ProfileData[Indices;2]
+      nc←⎕NC⊂name
+      :If 3.1=nc
+          functionlines←¯2+⍴↓representation
+      :Else
+          functionlines←⊃⍴↓representation
+      :EndIf
+      covered_lines←(⍬∘≢¨lines)/lines
+      Z←(nc lines functionlines covered_lines representation)
+    ∇
+
+    ∇ Z←generate_html CoverResults;Covered;Total;Percentage;CoverageText;ColorizedCode;Timestamp;Page
+      Covered←⊃⊃+/{⍴4⊃⍵}¨CoverResults
+      Total←⊃⊃+/{3⊃⍵}¨CoverResults
+      Percentage←100×Covered÷Total
+      CoverageText←'Coverage: ',Percentage,'% (',Covered,'/',Total,')'
+      ColorizedCode←⊃,/{colorize_code_by_coverage ⍵}¨CoverResults
+      Timestamp←generate_timestamp_text
+      Page←⍬
+      Page,←⊂⍬,'<html>'
+      Page,←⊂⍬,'<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>'
+      Page,←⊂⍬,'<style>pre cov {line-height:80%;}'
+      Page,←⊂⍬,'pre cov {color: green;}'
+      Page,←⊂⍬,'pre uncov {line-height:80%;}'
+      Page,←⊂⍬,'pre uncov {color:red;}</style>'
+      Page,←⊂⍬,CoverageText
+      Page,←⊂⍬,'<pre>'
+      Page,←ColorizedCode
+      Page,←⊂⍬,'</pre>'
+      Page,←Timestamp
+      Page,←⊂⍬,'</html>'
+      Z←Page
+    ∇
+
+    ∇ Z←colorize_code_by_coverage CoverResult;Colors;Ends;Code
+      :If 3.1=⊃CoverResult
+          Colors←(2+3⊃CoverResult)⍴⊂'<uncov>'
+          Colors[1]←⊂''
+          Colors[⍴Colors]←⊂''
+          Ends←(2+3⊃CoverResult)⍴⊂'</uncov>'
+          Ends[1]←⊂''
+          Ends[⍴Ends]←⊂''
+      :Else
+          Colors←(3⊃CoverResult)⍴⊂'<uncov>'
+          Ends←(3⊃CoverResult)⍴⊂'</uncov>'
+      :EndIf
+      Colors[1+4⊃CoverResult]←⊂'<cov>'
+      Ends[1+4⊃CoverResult]←⊂'</cov>'
+      Code←↓5⊃CoverResult
+      Z←Colors,[1.5]Code
+      Z←{⍺,(⎕UCS 13),⍵}/Z,Ends
+    ∇
+
+    ∇ Z←generate_timestamp_text;TS;YYMMDD;HHMMSS
+      TS←⎕TS
+      YYMMDD←⊃{⍺,'-',⍵}/3↑TS
+      HHMMSS←⊃{⍺,':',⍵}/3↑3↓TS
+      Z←'Page generated: ',YYMMDD,'|',HHMMSS
+    ∇
+
+    ∇ Conf write_html_to_page Page;tie;filename
+      filename←(⊃'cover_out'in Conf),(⊃'cover_file'in Conf)
+      :Trap 22
+          tie←filename ⎕NTIE 0
+          filename ⎕NERASE tie
+          filename ⎕NCREATE tie
+      :Else
+          tie←filename ⎕NCREATE 0
+      :EndTrap
+      Simple_array←⍕⊃,/Page
+      (⎕UCS'UTF-8'⎕UCS Simple_array)⎕NAPPEND tie
+    ∇
+
+    ∇ Z←is_function Argument
+      Z←'_TEST'≡¯5↑Argument
+    ∇
+
+    ∇ Z←is_list_of_functions Argument
+      Z←2=≡Argument
+    ∇
+
+    ∇ Z←is_file Argument
+      Z←'.dyalog'≡¯7↑Argument
+    ∇
+
+    ∇ Z←is_dir Argument;attr
+      :If 'Linux'≡5↑⊃'.'⎕WG'APLVersion'
+          Z←'yes'≡⊃⎕CMD'test -d ',Argument,' && echo yes || echo no'
+      :Else
+          'gfa'⎕NA'I kernel32|GetFileAttributes* <0t'
+          :If Z←¯1≠attr←gfa⊂Argument ⍝ If file exists
+              Z←⊃2 16⊤attr           ⍝ Return bit 4
+          :EndIf
+      :EndIf
+    ∇
+
+
+    ∇ Z←test_files_in_dir Argument
+      :If 'Linux'≡5↑⊃'.'⎕WG'APLVersion'
+          Z←⎕SH'find ',Argument,' -name \*_tests.dyalog'
+      :Else
+          #.⎕CY'files'
+          Z←#.Files.Dir Argument,'\*_tests.dyalog'
+          Z←(Argument,'\')∘,¨Z
+      :EndIf
+    ∇
+
+    ∇ Z←run_ut ut_data;returned;crashed;pass;crash;fail;message
+      (returned crashed time)←execute_function ut_data
+      (pass crash fail)←determine_pass_crash_or_fail returned crashed
+      message←determine_message pass fail crashed(2⊃ut_data)returned time
+      print_message_to_screen message
+      Z←(pass crash fail)
+    ∇
+
+    ∇ Z←execute_function ut_data;function;t
+      reset_UT_globals
+      function←(⍕(⊃ut_data[1])),'.',⊃ut_data[2]
+      :Trap sac
+          :If 3.2≡⎕NC⊂function
+              t←⎕TS
+              Z←(⍎function,' ⍬')0
+              t←⎕TS-t
+          :Else
+              t←⎕TS
+              Z←(⍎function)0
+              t←⎕TS-t
+          :EndIf
+     
+      :Else
+          Z←(↑⎕DM)1
+          :If exception≢⍬
+              expect←exception
+              Z[2]←0
+              t←⎕TS-t
+          :EndIf
+      :EndTrap
+      Z,←⊂t
+    ∇
+
+    ∇ reset_UT_globals
+      expect_orig ← expect← ⎕NS⍬
+      exception←⍬
+      nexpect_orig ← nexpect← ⎕NS⍬
+    ∇
+
+    ∇ Z←is_test FunctionName;wsIndex
+      wsIndex←FunctionName⍳' '
+      FunctionName←(wsIndex-1)↑FunctionName
+      Z←'_TEST'≡¯5↑FunctionName
+    ∇
+
+    ∇ Heading print_passed_crashed_failed(ArrayRes time)
+      ⎕←'-----------------------------------------'
+      ⎕←Heading
+      ⎕←'    ⍋  Passed: ',+/{1⊃⍵}¨ArrayRes
+      ⎕←'    ⍟ Crashed: ',+/{2⊃⍵}¨ArrayRes
+      ⎕←'    ⍒  Failed: ',+/{3⊃⍵}¨ArrayRes
+      ⎕←'    ○ Runtime: ',time[5],'m',time[6],'s',time[7],'ms'
+    ∇
+    
+    determine_pass_crash_or_fail←{
+      r c←⍵ ⋄ 0≠c:0 1 0 ⋄ z←(0 0 1)(1 0 0)
+      expect_orig≢expect:(⎕IO+expect≡r)⊃z ⋄ (⎕IO+nexpect≢r)⊃z
+    }
+
+    ∇ Z←determine_message(pass fail crashed name returned time)
+      :If crashed
+          Z←'CRASHED: 'failure_message name returned
+      :ElseIf pass
+          Z←'Passed ',time[5],'m',time[6],'s',time[7],'ms'
+      :Else
+          Z←'FAILED: 'failure_message name returned
+      :EndIf
+    ∇
+
+    ∇ print_message_to_screen message
+      ⎕←message
+    ∇
+
+    ∇ Z←term_to_text Term;Text;Rows
+      Text←#.DISPLAY Term
+      Rows←1⊃⍴Text
+      Z←(Rows 4⍴''),Text
+    ∇
+
+    ∇ Z←Cause failure_message(name returned);hdr;exp;expterm;got;gotterm
+      hdr←Cause,name
+      exp←'Expected'
+      expterm←term_to_text #.UT.expect
+      got←'Got'
+      gotterm←term_to_text returned
+      Z←align_and_join_message_parts hdr exp expterm got gotterm
+    ∇
+
+    ∇ Z←align_and_join_message_parts Parts;hdr;exp;expterm;got;gotterm;R1;C1;R2;C2;W
+      (hdr exp expterm got gotterm)←Parts
+      (R1 C1)←⍴expterm
+      (R2 C2)←⍴gotterm
+      W←⊃⊃⌈/C1 C2(⍴hdr)(⍴exp)(⍴got)
+      Z←(W↑hdr),[0.5](W↑exp)
+      Z←Z⍪(R1 W↑expterm)
+      Z←Z⍪(W↑got)
+      Z←Z⍪(R2 W↑gotterm)
+    ∇
+
+    ∇ Z←confparam in config
+      Z←1↓⊃({confparam≡⊃⍵}¨config)/config
+    ∇
+
+    ∇ Z←config has confparam
+      Z←∨/{confparam≡⊃⍵}¨config
+    ∇
+
+:EndNameSpace
--- a/samples/ATS/CoYonedaLemma.dats
+++ b/samples/ATS/CoYonedaLemma.dats
@@ -0,0 +1,110 @@
+(* ****** ****** *)
+//
+// HX-2014-01
+// CoYoneda Lemma:
+//
+(* ****** ****** *)
+//
+#include
+"share/atspre_staload.hats"
+//
+(* ****** ****** *)
+
+staload
+"libats/ML/SATS/basis.sats"
+staload
+"libats/ML/SATS/list0.sats"
+
+(* ****** ****** *)
+
+staload _ = "libats/ML/DATS/list0.dats"
+
+(* ****** ****** *)
+
+sortdef ftype = type -> type
+
+(* ****** ****** *)
+
+infixr (->) ->>
+typedef ->> (a:type, b:type) = a -<cloref1> b
+
+(* ****** ****** *)
+
+typedef
+functor(F:ftype) =
+  {a,b:type} (a ->> b) ->> F(a) ->> F(b)
+
+(* ****** ****** *)
+
+typedef
+list0 (a:type) = list0 (a)
+extern
+val functor_list0 : functor (list0)
+
+(* ****** ****** *)
+
+implement
+functor_list0{a,b}
+  (f) = lam xs => list0_map<a><b> (xs, f)
+
+(* ****** ****** *)
+
+datatype
+CoYoneda
+ (F:ftype, r:type) = {a:type} CoYoneda of (a ->> r, F(a))
+// end of [CoYoneda]
+
+(* ****** ****** *)
+//
+extern
+fun CoYoneda_phi
+  : {F:ftype}functor(F) -> {r:type} (F (r) ->> CoYoneda (F, r))
+extern
+fun CoYoneda_psi
+  : {F:ftype}functor(F) -> {r:type} (CoYoneda (F, r) ->> F (r))
+//
+(* ****** ****** *)
+
+implement
+CoYoneda_phi(ftor) = lam (fx) => CoYoneda (lam x => x, fx)
+implement
+CoYoneda_psi(ftor) = lam (CoYoneda(f, fx)) => ftor (f) (fx)
+
+(* ****** ****** *)
+
+datatype int0 = I of (int)
+datatype bool = True | False // boxed boolean
+
+(* ****** ****** *)
+//
+fun bool2string
+  (x:bool): string =
+(
+  case+ x of True() => "True" | False() => "False"
+)
+//
+implement
+fprint_val<bool> (out, x) = fprint (out, bool2string(x))
+//
+(* ****** ****** *)
+
+fun int2bool (i: int0): bool =
+  let val+I(i) = i in if i > 0 then True else False end
+
+(* ****** ****** *)
+
+val myintlist0 = g0ofg1($list{int0}((I)1, (I)0, (I)1, (I)0, (I)0))
+val myboolist0 = CoYoneda{list0,bool}{int0}(lam (i) => int2bool(i), myintlist0)
+val myboolist0 = CoYoneda_psi{list0}(functor_list0){bool}(myboolist0)
+
+(* ****** ****** *)
+
+val ((*void*)) = fprintln! (stdout_ref, "myboolist0 = ", myboolist0)
+
+(* ****** ****** *)
+
+implement main0 () = ()
+
+(* ****** ****** *)
+
+(* end of [CoYonedaLemma.dats] *)
--- a/samples/ATS/DiningPhil2.dats
+++ b/samples/ATS/DiningPhil2.dats
@@ -0,0 +1,178 @@
+(* ****** ****** *)
+//
+// HX-2013-11
+//
+// Implementing a variant of
+// the problem of Dining Philosophers
+//
+(* ****** ****** *)
+//
+#include
+"share/atspre_define.hats"
+#include
+"share/atspre_staload.hats"
+//
+(* ****** ****** *)
+
+staload
+UN = "prelude/SATS/unsafe.sats"
+
+(* ****** ****** *)
+
+staload "libc/SATS/stdlib.sats"
+staload "libc/SATS/unistd.sats"
+
+(* ****** ****** *)
+
+staload "{$LIBATSHWXI}/teaching/mythread/SATS/channel.sats"
+
+(* ****** ****** *)
+
+staload _ = "libats/DATS/deqarray.dats"
+staload _ = "{$LIBATSHWXI}/teaching/mythread/DATS/channel.dats"
+
+(* ****** ****** *)
+
+staload "./DiningPhil2.sats"
+
+(* ****** ****** *)
+
+implement phil_left (n) = n
+implement phil_right (n) = (n+1) \nmod NPHIL
+
+(* ****** ****** *)
+//
+extern
+fun randsleep (n: intGte(1)): void
+//
+implement
+randsleep (n) =
+  ignoret (sleep($UN.cast{uInt}(rand() mod n + 1)))
+// end of [randsleep]
+//
+(* ****** ****** *)
+
+implement
+phil_think (n) =
+{
+val () = println! ("phil_think(", n, ") starts")
+val () = randsleep (6)
+val () = println! ("phil_think(", n, ") finishes")
+}
+
+(* ****** ****** *)
+
+implement
+phil_dine (n, lf, rf) =
+{
+val () = println! ("phil_dine(", n, ") starts")
+val () = randsleep (3)
+val () = println! ("phil_dine(", n, ") finishes")
+}
+
+(* ****** ****** *)
+
+implement
+phil_loop (n) = let
+//
+val () = phil_think (n)
+//
+val nl = phil_left (n)
+val nr = phil_right (n)
+//
+val ch_lfork = fork_changet (nl)
+val ch_rfork = fork_changet (nr)
+//
+val lf = channel_takeout (ch_lfork)
+val () = println! ("phil_loop(", n, ") picks left fork")
+//
+val () = randsleep (2) // HX: try to actively induce deadlock
+//
+val rf = channel_takeout (ch_rfork)
+val () = println! ("phil_loop(", n, ") picks right fork")
+//
+val () = phil_dine (n, lf, rf)
+//
+val ch_forktray = forktray_changet ()
+val () = channel_insert (ch_forktray, lf)
+val () = channel_insert (ch_forktray, rf)
+//
+in
+  phil_loop (n)
+end // end of [phil_loop]
+
+(* ****** ****** *)
+
+implement
+cleaner_wash (f) =
+{
+val f = fork_get_num (f)
+val () = println! ("cleaner_wash(", f, ") starts")
+val () = randsleep (1)
+val () = println! ("cleaner_wash(", f, ") finishes")
+}
+
+(* ****** ****** *)
+
+implement
+cleaner_return (f) =
+{
+  val n = fork_get_num (f)
+  val ch = fork_changet (n)
+  val () = channel_insert (ch, f)
+}
+
+(* ****** ****** *)
+
+implement
+cleaner_loop () = let
+//
+val ch = forktray_changet ()
+val f0 = channel_takeout (ch)
+//
+val () = cleaner_wash (f0)
+val () = cleaner_return (f0)
+//
+in
+  cleaner_loop ()
+end // end of [cleaner_loop]
+
+(* ****** ****** *)
+
+dynload "DiningPhil2.sats"
+dynload "DiningPhil2_fork.dats"
+dynload "DiningPhil2_thread.dats"
+
+(* ****** ****** *)
+
+local
+//
+staload
+"{$LIBATSHWXI}/teaching/mythread/SATS/mythread.sats"
+//
+in (* in of [local] *)
+//
+val () = mythread_create_cloptr (llam () => phil_loop (0))
+val () = mythread_create_cloptr (llam () => phil_loop (1))
+val () = mythread_create_cloptr (llam () => phil_loop (2))
+val () = mythread_create_cloptr (llam () => phil_loop (3))
+val () = mythread_create_cloptr (llam () => phil_loop (4))
+//
+val () = mythread_create_cloptr (llam () => cleaner_loop ())
+//
+end // end of [local]
+
+(* ****** ****** *)
+
+implement
+main0 () =
+{
+//
+val () = println! ("DiningPhil2: starting")
+val ((*void*)) = while (true) ignoret (sleep(1))
+//
+} (* end of [main0] *)
+
+(* ****** ****** *)
+
+(* end of [DiningPhil2.dats] *)
--- a/samples/ATS/DiningPhil2.sats
+++ b/samples/ATS/DiningPhil2.sats
@@ -0,0 +1,71 @@
+(* ****** ****** *)
+//
+// HX-2013-11
+//
+// Implementing a variant of
+// the problem of Dining Philosophers
+//
+(* ****** ****** *)
+
+#include
+"share/atspre_define.hats"
+
+(* ****** ****** *)
+
+staload "{$LIBATSHWXI}/teaching/mythread/SATS/channel.sats"
+
+(* ****** ****** *)
+
+%{#
+#define NPHIL 5
+%} // end of [%{#]
+#define NPHIL 5
+
+(* ****** ****** *)
+
+typedef nphil = natLt(NPHIL)
+
+(* ****** ****** *)
+
+fun phil_left (n: nphil): nphil
+fun phil_right (n: nphil): nphil
+
+(* ****** ****** *)
+//
+fun phil_loop (n: nphil): void
+//
+(* ****** ****** *)
+
+fun cleaner_loop ((*void*)): void
+
+(* ****** ****** *)
+
+absvtype fork_vtype = ptr
+vtypedef fork = fork_vtype
+
+(* ****** ****** *)
+
+fun fork_get_num (!fork): nphil
+
+(* ****** ****** *)
+
+fun phil_dine
+  (n: nphil, lf: !fork, rf: !fork): void
+// end of [phil_dine]
+
+fun phil_think (n: nphil): void
+
+(* ****** ****** *)
+
+fun cleaner_wash (f: !fork): void
+fun cleaner_return (f: fork): void
+
+(* ****** ****** *)
+//
+fun fork_changet (n: nphil): channel(fork)
+//
+fun forktray_changet ((*void*)): channel(fork)
+//
+(* ****** ****** *)
+
+(* end of [DiningPhil2.sats] *)
--- a/samples/ATS/DiningPhil2_fork.dats
+++ b/samples/ATS/DiningPhil2_fork.dats
@@ -0,0 +1,89 @@
+(* ****** ****** *)
+//
+// HX-2013-11
+//
+// Implementing a variant of
+// the problem of Dining Philosophers
+//
+(* ****** ****** *)
+//
+#include
+"share/atspre_define.hats"
+#include
+"share/atspre_staload.hats"
+//
+(* ****** ****** *)
+
+staload
+UN = "prelude/SATS/unsafe.sats"
+
+(* ****** ****** *)
+
+staload "{$LIBATSHWXI}/teaching/mythread/SATS/channel.sats"
+
+(* ****** ****** *)
+
+staload _ = "libats/DATS/deqarray.dats"
+staload _ = "{$LIBATSHWXI}/teaching/mythread/DATS/channel.dats"
+
+(* ****** ****** *)
+
+staload "./DiningPhil2.sats"
+
+(* ****** ****** *)
+
+datavtype fork = FORK of (nphil)
+
+(* ****** ****** *)
+
+assume fork_vtype = fork
+
+(* ****** ****** *)
+
+implement
+fork_get_num (f) = let val FORK(n) = f in n end
+
+(* ****** ****** *)
+
+local
+
+val
+the_forkarray = let
+//
+typedef t = channel(fork)
+//
+implement
+array_tabulate$fopr<t>
+  (n) = ch where
+{
+  val n = $UN.cast{nphil}(n)
+  val ch = channel_create_exn<fork> (i2sz(2))
+  val () = channel_insert (ch, FORK (n))
+}
+//
+in
+  arrayref_tabulate<t> (i2sz(NPHIL))
+end // end of [val]
+
+in (* in of [local] *)
+
+implement fork_changet (n) = the_forkarray[n]
+
+end // end of [local]
+
+(* ****** ****** *)
+
+local
+
+val the_forktray =
+  channel_create_exn<fork> (i2sz(NPHIL+1))
+
+in (* in of [local] *)
+
+implement forktray_changet () = the_forktray
+
+end // end of [local]
+
+(* ****** ****** *)
+
+(* end of [DiningPhil2_fork.dats] *)
--- a/samples/ATS/DiningPhil2_thread.dats
+++ b/samples/ATS/DiningPhil2_thread.dats
@@ -0,0 +1,43 @@
+(* ****** ****** *)
+//
+// HX-2013-11
+//
+// Implementing a variant of
+// the problem of Dining Philosophers
+//
+(* ****** ****** *)
+//
+#include "share/atspre_define.hats"
+#include "share/atspre_staload.hats"
+//
+(* ****** ****** *)
+
+staload "{$LIBATSHWXI}/teaching/mythread/SATS/mythread.sats"
+
+(* ****** ****** *)
+
+local
+//
+#include "{$LIBATSHWXI}/teaching/mythread/DATS/mythread.dats"
+//
+in (* in of [local] *)
+//
+// HX: it is intentionally left to be empty
+//
+end // end of [local]
+
+(* ****** ****** *)
+
+local
+//
+#include "{$LIBATSHWXI}/teaching/mythread/DATS/mythread_posix.dats"
+//
+in (* in of [local] *)
+//
+// HX: it is intentionally left to be empty
+//
+end // end of [local]
+
+(* ****** ****** *)
+
+(* end of [DiningPhil2_thread.dats] *)
--- a/samples/ATS/YonedaLemma.dats
+++ b/samples/ATS/YonedaLemma.dats
@@ -0,0 +1,178 @@
+(* ****** ****** *)
+//
+// HX-2014-01
+// Yoneda Lemma:
+// The hardest "trivial" theorem :)
+//
+(* ****** ****** *)
+//
+#include
+"share/atspre_staload.hats"
+//
+(* ****** ****** *)
+
+staload
+"libats/ML/SATS/basis.sats"
+staload
+"libats/ML/SATS/list0.sats"
+staload
+"libats/ML/SATS/option0.sats"
+
+(* ****** ****** *)
+
+staload _ = "libats/ML/DATS/list0.dats"
+staload _ = "libats/ML/DATS/option0.dats"
+
+(* ****** ****** *)
+
+sortdef ftype = type -> type
+
+(* ****** ****** *)
+
+infixr (->) ->>
+typedef ->> (a:type, b:type) = a -<cloref1> b
+
+(* ****** ****** *)
+
+typedef
+functor(F:ftype) =
+  {a,b:type} (a ->> b) ->> F(a) ->> F(b)
+
+(* ****** ****** *)
+
+typedef
+list0 (a:type) = list0 (a)
+extern
+val functor_list0 : functor (list0)
+
+(* ****** ****** *)
+
+implement
+functor_list0{a,b}
+  (f) = lam xs => list0_map<a><b> (xs, f)
+
+(* ****** ****** *)
+
+typedef
+option0 (a:type) = option0 (a)  
+extern
+val functor_option0 : functor (option0)
+  
+(* ****** ****** *)
+
+implement
+functor_option0{a,b}
+  (f) = lam opt => option0_map<a><b> (opt, f)
+
+(* ****** ****** *)
+
+extern
+val functor_homres
+  : {c:type} functor (lam(r:type) => c ->> r)
+
+(* ****** ****** *)
+
+implement
+functor_homres{c}{a,b} (f) = lam (r) => lam (x) => f (r(x))
+
+(* ****** ****** *)
+//
+extern
+fun Yoneda_phi : {F:ftype}functor(F) ->
+  {a:type}F(a) ->> ({r:type}(a ->> r) ->> F(r))
+extern
+fun Yoneda_psi : {F:ftype}functor(F) ->
+  {a:type}({r:type}(a ->> r) ->> F(r)) ->> F(a)
+//
+(* ****** ****** *)
+//
+implement
+Yoneda_phi
+  (ftor) = lam(fx) => lam (m) => ftor(m)(fx)
+//
+implement
+Yoneda_psi (ftor) = lam(mf) => mf(lam x => x)
+//
+(* ****** ****** *)
+
+(*
+
+(* ****** ****** *)
+//
+// HX-2014-01-05:
+// Another version based on Natural Transformation
+//
+(* ****** ****** *)
+
+typedef
+natrans(F:ftype, G:ftype) = {x:type} (F(x) ->> G(x))
+
+(* ****** ****** *)
+//
+extern
+fun Yoneda_phi_nat : {F:ftype}functor(F) ->
+  {a:type} F(a) ->> natrans(lam (r:type) => (a ->> r), F)
+extern
+fun Yoneda_psi_nat : {F:ftype}functor(F) ->
+  {a:type} natrans(lam (r:type) => (a ->> r), F) ->> F(a)
+//
+(* ****** ****** *)
+//
+implement
+Yoneda_phi_nat
+  (ftor) = lam(fx) => lam (m) => ftor(m)(fx)
+//
+implement
+Yoneda_psi_nat (ftor) = lam(mf) => mf(lam x => x)
+//
+(* ****** ****** *)
+
+*)
+
+(* ****** ****** *)
+
+datatype bool = True | False // boxed boolean
+
+(* ****** ****** *)
+//
+fun bool2string
+  (x:bool): string =
+(
+  case+ x of True() => "True" | False() => "False"
+)
+//
+implement
+fprint_val<bool> (out, x) = fprint (out, bool2string(x))
+//
+(* ****** ****** *)
+//
+val myboolist0 =
+  $list_t{bool}(True, False, True, False, False)
+val myboolist0 = g0ofg1_list (myboolist0)
+//
+(* ****** ****** *)
+//
+extern
+val Yoneda_bool_list0 : {r:type} (bool ->> r) ->> list0(r)
+//
+implement
+Yoneda_bool_list0 =
+  Yoneda_phi(functor_list0){bool}(myboolist0)
+//
+(* ****** ****** *)
+//
+val myboolist1 =
+  Yoneda_psi(functor_list0){bool}(Yoneda_bool_list0)
+//
+(* ****** ****** *)
+
+val () = fprintln! (stdout_ref, "myboolist0 = ", myboolist0)
+val () = fprintln! (stdout_ref, "myboolist1 = ", myboolist1)
+
+(* ****** ****** *)
+
+implement main0 () = ()
+
+(* ****** ****** *)
+
+(* end of [YonedaLemma.dats] *)
--- a/samples/ATS/linset.hats
+++ b/samples/ATS/linset.hats
@@ -0,0 +1,187 @@
+(***********************************************************************)
+(*                                                                     *)
+(*                         Applied Type System                         *)
+(*                                                                     *)
+(***********************************************************************)
+
+(*
+** ATS/Postiats - Unleashing the Potential of Types!
+** Copyright (C) 2011-2013 Hongwei Xi, ATS Trustful Software, Inc.
+** All rights reserved
+**
+** ATS is free software;  you can  redistribute it and/or modify it under
+** the terms of  the GNU GENERAL PUBLIC LICENSE (GPL) as published by the
+** Free Software Foundation; either version 3, or (at  your  option)  any
+** later version.
+** 
+** ATS is distributed in the hope that it will be useful, but WITHOUT ANY
+** WARRANTY; without  even  the  implied  warranty  of MERCHANTABILITY or
+** FITNESS FOR A PARTICULAR PURPOSE.  See the  GNU General Public License
+** for more details.
+** 
+** You  should  have  received  a  copy of the GNU General Public License
+** along  with  ATS;  see the  file COPYING.  If not, please write to the
+** Free Software Foundation,  51 Franklin Street, Fifth Floor, Boston, MA
+** 02110-1301, USA.
+*)
+
+(* ****** ****** *)
+
+(* Author: Hongwei Xi *)
+(* Authoremail: hwxi AT cs DOT bu DOT edu *)
+(* Start time: December, 2012 *)
+
+(* ****** ****** *)
+//
+// HX: shared by linset_listord (* ordered list *)
+// HX: shared by linset_avltree (* AVL-tree-based *)
+//
+(* ****** ****** *)
+//
+// HX-2013-02:
+// for sets of nonlinear elements
+//
+absvtype set_vtype (a:t@ype+) = ptr
+//
+(* ****** ****** *)
+
+vtypedef set (a:t0p) = set_vtype (a)
+
+(* ****** ****** *)
+
+fun{a:t0p}
+compare_elt_elt (x1: a, x2: a):<> int
+
+(* ****** ****** *)
+
+fun{} linset_nil{a:t0p} ():<> set(a)
+fun{} linset_make_nil{a:t0p} ():<> set(a)
+
+(* ****** ****** *)
+
+fun{a:t0p} linset_sing (x: a):<!wrt> set(a)
+fun{a:t0p} linset_make_sing (x: a):<!wrt> set(a)
+
+(* ****** ****** *)
+
+fun{a:t0p}
+linset_make_list (xs: List(INV(a))):<!wrt> set(a)
+
+(* ****** ****** *)
+
+fun{}
+linset_is_nil {a:t0p} (xs: !set(INV(a))):<> bool
+fun{}
+linset_isnot_nil {a:t0p} (xs: !set(INV(a))):<> bool
+
+(* ****** ****** *)
+
+fun{a:t0p} linset_size (!set(INV(a))): size_t
+
+(* ****** ****** *)
+
+fun{a:t0p}
+linset_is_member (xs: !set(INV(a)), x0: a):<> bool
+fun{a:t0p}
+linset_isnot_member (xs: !set(INV(a)), x0: a):<> bool
+
+(* ****** ****** *)
+
+fun{a:t0p}
+linset_copy (!set(INV(a))):<!wrt> set(a)
+fun{a:t0p}
+linset_free (xs: set(INV(a))):<!wrt> void
+
+(* ****** ****** *)
+//
+fun{a:t0p}
+linset_insert
+  (xs: &set(INV(a)) >> _, x0: a):<!wrt> bool
+//
+(* ****** ****** *)
+//
+fun{a:t0p}
+linset_takeout
+(
+  &set(INV(a)) >> _, a, res: &(a?) >> opt(a, b)
+) :<!wrt> #[b:bool] bool(b) // endfun
+fun{a:t0p}
+linset_takeout_opt (&set(INV(a)) >> _, a):<!wrt> Option_vt(a)
+//
+(* ****** ****** *)
+//
+fun{a:t0p}
+linset_remove
+  (xs: &set(INV(a)) >> _, x0: a):<!wrt> bool
+//
+(* ****** ****** *)
+//
+// HX: choosing an element in an unspecified manner
+//
+fun{a:t0p}
+linset_choose
+(
+  xs: !set(INV(a)), x: &a? >> opt (a, b)
+) :<!wrt> #[b:bool] bool(b)
+//
+fun{a:t0p}
+linset_choose_opt (xs: !set(INV(a))):<!wrt> Option_vt(a)
+//
+(* ****** ****** *)
+
+fun{a:t0p}
+linset_takeoutmax
+(
+  xs: &set(INV(a)) >> _, res: &a? >> opt(a, b)
+) :<!wrt> #[b:bool] bool (b)
+fun{a:t0p}
+linset_takeoutmax_opt (xs: &set(INV(a)) >> _):<!wrt> Option_vt(a)
+
+(* ****** ****** *)
+
+fun{a:t0p}
+linset_takeoutmin
+(
+  xs: &set(INV(a)) >> _, res: &a? >> opt(a, b)
+) :<!wrt> #[b:bool] bool (b)
+fun{a:t0p}
+linset_takeoutmin_opt (xs: &set(INV(a)) >> _):<!wrt> Option_vt(a)
+
+(* ****** ****** *)
+//
+fun{}
+fprint_linset$sep (FILEref): void // ", "
+//
+fun{a:t0p}
+fprint_linset (out: FILEref, xs: !set(INV(a))): void
+//
+overload fprint with fprint_linset
+//
+(* ****** ****** *)
+//
+fun{
+a:t0p}{env:vt0p
+} linset_foreach$fwork
+  (x: a, env: &(env) >> _): void
+//
+fun{a:t0p}
+linset_foreach (set: !set(INV(a))): void
+fun{
+a:t0p}{env:vt0p
+} linset_foreach_env
+  (set: !set(INV(a)), env: &(env) >> _): void
+// end of [linset_foreach_env]
+//
+(* ****** ****** *)
+
+fun{a:t0p}
+linset_listize (xs: set(INV(a))): List0_vt (a)
+
+(* ****** ****** *)
+
+fun{a:t0p}
+linset_listize1 (xs: !set(INV(a))): List0_vt (a)
+
+(* ****** ****** *)
+
+(* end of [linset.hats] *)
--- a/samples/ATS/linset_listord.dats
+++ b/samples/ATS/linset_listord.dats
@@ -0,0 +1,504 @@
+(***********************************************************************)
+(*                                                                     *)
+(*                         Applied Type System                         *)
+(*                                                                     *)
+(***********************************************************************)
+
+(*
+** ATS/Postiats - Unleashing the Potential of Types!
+** Copyright (C) 2011-2013 Hongwei Xi, ATS Trustful Software, Inc.
+** All rights reserved
+**
+** ATS is free software;  you can  redistribute it and/or modify it under
+** the terms of  the GNU GENERAL PUBLIC LICENSE (GPL) as published by the
+** Free Software Foundation; either version 3, or (at  your  option)  any
+** later version.
+** 
+** ATS is distributed in the hope that it will be useful, but WITHOUT ANY
+** WARRANTY; without  even  the  implied  warranty  of MERCHANTABILITY or
+** FITNESS FOR A PARTICULAR PURPOSE.  See the  GNU General Public License
+** for more details.
+** 
+** You  should  have  received  a  copy of the GNU General Public License
+** along  with  ATS;  see the  file COPYING.  If not, please write to the
+** Free Software Foundation,  51 Franklin Street, Fifth Floor, Boston, MA
+** 02110-1301, USA.
+*)
+
+(* ****** ****** *)
+
+(* Author: Hongwei Xi *)
+(* Authoremail: hwxi AT cs DOT bu DOT edu *)
+(* Start time: February, 2013 *)
+
+(* ****** ****** *)
+//
+// HX-2013-08:
+// a set is represented as a sorted list in descending order;
+// note that descending order is chosen to faciliate set comparison
+//
+(* ****** ****** *)
+
+staload
+UN = "prelude/SATS/unsafe.sats"
+
+(* ****** ****** *)
+
+staload "libats/SATS/linset_listord.sats"
+
+(* ****** ****** *)
+
+#include "./SHARE/linset.hats" // code reuse
+#include "./SHARE/linset_node.hats" // code reuse
+
+(* ****** ****** *)
+
+assume
+set_vtype (elt:t@ype) = List0_vt (elt)
+
+(* ****** ****** *)
+
+implement{}
+linset_nil () = list_vt_nil ()
+implement{}
+linset_make_nil () = list_vt_nil ()
+
+(* ****** ****** *)
+
+implement
+{a}(*tmp*)
+linset_sing
+  (x) = list_vt_cons{a}(x, list_vt_nil)
+// end of [linset_sing]
+implement{a}
+linset_make_sing
+  (x) = list_vt_cons{a}(x, list_vt_nil)
+// end of [linset_make_sing]
+
+(* ****** ****** *)
+
+implement{}
+linset_is_nil (xs) = list_vt_is_nil (xs)
+implement{}
+linset_isnot_nil (xs) = list_vt_is_cons (xs)
+
+(* ****** ****** *)
+
+implement{a}
+linset_size (xs) =
+  let val n = list_vt_length(xs) in i2sz(n) end
+// end of [linset_size]
+
+(* ****** ****** *)
+
+implement{a}
+linset_is_member
+  (xs, x0) = let
+//
+fun aux
+  {n:nat} .<n>.
+(
+  xs: !list_vt (a, n)
+) :<> bool = let
+in
+//
+case+ xs of
+| list_vt_cons (x, xs) => let
+    val sgn = compare_elt_elt<a> (x0, x) in
+    if sgn > 0 then false else (if sgn < 0 then aux (xs) else true)
+  end // end of [list_vt_cons]
+| list_vt_nil ((*void*)) => false
+//
+end // end of [aux]
+//
+in
+  aux (xs)
+end // end of [linset_is_member]
+
+(* ****** ****** *)
+
+implement{a}
+linset_copy (xs) = list_vt_copy<a> (xs)
+implement{a}
+linset_free (xs) = list_vt_free<a> (xs)
+
+(* ****** ****** *)
+
+implement{a}
+linset_insert
+  (xs, x0) = let
+//
+fun
+mynode_cons
+  {n:nat} .<>.
+(
+  nx: mynode1 (a), xs: list_vt (a, n)
+) : list_vt (a, n+1) = let
+//
+val xs1 =
+$UN.castvwtp0{List1_vt(a)}(nx)
+val+@list_vt_cons (_, xs2) = xs1
+prval () = $UN.cast2void (xs2); val () = (xs2 := xs)
+//
+in
+  fold@ (xs1); xs1
+end // end of [mynode_cons]
+//
+fun ins
+  {n:nat} .<n>. // tail-recursive
+(
+  xs: &list_vt (a, n) >> list_vt (a, n1)
+) : #[n1:nat | n <= n1; n1 <= n+1] bool =
+(
+case+ xs of
+| @list_vt_cons
+    (x, xs1) => let
+    val sgn =
+      compare_elt_elt<a> (x0, x)
+    // end of [val]
+  in
+    if sgn > 0 then let
+      prval () = fold@ (xs)
+      val nx = mynode_make_elt<a> (x0)
+      val ((*void*)) = xs := mynode_cons (nx, xs)
+    in
+      false
+    end else if sgn < 0 then let
+      val ans = ins (xs1)
+      prval () = fold@ (xs)
+    in
+      ans
+    end else let // [x0] is found
+      prval () = fold@ (xs)
+    in
+      true (* [x0] in [xs] *)
+    end (* end of [if] *)
+  end // end of [list_vt_cons]
+| list_vt_nil () => let
+    val nx = mynode_make_elt<a> (x0)
+    val ((*void*)) = xs := mynode_cons (nx, xs)
+  in
+    false
+  end // end of [list_vt_nil]
+) (* end of [ins] *)
+//
+in
+  $effmask_all (ins (xs))
+end // end of [linset_insert]
+
+(* ****** ****** *)
+
+(*
+//
+HX-2013-08:
+[linset_remove] moved up
+//
+implement{a}
+linset_remove
+  (xs, x0) = let
+//
+fun rem
+  {n:nat} .<n>. // tail-recursive
+(
+  xs: &list_vt (a, n) >> list_vt (a, n1)
+) : #[n1:nat | n1 <= n; n <= n1+1] bool =
+(
+case+ xs of
+| @list_vt_cons
+    (x, xs1) => let
+    val sgn =
+      compare_elt_elt<a> (x0, x)
+    // end of [val]
+  in
+    if sgn > 0 then let
+      prval () = fold@ (xs)
+    in
+      false
+    end else if sgn < 0 then let
+      val ans = rem (xs1)
+      prval () = fold@ (xs)
+    in
+      ans
+    end else let // x0 = x
+      val xs1_ = xs1
+      val ((*void*)) = free@{a}{0}(xs)
+      val () = xs := xs1_
+    in
+      true // [x0] in [xs]
+    end (* end of [if] *)
+  end // end of [list_vt_cons]
+| list_vt_nil () => false
+) (* end of [rem] *)
+//
+in
+  $effmask_all (rem (xs))
+end // end of [linset_remove]
+*)
+
+(* ****** ****** *)
+(*
+** By Brandon Barker
+*)
+implement
+{a}(*tmp*)
+linset_choose
+  (xs, x0) = let
+in
+//
+case+ xs of
+| list_vt_cons
+    (x, xs1) => let
+    val () = x0 := x
+    prval () = opt_some{a}(x0)
+  in
+    true
+  end // end of [list_vt_cons]
+| list_vt_nil () => let
+    prval () = opt_none{a}(x0)
+  in
+    false
+  end // end of [list_vt_nil]
+//
+end // end of [linset_choose]
+
+(* ****** ****** *)
+
+implement
+{a}{env}
+linset_foreach_env (xs, env) = let
+//
+implement
+list_vt_foreach$fwork<a><env>
+  (x, env) = linset_foreach$fwork<a><env> (x, env)
+//
+in
+  list_vt_foreach_env<a><env> (xs, env)
+end // end of [linset_foreach_env]
+
+(* ****** ****** *)
+
+implement{a}
+linset_listize (xs) = xs
+
+(* ****** ****** *)
+
+implement{a}
+linset_listize1 (xs) = list_vt_copy (xs)
+
+(* ****** ****** *)
+//
+// HX: functions for processing mynodes
+//
+(* ****** ****** *)
+
+implement{
+} mynode_null{a} () =
+  $UN.castvwtp0{mynode(a,null)}(the_null_ptr)
+// end of [mynode_null]
+
+(* ****** ****** *)
+
+implement
+{a}(*tmp*)
+mynode_make_elt
+  (x) = let
+//
+val nx = list_vt_cons{a}{0}(x, _ )
+//
+in
+  $UN.castvwtp0{mynode1(a)}(nx)
+end // end of [mynode_make_elt]
+
+(* ****** ****** *)
+
+implement{
+} mynode_free
+  {a}(nx) = () where {
+val nx =
+  $UN.castvwtp0{List1_vt(a)}(nx)
+//
+val+~list_vt_cons (_, nx2) = nx
+//
+prval ((*void*)) = $UN.cast2void (nx2)
+//
+} (* end of [mynode_free] *)
+
+(* ****** ****** *)
+
+implement
+{a}(*tmp*)
+mynode_get_elt
+  (nx) = (x) where {
+//
+val nx1 =
+  $UN.castvwtp1{List1_vt(a)}(nx)
+//
+val+list_vt_cons (x, _) = nx1
+//
+prval ((*void*)) = $UN.cast2void (nx1)
+//
+} (* end of [mynode_get_elt] *)
+
+(* ****** ****** *)
+
+implement
+{a}(*tmp*)
+mynode_set_elt
+  {l} (nx, x0) =
+{
+//
+val nx1 =
+  $UN.castvwtp1{List1_vt(a)}(nx)
+//
+val+@list_vt_cons (x, _) = nx1
+//
+val () = x := x0
+//
+prval () = fold@ (nx1)
+prval () = $UN.cast2void (nx1)
+//
+prval () = __assert (nx) where
+{
+  extern praxi __assert (nx: !mynode(a?, l) >> mynode (a, l)): void
+} (* end of [prval] *)
+//
+} (* end of [mynode_set_elt] *)
+
+(* ****** ****** *)
+
+implement
+{a}(*tmp*)
+mynode_getfree_elt
+  (nx) = (x) where {
+//
+val nx =
+  $UN.castvwtp0{List1_vt(a)}(nx)
+//
+val+~list_vt_cons (x, nx2) = nx
+//
+prval ((*void*)) = $UN.cast2void (nx2)
+//
+} (* end of [mynode_getfree_elt] *)
+
+(* ****** ****** *)
+
+(*
+fun{a:t0p}
+linset_takeout_ngc
+  (set: &set(INV(a)) >> _, x0: a):<!wrt> mynode0 (a)
+// end of [linset_takeout_ngc]
+*)
+implement
+{a}(*tmp*)
+linset_takeout_ngc
+  (set, x0) = let
+//
+fun takeout
+(
+  xs: &List0_vt (a) >> _
+) : mynode0(a) = let
+in
+//
+case+ xs of
+| @list_vt_cons
+    (x, xs1) => let
+    prval pf_x = view@x
+    prval pf_xs1 = view@xs1
+    val sgn =
+      compare_elt_elt<a> (x0, x)
+    // end of [val]
+  in
+    if sgn > 0 then let
+      prval () = fold@ (xs)
+    in
+      mynode_null{a}((*void*))
+    end else if sgn < 0 then let
+      val res = takeout (xs1)
+      prval ((*void*)) = fold@ (xs)
+    in
+      res
+    end else let // x0 = x
+      val xs1_ = xs1
+      val res = $UN.castvwtp0{mynode1(a)}((pf_x, pf_xs1 | xs))
+      val () = xs := xs1_
+    in
+      res // [x0] in [xs]
+    end (* end of [if] *)
+  end // end of [list_vt_cons]
+| list_vt_nil () => mynode_null{a}((*void*))
+//
+end (* end of [takeout] *)
+//
+in
+  $effmask_all (takeout (set))
+end // end of [linset_takeout_ngc]
+
+(* ****** ****** *)
+
+implement
+{a}(*tmp*)
+linset_takeoutmax_ngc
+  (xs) = let
+in
+//
+case+ xs of
+| @list_vt_cons
+    (x, xs1) => let
+    prval pf_x = view@x
+    prval pf_xs1 = view@xs1
+    val xs_ = xs
+    val () = xs := xs1
+  in
+    $UN.castvwtp0{mynode1(a)}((pf_x, pf_xs1 | xs_))
+  end // end of [list_vt_cons]
+| @list_vt_nil () => let
+    prval () = fold@ (xs)
+  in
+    mynode_null{a}((*void*))
+  end // end of [list_vt_nil]
+//
+end // end of [linset_takeoutmax_ngc]
+
+(* ****** ****** *)
+
+implement
+{a}(*tmp*)
+linset_takeoutmin_ngc
+  (xs) = let
+//
+fun unsnoc
+  {n:pos} .<n>.
+(
+  xs: &list_vt (a, n) >> list_vt (a, n-1)
+) :<!wrt> mynode1 (a) = let
+//
+val+@list_vt_cons (x, xs1) = xs
+//
+prval pf_x = view@x and pf_xs1 = view@xs1
+//
+in
+//
+case+ xs1 of
+| list_vt_cons _ =>
+    let val res = unsnoc(xs1) in fold@xs; res end
+  // end of [list_vt_cons]
+| list_vt_nil () => let
+    val xs_ = xs
+    val () = xs := list_vt_nil{a}()
+  in
+    $UN.castvwtp0{mynode1(a)}((pf_x, pf_xs1 | xs_))
+  end // end of [list_vt_nil]
+//
+end // end of [unsnoc]
+//
+in
+//
+case+ xs of
+| list_vt_cons _ => unsnoc (xs)
+| list_vt_nil () => mynode_null{a}((*void*))
+//
+end // end of [linset_takeoutmin_ngc]
+
+(* ****** ****** *)
+
+(* end of [linset_listord.dats] *)
--- a/samples/ATS/linset_listord.sats
+++ b/samples/ATS/linset_listord.sats
@@ -0,0 +1,51 @@
+(***********************************************************************)
+(*                                                                     *)
+(*                         Applied Type System                         *)
+(*                                                                     *)
+(***********************************************************************)
+
+(*
+** ATS/Postiats - Unleashing the Potential of Types!
+** Copyright (C) 2011-2013 Hongwei Xi, ATS Trustful Software, Inc.
+** All rights reserved
+**
+** ATS is free software;  you can  redistribute it and/or modify it under
+** the terms of  the GNU GENERAL PUBLIC LICENSE (GPL) as published by the
+** Free Software Foundation; either version 3, or (at  your  option)  any
+** later version.
+** 
+** ATS is distributed in the hope that it will be useful, but WITHOUT ANY
+** WARRANTY; without  even  the  implied  warranty  of MERCHANTABILITY or
+** FITNESS FOR A PARTICULAR PURPOSE.  See the  GNU General Public License
+** for more details.
+** 
+** You  should  have  received  a  copy of the GNU General Public License
+** along  with  ATS;  see the  file COPYING.  If not, please write to the
+** Free Software Foundation,  51 Franklin Street, Fifth Floor, Boston, MA
+** 02110-1301, USA.
+*)
+
+(* ****** ****** *)
+//
+// Author: Hongwei Xi
+// Authoremail: hwxiATcsDOTbuDOTedu
+// Time: October, 2010
+//
+(* ****** ****** *)
+
+#define ATS_PACKNAME "ATSLIB.libats.linset_listord"
+#define ATS_STALOADFLAG 0 // no static loading at run-time
+
+(* ****** ****** *)
+
+#include "./SHARE/linset.hats"
+#include "./SHARE/linset_node.hats"
+
+(* ****** ****** *)
+
+castfn
+linset2list {a:t0p} (xs: set (INV(a))):<> List0_vt (a)
+
+(* ****** ****** *)
+
+(* end of [linset_listord.sats] *)
--- a/samples/Agda/NatCat.agda
+++ b/samples/Agda/NatCat.agda
@@ -0,0 +1,39 @@
+module NatCat where
+
+open import Relation.Binary.PropositionalEquality
+
+-- If you can show that a relation only ever has one inhabitant
+-- you get the category laws for free
+module
+  EasyCategory
+  (obj : Set)
+  (_⟶_ : obj → obj → Set)
+  (_∘_ : ∀ {x y z} → x ⟶ y → y ⟶ z → x ⟶ z)
+  (id : ∀ x → x ⟶ x)
+  (single-inhabitant : (x y : obj) (r s : x ⟶ y) → r ≡ s)
+  where
+
+  idʳ : ∀ x y (r : x ⟶ y) → r ∘ id y ≡ r
+  idʳ x y r = single-inhabitant x y (r ∘ id y) r 
+
+  idˡ : ∀ x y (r : x ⟶ y) → id x ∘ r ≡ r
+  idˡ x y r = single-inhabitant x y (id x ∘ r) r
+
+  ∘-assoc : ∀ w x y z (r : w ⟶ x) (s : x ⟶ y) (t : y ⟶ z) → (r ∘ s) ∘ t ≡ r ∘ (s ∘ t)
+  ∘-assoc w x y z r s t = single-inhabitant w z ((r ∘ s) ∘ t) (r ∘ (s ∘ t))
+
+open import Data.Nat
+
+same : (x y : ℕ) (r s : x ≤ y) → r ≡ s
+same .0 y z≤n z≤n = refl
+same .(suc m) .(suc n) (s≤s {m} {n} r) (s≤s s) = cong s≤s (same m n r s)
+
+≤-trans : ∀ x y z → x ≤ y → y ≤ z → x ≤ z
+≤-trans .0 y z z≤n s = z≤n
+≤-trans .(suc m) .(suc n) .(suc n₁) (s≤s {m} {n} r) (s≤s {.n} {n₁} s) = s≤s (≤-trans m n n₁ r s)
+
+≤-refl : ∀ x → x ≤ x
+≤-refl zero = z≤n
+≤-refl (suc x) = s≤s (≤-refl x)
+
+module Nat-EasyCategory = EasyCategory ℕ _≤_ (λ {x}{y}{z} → ≤-trans x y z) ≤-refl same
--- a/samples/Alloy/file_system.als
+++ b/samples/Alloy/file_system.als
@@ -0,0 +1,59 @@
+module examples/systems/file_system
+
+/*
+ * Model of a generic file system.
+ */
+
+abstract sig Object {}
+
+sig Name {}
+
+sig File extends Object {} { some d: Dir | this in d.entries.contents }
+
+sig Dir extends Object {
+  entries: set DirEntry,
+  parent: lone Dir
+} {
+  parent = this.~@contents.~@entries
+  all e1, e2 : entries | e1.name = e2.name => e1 = e2
+  this !in this.^@parent
+  this != Root => Root in this.^@parent
+}
+
+one sig Root extends Dir {} { no parent }
+
+lone sig Cur extends Dir {}
+
+sig DirEntry {
+  name: Name,
+  contents: Object
+} {
+  one this.~entries
+}
+
+
+/**
+ * all directories besides root have one parent
+ */
+pred OneParent_buggyVersion {
+    all d: Dir - Root | one d.parent
+}
+
+/**
+ * all directories besides root have one parent
+ */
+pred OneParent_correctVersion {
+    all d: Dir - Root | (one d.parent && one contents.d)
+}
+
+/**
+ * Only files may be linked (that is, have more than one entry)
+ * That is, all directories are the contents of at most one directory entry
+ */
+pred NoDirAliases {
+    all o: Dir | lone o.~contents
+}
+
+check { OneParent_buggyVersion => NoDirAliases } for 5 expect 1
+
+check { OneParent_correctVersion => NoDirAliases } for 5 expect 0
--- a/samples/Alloy/marksweepgc.als
+++ b/samples/Alloy/marksweepgc.als
@@ -0,0 +1,83 @@
+module examples/systems/marksweepgc
+
+/*
+ * Model of mark and sweep garbage collection.
+ */
+
+// a node in the heap
+sig Node {}
+
+sig HeapState {
+  left, right : Node -> lone Node,
+  marked : set Node,
+  freeList : lone Node
+}
+
+pred clearMarks[hs, hs' : HeapState] {
+  // clear marked set
+  no hs'.marked
+  // left and right fields are unchanged
+  hs'.left = hs.left
+  hs'.right = hs.right
+}
+
+/**
+ * simulate the recursion of the mark() function using transitive closure
+ */
+fun reachable[hs: HeapState, n: Node] : set Node {
+  n + n.^(hs.left + hs.right)
+}
+
+pred mark[hs: HeapState, from : Node, hs': HeapState] {
+  hs'.marked = hs.reachable[from]
+  hs'.left = hs.left
+  hs'.right = hs.right
+}
+
+/**
+ * complete hack to simulate behavior of code to set freeList
+ */
+pred setFreeList[hs, hs': HeapState] {
+  // especially hackish
+  hs'.freeList.*(hs'.left) in (Node - hs.marked)
+  all n: Node |
+    (n !in hs.marked) => {
+      no hs'.right[n]
+      hs'.left[n] in (hs'.freeList.*(hs'.left))
+      n in hs'.freeList.*(hs'.left)
+    } else {
+      hs'.left[n] = hs.left[n]
+      hs'.right[n] = hs.right[n]
+    }
+  hs'.marked = hs.marked
+}
+
+pred GC[hs: HeapState, root : Node, hs': HeapState] {
+  some hs1, hs2: HeapState |
+    hs.clearMarks[hs1] && hs1.mark[root, hs2] && hs2.setFreeList[hs']
+}
+
+assert Soundness1 {
+  all h, h' : HeapState, root : Node |
+    h.GC[root, h'] =>
+      (all live : h.reachable[root] | {
+        h'.left[live] = h.left[live]
+        h'.right[live] = h.right[live]
+      })
+}
+
+assert Soundness2 {
+  all h, h' : HeapState, root : Node |
+    h.GC[root, h'] =>
+      no h'.reachable[root] & h'.reachable[h'.freeList]
+}
+
+assert Completeness {
+  all h, h' : HeapState, root : Node |
+    h.GC[root, h'] =>
+      (Node - h'.reachable[root]) in h'.reachable[h'.freeList]
+}
+
+check Soundness1 for 3 expect 0
+check Soundness2 for 3 expect 0
+check Completeness for 3 expect 0
--- a/samples/Alloy/views.als
+++ b/samples/Alloy/views.als
@@ -0,0 +1,217 @@
+module examples/systems/views
+
+/*
+ * Model of views in object-oriented programming.
+ *
+ * Two object references, called the view and the backing,
+ * are related by a view mechanism when changes to the
+ * backing are automatically propagated to the view. Note
+ * that the state of a view need not be a projection of the
+ * state of the backing; the keySet method of Map, for
+ * example, produces two view relationships, and for the
+ * one in which the map is modified by changes to the key
+ * set, the value of the new map cannot be determined from
+ * the key set. Note that in the iterator view mechanism,
+ * the iterator is by this definition the backing object,
+ * since changes are propagated from iterator to collection
+ * and not vice versa. Oddly, a reference may be a view of
+ * more than one backing: there can be two iterators on the
+ * same collection, eg. A reference cannot be a view under
+ * more than one view type.
+ *
+ * A reference is made dirty when it is a backing for a view
+ * with which it is no longer related by the view invariant.
+ * This usually happens when a view is modified, either
+ * directly or via another backing. For example, changing a
+ * collection directly when it has an iterator invalidates
+ * it, as does changing the collection through one iterator
+ * when there are others.
+ *
+ * More work is needed if we want to model more closely the
+ * failure of an iterator when its collection is invalidated.
+ *
+ * As a terminological convention, when there are two
+ * complementary view relationships, we will give them types
+ * t and t'. For example, KeySetView propagates from map to
+ * set, and KeySetView' propagates from set to map.
+ *
+ * author: Daniel Jackson
+ */
+
+open util/ordering[State] as so
+open util/relation as rel
+
+sig Ref {}
+sig Object {}
+
+-- t->b->v in views when v is view of type t of backing b
+-- dirty contains refs that have been invalidated
+sig State {
+  refs: set Ref,
+  obj: refs -> one Object,
+  views: ViewType -> refs -> refs,
+  dirty: set refs
+--  , anyviews: Ref -> Ref -- for visualization
+  }
+-- {anyviews = ViewType.views}
+
+sig Map extends Object {
+  keys: set Ref,
+  map: keys -> one Ref
+  }{all s: State |  keys + Ref.map in s.refs}
+sig MapRef extends Ref {}
+fact {State.obj[MapRef] in Map}
+
+sig Iterator extends Object {
+  left, done: set Ref,
+  lastRef: lone done
+  }{all s: State | done + left + lastRef in s.refs}
+sig IteratorRef extends Ref {}
+fact {State.obj[IteratorRef] in Iterator}
+
+sig Set extends Object {
+  elts: set Ref
+  }{all s: State | elts in s.refs}
+sig SetRef extends Ref {}
+fact {State.obj[SetRef] in Set}
+
+abstract sig ViewType {}
+one sig KeySetView, KeySetView', IteratorView extends ViewType {}
+fact ViewTypes {
+  State.views[KeySetView] in MapRef -> SetRef
+  State.views[KeySetView'] in SetRef -> MapRef
+  State.views[IteratorView] in IteratorRef -> SetRef
+  all s: State | s.views[KeySetView] = ~(s.views[KeySetView'])
+  }
+
+/**
+ * mods is refs modified directly or by view mechanism
+ * doesn't handle possibility of modifying an object and its view at once?
+ * should we limit frame conds to non-dirty refs?
+ */
+pred modifies [pre, post: State, rs: set Ref] {
+  let vr = pre.views[ViewType], mods = rs.*vr {
+    all r: pre.refs - mods | pre.obj[r] = post.obj[r]
+    all b: mods, v: pre.refs, t: ViewType |
+      b->v in pre.views[t] => viewFrame [t, pre.obj[v], post.obj[v], post.obj[b]]
+    post.dirty = pre.dirty +
+      {b: pre.refs | some v: Ref, t: ViewType |
+          b->v in pre.views[t] && !viewFrame [t, pre.obj[v], post.obj[v], post.obj[b]]
+      }
+    }
+  }
+
+pred allocates [pre, post: State, rs: set Ref] {
+  no rs & pre.refs
+  post.refs = pre.refs + rs
+  }
+
+/** 
+ * models frame condition that limits change to view object from v to v' when backing object changes to b'
+ */
+pred viewFrame [t: ViewType, v, v', b': Object] {
+  t in KeySetView => v'.elts = dom [b'.map]
+  t in KeySetView' => b'.elts = dom [v'.map]
+  t in KeySetView' => (b'.elts) <: (v.map) = (b'.elts) <: (v'.map)
+  t in IteratorView => v'.elts = b'.left + b'.done
+  }
+
+pred MapRef.keySet [pre, post: State, setRefs: SetRef] {
+  post.obj[setRefs].elts = dom [pre.obj[this].map]
+  modifies [pre, post, none]
+  allocates [pre, post, setRefs]
+  post.views = pre.views + KeySetView->this->setRefs + KeySetView'->setRefs->this
+  }
+
+pred MapRef.put [pre, post: State, k, v: Ref] {
+  post.obj[this].map = pre.obj[this].map ++ k->v
+  modifies [pre, post, this]
+  allocates [pre, post, none]
+  post.views = pre.views
+  }
+
+pred SetRef.iterator [pre, post: State, iterRef: IteratorRef] {
+  let i = post.obj[iterRef] {
+    i.left = pre.obj[this].elts
+    no i.done + i.lastRef
+    }
+  modifies [pre,post,none]
+  allocates [pre, post, iterRef]
+  post.views = pre.views + IteratorView->iterRef->this
+  }
+
+pred IteratorRef.remove [pre, post: State] {
+  let i = pre.obj[this], i' = post.obj[this] {
+    i'.left = i.left
+    i'.done = i.done - i.lastRef
+    no i'.lastRef
+    }
+  modifies [pre,post,this]
+  allocates [pre, post, none]
+  pre.views = post.views
+  }
+
+pred IteratorRef.next [pre, post: State, ref: Ref] {
+  let i = pre.obj[this], i' = post.obj[this] {
+    ref in i.left
+    i'.left = i.left - ref
+    i'.done = i.done + ref
+    i'.lastRef = ref
+    }
+  modifies [pre, post, this]
+  allocates [pre, post, none]
+  pre.views = post.views
+  }
+
+pred IteratorRef.hasNext [s: State] {
+  some s.obj[this].left
+  }
+
+assert zippishOK {
+  all
+    ks, vs: SetRef,
+    m: MapRef,
+    ki, vi: IteratorRef,
+    k, v: Ref |
+    let s0=so/first,
+    s1=so/next[s0],
+    s2=so/next[s1],
+    s3=so/next[s2],
+    s4=so/next[s3],
+    s5=so/next[s4],
+    s6=so/next[s5],
+    s7=so/next[s6] |
+  ({
+    precondition [s0, ks, vs, m]
+    no s0.dirty
+    ks.iterator [s0, s1, ki]
+    vs.iterator [s1, s2, vi]
+    ki.hasNext [s2]
+    vi.hasNext [s2]
+    ki.this/next [s2, s3, k]
+    vi.this/next [s3, s4, v]
+    m.put [s4, s5, k, v]
+    ki.remove [s5, s6]
+    vi.remove [s6, s7]
+  } => no State.dirty)
+  }
+
+pred precondition [pre: State, ks, vs, m: Ref] {
+  // all these conditions and other errors discovered in scope of 6 but 8,3
+  // in initial state, must have view invariants hold
+  (all t: ViewType, b, v: pre.refs |
+    b->v in pre.views[t] => viewFrame [t, pre.obj[v], pre.obj[v], pre.obj[b]])
+  // sets are not aliases
+--  ks != vs
+  // sets are not views of map
+--  no (ks+vs)->m & ViewType.pre.views
+  // no iterator currently on either set
+--  no Ref->(ks+vs) & ViewType.pre.views
+  }
+
+check zippishOK for 6 but 8 State, 3 ViewType expect 1
+
+/** 
+ * experiment with controlling heap size
+ */
+fact {all s: State | #s.obj < 5}
--- a/System/filenames/ant.xml
+++ b/System/filenames/ant.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<project name="WebBuild">
+
+    <!-- generate timestamps -->
+    <tstamp />
+
+    <!-- Debugging Macro -->
+    <import file="echopath.xml" />
+
+    <!-- JS build files macro -->
+    <import file="rhinoscript.xml" />
+
+    <!-- Component Build Files -->
+    <import file="setup.xml" />
+    <import file="clean.xml" />
+    <import file="copy.xml" />
+    <import file="file.transform.xml" />
+    <import file="external.tools.xml" />
+    <import file="rename.xml" />
+    <import file="js.xml" />
+    <import file="css.xml" />
+    <import file="img.xml" />
+    <import file="png8.xml" />
+    <import file="yui.xml" />
+    <import file="cdn.xml" />
+    <import file="datauri.xml" />
+    <import file="devlive.xml" />
+
+    <!-- This dirname is the only complete path we know for sure, everything builds off of it -->
+    <dirname property="dir.build" file="${ant.file.WebBuild}" />
+
+    <!-- get name for newly built folder -->
+    <basename property="app.name"       file="${basedir}" />
+
+    <!-- read global properties file -->
+    <property file="${dir.build}\build.properties" />
+
+    <!-- Build Directories -->
+    <property name="dir.build.js"   location="${dir.build}/js" />
+
+    <!-- App Directories -->
+    <property name="dir.app"        location="${dir.result}/${app.name}" />
+    <property name="dir.app.temp"   location="${dir.temp}/${app.name}" />
+    <property name="dir.app.files"  location="${dir.app.temp}/${dir.files}" />
+
+    <!-- Files -->
+    <property name="mapping.js"     location="${dir.app.temp}/${mapping.file.js}" />
+    <property name="mapping.css"    location="${dir.app.temp}/${mapping.file.css}" />
+    <property name="mapping.img"    location="${dir.app.temp}/${mapping.file.img}" />
+    <property name="mapping.swf"    location="${dir.app.temp}/${mapping.file.swf}" />
+    <property name="mapping.fonts"  location="${dir.app.temp}/${mapping.file.fonts}" />
+
+    <!-- Tool Directories -->
+    <property name="dir.bin"    location="${dir.build}/Bin" />
+    <property name="dir.jar"    location="${dir.bin}/jar" />
+
+    <!-- Tool Files -->
+	<property name="tools.compressor"     location="${dir.jar}/${tools.file.compressor}" />
+	<property name="tools.cssembed"       location="${dir.jar}/${tools.file.cssembed}" />
+    <property name="tools.filetransform"  location="${dir.jar}/${tools.file.filetransform}" />
+    <property name="tools.optipng"        location="${dir.bin}/${tools.file.optipng}" />
+    <property name="tools.jpegtran"       location="${dir.bin}/${tools.file.jpegtran}" />
+
+
+    <!-- BUILD TARGETS -->
+
+    <!-- low level utility build targets -->
+
+    <!-- Build the tools -->
+    <target name="-setup.build.tools"
+            depends="-define.filetransform, -define.cssembed, -define.yuicompressor, -define.jsclasspath"
+    />
+
+    <!-- set up filesystem properties -->
+    <target
+        name="-setup"
+        depends="-setup.mode, -setup.conditions, -setup.js, -setup.css, -setup.swf, -setup.img, -setup.fonts, -setup.yui"
+    />
+
+    <!-- utility-ish targets -->
+    <target name="copy"         depends="clean, tools, -copy" />
+    <target name="tools"        depends="-setup.build.tools" />
+    <target name="finalize"     depends="copy, -finalize" />
+    <target name="-prepare"     depends="copy, -setup" />
+
+    <!-- individual component build targets (empty descriptions are to make sure they show in "ant -p") -->
+    <target name="devlive"      depends="-prepare, -devlive"            description="" />
+    <target name="js"           depends="-prepare, -js"                 description="" />
+    <target name="css"          depends="-prepare, -css"                description="" />
+    <target name="rename"       depends="-prepare, -rename"             description="" />
+    <target name="yui"          depends="-prepare, rename, -yui"        description="" />
+    <target name="cdn"          depends="-prepare, -cdn"                description="" />
+
+    <!-- high level build targets (Excluding of images is on purpose here, it's slow) -->
+    <target name="core"
+            depends="devlive, js, css, cdn, rename, yui, -js.inline"
+            description="Core build work"
+    />
+
+    <target name="prod"
+            depends="core, finalize"
+            description="Full Production Build"
+    />
+
+    <!-- debug target -->
+    <target name="debug" depends="-setup">
+        <echoproperties/>
+    </target>
+
+</project>
--- a/System/filenames/build.xml
+++ b/System/filenames/build.xml
@@ -0,0 +1 @@
+ant.xml
--- a/samples/ApacheConf/apache.vhost
+++ b/samples/ApacheConf/apache.vhost
@@ -0,0 +1,17 @@
+#######################
+# HOSTNAME
+######################
+
+<VirtualHost 127.0.0.1:PORT>
+    ServerAdmin patrick@heysparkbox.com
+    DocumentRoot "/var/www/HOSTNAME"
+    ServerName HOSTNAME
+
+    <Directory "/var/www/HOSTNAME">
+       Options Indexes MultiViews FollowSymLinks
+       AllowOverride All
+       Order allow,deny
+       Allow from all
+       DirectoryIndex index.php
+   </Directory>
+</VirtualHost>
--- a/samples/ApacheConf/filenames/.htaccess
+++ b/samples/ApacheConf/filenames/.htaccess
@@ -0,0 +1,26 @@
+ServerSignature Off
+RewriteCond %{REQUEST_METHOD} ^(HEAD|TRACE|DELETE|TRACK) [NC,OR]
+RewriteCond %{THE_REQUEST} (\\r|\\n|%0A|%0D) [NC,OR]
+
+RewriteCond %{HTTP_REFERER} (<|>|’|%0A|%0D|%27|%3C|%3E|%00) [NC,OR]
+RewriteCond %{HTTP_COOKIE} (<|>|’|%0A|%0D|%27|%3C|%3E|%00) [NC,OR]
+RewriteCond %{REQUEST_URI} ^/(,|;|:|<|>|”>|”<|/|\\\.\.\\).{0,9999} [NC,OR]
+
+RewriteCond %{HTTP_USER_AGENT} ^$ [OR]
+RewriteCond %{HTTP_USER_AGENT} ^(java|curl|wget) [NC,OR]
+RewriteCond %{HTTP_USER_AGENT} (winhttp|HTTrack|clshttp|archiver|loader|email|harvest|extract|grab|miner) [NC,OR]
+RewriteCond %{HTTP_USER_AGENT} (libwww-perl|curl|wget|python|nikto|scan) [NC,OR]
+RewriteCond %{HTTP_USER_AGENT} (<|>|’|%0A|%0D|%27|%3C|%3E|%00) [NC,OR]
+
+#Block mySQL injects
+RewriteCond %{QUERY_STRING} (;|<|>|’|”|\)|%0A|%0D|%22|%27|%3C|%3E|%00).*(/\*|union|select|insert|cast|set|declare|drop|update|md5|benchmark) [NC,OR]
+
+RewriteCond %{QUERY_STRING} \.\./\.\. [OR]
+
+RewriteCond %{QUERY_STRING} (localhost|loopback|127\.0\.0\.1) [NC,OR]
+RewriteCond %{QUERY_STRING} \.[a-z0-9] [NC,OR]
+RewriteCond %{QUERY_STRING} (<|>|’|%0A|%0D|%27|%3C|%3E|%00) [NC]
+# Note: The final RewriteCond must NOT use the [OR] flag.
+
+# Return 403 Forbidden error.
+RewriteRule .* index.php [F]
--- a/samples/ApacheConf/filenames/apache2.conf
+++ b/samples/ApacheConf/filenames/apache2.conf
@@ -0,0 +1,470 @@
+# This is the main Apache HTTP server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See <URL:http://httpd.apache.org/docs/2.2> for detailed information.
+# In particular, see
+# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
+# for a discussion of each configuration directive.
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.
+#
+# Configuration and logfile names: If the filenames you specify for many
+# of the server's control files begin with "/" (or "drive:/" for Win32), the
+# server will use that explicit path.  If the filenames do *not* begin
+# with "/", the value of ServerRoot is prepended -- so "/var/log/apache2/foo.log"
+# with ServerRoot set to "" will be interpreted by the
+# server as "//var/log/apache2/foo.log".
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# Do not add a slash at the end of the directory path.  If you point
+# ServerRoot at a non-local disk, be sure to point the LockFile directive
+# at a local disk.  If you wish to share the same ServerRoot for multiple
+# httpd daemons, you will need to change at least LockFile and PidFile.
+#
+ServerRoot ""
+
+#
+# Listen: Allows you to bind Apache to specific IP addresses and/or
+# ports, instead of the default. See also the <VirtualHost>
+# directive.
+#
+# Change this to Listen on specific IP addresses as shown below to
+# prevent Apache from glomming onto all bound IP addresses.
+#
+#Listen 12.34.56.78:80
+Listen 80
+
+#
+# Dynamic Shared Object (DSO) Support
+#
+# To be able to use the functionality of a module which was built as a DSO you
+# have to place corresponding `LoadModule' lines at this location so the
+# directives contained in it are actually available _before_ they are used.
+# Statically compiled modules (those listed by `httpd -l') do not need
+# to be loaded here.
+#
+# Example:
+# LoadModule foo_module modules/mod_foo.so
+#
+LoadModule authn_file_module /usr/lib/apache2/modules/mod_authn_file.so
+LoadModule authn_dbm_module /usr/lib/apache2/modules/mod_authn_dbm.so
+LoadModule authn_anon_module /usr/lib/apache2/modules/mod_authn_anon.so
+LoadModule authn_dbd_module /usr/lib/apache2/modules/mod_authn_dbd.so
+LoadModule authn_default_module /usr/lib/apache2/modules/mod_authn_default.so
+LoadModule authn_alias_module /usr/lib/apache2/modules/mod_authn_alias.so
+LoadModule authz_host_module /usr/lib/apache2/modules/mod_authz_host.so
+LoadModule authz_groupfile_module /usr/lib/apache2/modules/mod_authz_groupfile.so
+LoadModule authz_user_module /usr/lib/apache2/modules/mod_authz_user.so
+LoadModule authz_dbm_module /usr/lib/apache2/modules/mod_authz_dbm.so
+LoadModule authz_owner_module /usr/lib/apache2/modules/mod_authz_owner.so
+LoadModule authnz_ldap_module /usr/lib/apache2/modules/mod_authnz_ldap.so
+LoadModule authz_default_module /usr/lib/apache2/modules/mod_authz_default.so
+LoadModule auth_basic_module /usr/lib/apache2/modules/mod_auth_basic.so
+LoadModule auth_digest_module /usr/lib/apache2/modules/mod_auth_digest.so
+LoadModule file_cache_module /usr/lib/apache2/modules/mod_file_cache.so
+LoadModule cache_module /usr/lib/apache2/modules/mod_cache.so
+LoadModule disk_cache_module /usr/lib/apache2/modules/mod_disk_cache.so
+LoadModule mem_cache_module /usr/lib/apache2/modules/mod_mem_cache.so
+LoadModule dbd_module /usr/lib/apache2/modules/mod_dbd.so
+LoadModule dumpio_module /usr/lib/apache2/modules/mod_dumpio.so
+LoadModule ext_filter_module /usr/lib/apache2/modules/mod_ext_filter.so
+LoadModule include_module /usr/lib/apache2/modules/mod_include.so
+LoadModule filter_module /usr/lib/apache2/modules/mod_filter.so
+LoadModule charset_lite_module /usr/lib/apache2/modules/mod_charset_lite.so
+LoadModule deflate_module /usr/lib/apache2/modules/mod_deflate.so
+LoadModule ldap_module /usr/lib/apache2/modules/mod_ldap.so
+LoadModule log_forensic_module /usr/lib/apache2/modules/mod_log_forensic.so
+LoadModule env_module /usr/lib/apache2/modules/mod_env.so
+LoadModule mime_magic_module /usr/lib/apache2/modules/mod_mime_magic.so
+LoadModule cern_meta_module /usr/lib/apache2/modules/mod_cern_meta.so
+LoadModule expires_module /usr/lib/apache2/modules/mod_expires.so
+LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so
+LoadModule ident_module /usr/lib/apache2/modules/mod_ident.so
+LoadModule usertrack_module /usr/lib/apache2/modules/mod_usertrack.so
+LoadModule unique_id_module /usr/lib/apache2/modules/mod_unique_id.so
+LoadModule setenvif_module /usr/lib/apache2/modules/mod_setenvif.so
+LoadModule version_module /usr/lib/apache2/modules/mod_version.so
+LoadModule proxy_module /usr/lib/apache2/modules/mod_proxy.so
+LoadModule proxy_connect_module /usr/lib/apache2/modules/mod_proxy_connect.so
+LoadModule proxy_ftp_module /usr/lib/apache2/modules/mod_proxy_ftp.so
+LoadModule proxy_http_module /usr/lib/apache2/modules/mod_proxy_http.so
+LoadModule proxy_ajp_module /usr/lib/apache2/modules/mod_proxy_ajp.so
+LoadModule proxy_balancer_module /usr/lib/apache2/modules/mod_proxy_balancer.so
+LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so
+LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so
+LoadModule dav_module /usr/lib/apache2/modules/mod_dav.so
+LoadModule status_module /usr/lib/apache2/modules/mod_status.so
+LoadModule autoindex_module /usr/lib/apache2/modules/mod_autoindex.so
+LoadModule asis_module /usr/lib/apache2/modules/mod_asis.so
+LoadModule info_module /usr/lib/apache2/modules/mod_info.so
+LoadModule suexec_module /usr/lib/apache2/modules/mod_suexec.so
+LoadModule cgid_module /usr/lib/apache2/modules/mod_cgid.so
+LoadModule cgi_module /usr/lib/apache2/modules/mod_cgi.so
+LoadModule dav_fs_module /usr/lib/apache2/modules/mod_dav_fs.so
+LoadModule dav_lock_module /usr/lib/apache2/modules/mod_dav_lock.so
+LoadModule vhost_alias_module /usr/lib/apache2/modules/mod_vhost_alias.so
+LoadModule negotiation_module /usr/lib/apache2/modules/mod_negotiation.so
+LoadModule dir_module /usr/lib/apache2/modules/mod_dir.so
+LoadModule imagemap_module /usr/lib/apache2/modules/mod_imagemap.so
+LoadModule actions_module /usr/lib/apache2/modules/mod_actions.so
+LoadModule speling_module /usr/lib/apache2/modules/mod_speling.so
+LoadModule userdir_module /usr/lib/apache2/modules/mod_userdir.so
+LoadModule alias_module /usr/lib/apache2/modules/mod_alias.so
+LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
+
+<IfModule !mpm_netware_module>
+#
+# If you wish httpd to run as a different user or group, you must run
+# httpd as root initially and it will switch.
+#
+# User/Group: The name (or #number) of the user/group to run httpd as.
+# It is usually good practice to create a dedicated user and group for
+# running httpd, as with most system services.
+#
+User daemon
+Group daemon
+</IfModule>
+
+# 'Main' server configuration
+#
+# The directives in this section set up the values used by the 'main'
+# server, which responds to any requests that aren't handled by a
+# <VirtualHost> definition.  These values also provide defaults for
+# any <VirtualHost> containers you may define later in the file.
+#
+# All of these directives may appear inside <VirtualHost> containers,
+# in which case these default settings will be overridden for the
+# virtual host being defined.
+#
+
+#
+# ServerAdmin: Your address, where problems with the server should be
+# e-mailed.  This address appears on some server-generated pages, such
+# as error documents.  e.g. admin@your-domain.com
+#
+ServerAdmin you@example.com
+
+#
+# ServerName gives the name and port that the server uses to identify itself.
+# This can often be determined automatically, but we recommend you specify
+# it explicitly to prevent problems during startup.
+#
+# If your host doesn't have a registered DNS name, enter its IP address here.
+#
+#ServerName www.example.com:80
+
+#
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
+#
+DocumentRoot "/usr/share/apache2/default-site/htdocs"
+
+#
+# Each directory to which Apache has access can be configured with respect
+# to which services and features are allowed and/or disabled in that
+# directory (and its subdirectories).
+#
+# First, we configure the "default" to be a very restrictive set of
+# features.
+#
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Order deny,allow
+    Deny from all
+</Directory>
+
+#
+# Note that from this point forward you must specifically allow
+# particular features to be enabled - so if something's not working as
+# you might expect, make sure that you have specifically enabled it
+# below.
+#
+
+#
+# This should be changed to whatever you set DocumentRoot to.
+#
+<Directory "/usr/share/apache2/default-site/htdocs">
+    #
+    # Possible values for the Options directive are "None", "All",
+    # or any combination of:
+    #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+    #
+    # Note that "MultiViews" must be named *explicitly* --- "Options All"
+    # doesn't give it to you.
+    #
+    # The Options directive is both complicated and important.  Please see
+    # http://httpd.apache.org/docs/2.2/mod/core.html#options
+    # for more information.
+    #
+    Options Indexes FollowSymLinks
+
+    #
+    # AllowOverride controls what directives may be placed in .htaccess files.
+    # It can be "All", "None", or any combination of the keywords:
+    #   Options FileInfo AuthConfig Limit
+    #
+    AllowOverride None
+
+    #
+    # Controls who can get stuff from this server.
+    #
+    Order allow,deny
+    Allow from all
+
+</Directory>
+
+#
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
+#
+<IfModule dir_module>
+    DirectoryIndex index.html
+</IfModule>
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being
+# viewed by Web clients.
+#
+<FilesMatch "^\.ht">
+    Order allow,deny
+    Deny from all
+    Satisfy All
+</FilesMatch>
+
+#
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog /var/log/apache2/error_log
+
+#
+# LogLevel: Control the number of messages logged to the error_log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+#
+LogLevel warn
+
+<IfModule log_config_module>
+    #
+    # The following directives define some format nicknames for use with
+    # a CustomLog directive (see below).
+    #
+    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+    LogFormat "%h %l %u %t \"%r\" %>s %b" common
+
+    <IfModule logio_module>
+      # You need to enable mod_logio.c to use %I and %O
+      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+    </IfModule>
+
+    #
+    # The location and format of the access logfile (Common Logfile Format).
+    # If you do not define any access logfiles within a <VirtualHost>
+    # container, they will be logged here.  Contrariwise, if you *do*
+    # define per-<VirtualHost> access logfiles, transactions will be
+    # logged therein and *not* in this file.
+    #
+    CustomLog /var/log/apache2/access_log common
+
+    #
+    # If you prefer a logfile with access, agent, and referer information
+    # (Combined Logfile Format) you can use the following directive.
+    #
+    #CustomLog /var/log/apache2/access_log combined
+</IfModule>
+
+<IfModule alias_module>
+    #
+    # Redirect: Allows you to tell clients about documents that used to
+    # exist in your server's namespace, but do not anymore. The client
+    # will make a new request for the document at its new location.
+    # Example:
+    # Redirect permanent /foo http://www.example.com/bar
+
+    #
+    # Alias: Maps web paths into filesystem paths and is used to
+    # access content that does not live under the DocumentRoot.
+    # Example:
+    # Alias /webpath /full/filesystem/path
+    #
+    # If you include a trailing / on /webpath then the server will
+    # require it to be present in the URL.  You will also likely
+    # need to provide a <Directory> section to allow access to
+    # the filesystem path.
+
+    #
+    # ScriptAlias: This controls which directories contain server scripts.
+    # ScriptAliases are essentially the same as Aliases, except that
+    # documents in the target directory are treated as applications and
+    # run by the server when requested rather than as documents sent to the
+    # client.  The same rules about trailing "/" apply to ScriptAlias
+    # directives as to Alias.
+    #
+    ScriptAlias /cgi-bin/ "/usr/lib/cgi-bin/"
+
+</IfModule>
+
+<IfModule cgid_module>
+    #
+    # ScriptSock: On threaded servers, designate the path to the UNIX
+    # socket used to communicate with the CGI daemon of mod_cgid.
+    #
+    #Scriptsock /var/run/apache2/cgisock
+</IfModule>
+
+#
+# "/usr/lib/cgi-bin" should be changed to whatever your ScriptAliased
+# CGI directory exists, if you have that configured.
+#
+<Directory "/usr/lib/cgi-bin">
+    AllowOverride None
+    Options None
+    Order allow,deny
+    Allow from all
+</Directory>
+
+#
+# DefaultType: the default MIME type the server will use for a document
+# if it cannot otherwise determine one, such as from filename extensions.
+# If your server contains mostly text or HTML documents, "text/plain" is
+# a good value.  If most of your content is binary, such as applications
+# or images, you may want to use "application/octet-stream" instead to
+# keep browsers from trying to display binary files as though they are
+# text.
+#
+DefaultType text/plain
+
+<IfModule mime_module>
+    #
+    # TypesConfig points to the file containing the list of mappings from
+    # filename extension to MIME-type.
+    #
+    TypesConfig /etc/apache2/mime.types
+
+    #
+    # AddType allows you to add to or override the MIME configuration
+    # file specified in TypesConfig for specific file types.
+    #
+    #AddType application/x-gzip .tgz
+    #
+    # AddEncoding allows you to have certain browsers uncompress
+    # information on the fly. Note: Not all browsers support this.
+    #
+    #AddEncoding x-compress .Z
+    #AddEncoding x-gzip .gz .tgz
+    #
+    # If the AddEncoding directives above are commented-out, then you
+    # probably should define those extensions to indicate media types:
+    #
+    AddType application/x-compress .Z
+    AddType application/x-gzip .gz .tgz
+
+    #
+    # AddHandler allows you to map certain file extensions to "handlers":
+    # actions unrelated to filetype. These can be either built into the server
+    # or added with the Action directive (see below)
+    #
+    # To use CGI scripts outside of ScriptAliased directories:
+    # (You will also need to add "ExecCGI" to the "Options" directive.)
+    #
+    #AddHandler cgi-script .cgi
+
+    # For type maps (negotiated resources):
+    #AddHandler type-map var
+
+    #
+    # Filters allow you to process content before it is sent to the client.
+    #
+    # To parse .shtml files for server-side includes (SSI):
+    # (You will also need to add "Includes" to the "Options" directive.)
+    #
+    #AddType text/html .shtml
+    #AddOutputFilter INCLUDES .shtml
+</IfModule>
+
+#
+# The mod_mime_magic module allows the server to use various hints from the
+# contents of the file itself to determine its type.  The MIMEMagicFile
+# directive tells the module where the hint definitions are located.
+#
+#MIMEMagicFile /etc/apache2/magic
+
+#
+# Customizable error responses come in three flavors:
+# 1) plain text 2) local redirects 3) external redirects
+#
+# Some examples:
+#ErrorDocument 500 "The server made a boo boo."
+#ErrorDocument 404 /missing.html
+#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+#ErrorDocument 402 http://www.example.com/subscription_info.html
+#
+
+#
+# EnableMMAP and EnableSendfile: On systems that support it,
+# memory-mapping or the sendfile syscall is used to deliver
+# files.  This usually improves server performance, but must
+# be turned off when serving from networked-mounted
+# filesystems or if support for these functions is otherwise
+# broken on your system.
+#
+#EnableMMAP off
+#EnableSendfile off
+
+# Supplemental configuration
+#
+# The configuration files in the /etc/apache2/extra/ directory can be
+# included to add extra features or to modify the default configuration of
+# the server, or you may simply copy their contents here and change as
+# necessary.
+
+# Server-pool management (MPM specific)
+#Include /etc/apache2/extra/httpd-mpm.conf
+
+# Multi-language error messages
+#Include /etc/apache2/extra/httpd-multilang-errordoc.conf
+
+# Fancy directory listings
+#Include /etc/apache2/extra/httpd-autoindex.conf
+
+# Language settings
+#Include /etc/apache2/extra/httpd-languages.conf
+
+# User home directories
+#Include /etc/apache2/extra/httpd-userdir.conf
+
+# Real-time info on requests and configuration
+#Include /etc/apache2/extra/httpd-info.conf
+
+# Virtual hosts
+#Include /etc/apache2/extra/httpd-vhosts.conf
+
+# Local access to the Apache HTTP Server Manual
+#Include /etc/apache2/extra/httpd-manual.conf
+
+# Distributed authoring and versioning (WebDAV)
+#Include /etc/apache2/extra/httpd-dav.conf
+
+# Various default settings
+#Include /etc/apache2/extra/httpd-default.conf
+
+# Secure (SSL/TLS) connections
+#Include /etc/apache2/extra/httpd-ssl.conf
+#
+# Note: The following must must be present to support
+#       starting without SSL on platforms with no /dev/random equivalent
+#       but a statically compiled-in mod_ssl.
+#
+<IfModule ssl_module>
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+</IfModule>
--- a/samples/ApacheConf/filenames/httpd.conf
+++ b/samples/ApacheConf/filenames/httpd.conf
@@ -0,0 +1,500 @@
+#
+# This is the main Apache HTTP server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See <URL:http://httpd.apache.org/docs/2.2> for detailed information.
+# In particular, see 
+# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
+# for a discussion of each configuration directive.
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.  
+#
+# Configuration and logfile names: If the filenames you specify for many
+# of the server's control files begin with "/" (or "drive:/" for Win32), the
+# server will use that explicit path.  If the filenames do *not* begin
+# with "/", the value of ServerRoot is prepended -- so "log/foo_log"
+# with ServerRoot set to "/usr" will be interpreted by the
+# server as "/usr/log/foo_log".
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# Do not add a slash at the end of the directory path.  If you point
+# ServerRoot at a non-local disk, be sure to point the LockFile directive
+# at a local disk.  If you wish to share the same ServerRoot for multiple
+# httpd daemons, you will need to change at least LockFile and PidFile.
+#
+ServerRoot "/usr"
+
+#
+# Listen: Allows you to bind Apache to specific IP addresses and/or
+# ports, instead of the default. See also the <VirtualHost>
+# directive.
+#
+# Change this to Listen on specific IP addresses as shown below to 
+# prevent Apache from glomming onto all bound IP addresses.
+#
+#Listen 12.34.56.78:80
+Listen 80
+
+#
+# Dynamic Shared Object (DSO) Support
+#
+# To be able to use the functionality of a module which was built as a DSO you
+# have to place corresponding `LoadModule' lines at this location so the
+# directives contained in it are actually available _before_ they are used.
+# Statically compiled modules (those listed by `httpd -l') do not need
+# to be loaded here.
+#
+# Example:
+# LoadModule foo_module modules/mod_foo.so
+#
+LoadModule authn_file_module libexec/apache2/mod_authn_file.so
+LoadModule authn_dbm_module libexec/apache2/mod_authn_dbm.so
+LoadModule authn_anon_module libexec/apache2/mod_authn_anon.so
+LoadModule authn_dbd_module libexec/apache2/mod_authn_dbd.so
+LoadModule authn_default_module libexec/apache2/mod_authn_default.so
+LoadModule authz_host_module libexec/apache2/mod_authz_host.so
+LoadModule authz_groupfile_module libexec/apache2/mod_authz_groupfile.so
+LoadModule authz_user_module libexec/apache2/mod_authz_user.so
+LoadModule authz_dbm_module libexec/apache2/mod_authz_dbm.so
+LoadModule authz_owner_module libexec/apache2/mod_authz_owner.so
+LoadModule authz_default_module libexec/apache2/mod_authz_default.so
+LoadModule auth_basic_module libexec/apache2/mod_auth_basic.so
+LoadModule auth_digest_module libexec/apache2/mod_auth_digest.so
+LoadModule cache_module libexec/apache2/mod_cache.so
+LoadModule disk_cache_module libexec/apache2/mod_disk_cache.so
+LoadModule mem_cache_module libexec/apache2/mod_mem_cache.so
+LoadModule dbd_module libexec/apache2/mod_dbd.so
+LoadModule dumpio_module libexec/apache2/mod_dumpio.so
+LoadModule reqtimeout_module libexec/apache2/mod_reqtimeout.so
+LoadModule ext_filter_module libexec/apache2/mod_ext_filter.so
+LoadModule include_module libexec/apache2/mod_include.so
+LoadModule filter_module libexec/apache2/mod_filter.so
+LoadModule substitute_module libexec/apache2/mod_substitute.so
+LoadModule deflate_module libexec/apache2/mod_deflate.so
+LoadModule log_config_module libexec/apache2/mod_log_config.so
+LoadModule log_forensic_module libexec/apache2/mod_log_forensic.so
+LoadModule logio_module libexec/apache2/mod_logio.so
+LoadModule env_module libexec/apache2/mod_env.so
+LoadModule mime_magic_module libexec/apache2/mod_mime_magic.so
+LoadModule cern_meta_module libexec/apache2/mod_cern_meta.so
+LoadModule expires_module libexec/apache2/mod_expires.so
+LoadModule headers_module libexec/apache2/mod_headers.so
+LoadModule ident_module libexec/apache2/mod_ident.so
+LoadModule usertrack_module libexec/apache2/mod_usertrack.so
+#LoadModule unique_id_module libexec/apache2/mod_unique_id.so
+LoadModule setenvif_module libexec/apache2/mod_setenvif.so
+LoadModule version_module libexec/apache2/mod_version.so
+LoadModule proxy_module libexec/apache2/mod_proxy.so
+LoadModule proxy_connect_module libexec/apache2/mod_proxy_connect.so
+LoadModule proxy_ftp_module libexec/apache2/mod_proxy_ftp.so
+LoadModule proxy_http_module libexec/apache2/mod_proxy_http.so
+LoadModule proxy_scgi_module libexec/apache2/mod_proxy_scgi.so
+LoadModule proxy_ajp_module libexec/apache2/mod_proxy_ajp.so
+LoadModule proxy_balancer_module libexec/apache2/mod_proxy_balancer.so
+LoadModule ssl_module libexec/apache2/mod_ssl.so
+LoadModule mime_module libexec/apache2/mod_mime.so
+LoadModule dav_module libexec/apache2/mod_dav.so
+LoadModule status_module libexec/apache2/mod_status.so
+LoadModule autoindex_module libexec/apache2/mod_autoindex.so
+LoadModule asis_module libexec/apache2/mod_asis.so
+LoadModule info_module libexec/apache2/mod_info.so
+LoadModule cgi_module libexec/apache2/mod_cgi.so
+LoadModule dav_fs_module libexec/apache2/mod_dav_fs.so
+LoadModule vhost_alias_module libexec/apache2/mod_vhost_alias.so
+LoadModule negotiation_module libexec/apache2/mod_negotiation.so
+LoadModule dir_module libexec/apache2/mod_dir.so
+LoadModule imagemap_module libexec/apache2/mod_imagemap.so
+LoadModule actions_module libexec/apache2/mod_actions.so
+LoadModule speling_module libexec/apache2/mod_speling.so
+LoadModule userdir_module libexec/apache2/mod_userdir.so
+LoadModule alias_module libexec/apache2/mod_alias.so
+LoadModule rewrite_module libexec/apache2/mod_rewrite.so
+#LoadModule perl_module libexec/apache2/mod_perl.so
+#LoadModule php5_module libexec/apache2/libphp5.so
+#LoadModule hfs_apple_module libexec/apache2/mod_hfs_apple.so
+
+<IfModule !mpm_netware_module>
+<IfModule !mpm_winnt_module>
+#
+# If you wish httpd to run as a different user or group, you must run
+# httpd as root initially and it will switch.  
+#
+# User/Group: The name (or #number) of the user/group to run httpd as.
+# It is usually good practice to create a dedicated user and group for
+# running httpd, as with most system services.
+#
+User _www
+Group _www
+
+</IfModule>
+</IfModule>
+
+# 'Main' server configuration
+#
+# The directives in this section set up the values used by the 'main'
+# server, which responds to any requests that aren't handled by a
+# <VirtualHost> definition.  These values also provide defaults for
+# any <VirtualHost> containers you may define later in the file.
+#
+# All of these directives may appear inside <VirtualHost> containers,
+# in which case these default settings will be overridden for the
+# virtual host being defined.
+#
+
+#
+# ServerAdmin: Your address, where problems with the server should be
+# e-mailed.  This address appears on some server-generated pages, such
+# as error documents.  e.g. admin@your-domain.com
+#
+ServerAdmin you@example.com
+
+#
+# ServerName gives the name and port that the server uses to identify itself.
+# This can often be determined automatically, but we recommend you specify
+# it explicitly to prevent problems during startup.
+#
+# If your host doesn't have a registered DNS name, enter its IP address here.
+#
+#ServerName www.example.com:80
+
+#
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
+#
+DocumentRoot "/Library/WebServer/Documents"
+
+#
+# Each directory to which Apache has access can be configured with respect
+# to which services and features are allowed and/or disabled in that
+# directory (and its subdirectories). 
+#
+# First, we configure the "default" to be a very restrictive set of 
+# features.  
+#
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Order deny,allow
+    Deny from all
+</Directory>
+
+#
+# Note that from this point forward you must specifically allow
+# particular features to be enabled - so if something's not working as
+# you might expect, make sure that you have specifically enabled it
+# below.
+#
+
+#
+# This should be changed to whatever you set DocumentRoot to.
+#
+<Directory "/Library/WebServer/Documents">
+    #
+    # Possible values for the Options directive are "None", "All",
+    # or any combination of:
+    #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+    #
+    # Note that "MultiViews" must be named *explicitly* --- "Options All"
+    # doesn't give it to you.
+    #
+    # The Options directive is both complicated and important.  Please see
+    # http://httpd.apache.org/docs/2.2/mod/core.html#options
+    # for more information.
+    #
+    Options Indexes FollowSymLinks MultiViews
+
+    #
+    # AllowOverride controls what directives may be placed in .htaccess files.
+    # It can be "All", "None", or any combination of the keywords:
+    #   Options FileInfo AuthConfig Limit
+    #
+    AllowOverride None
+
+    #
+    # Controls who can get stuff from this server.
+    #
+    Order allow,deny
+    Allow from all
+
+</Directory>
+
+#
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
+#
+<IfModule dir_module>
+    DirectoryIndex index.html
+</IfModule>
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being 
+# viewed by Web clients. 
+#
+<FilesMatch "^\.([Hh][Tt]|[Dd][Ss]_[Ss])">
+    Order allow,deny
+    Deny from all
+    Satisfy All
+</FilesMatch>
+
+#
+# Apple specific filesystem protection.
+#
+<Files "rsrc">
+    Order allow,deny
+    Deny from all
+    Satisfy All
+</Files>
+<DirectoryMatch ".*\.\.namedfork">
+    Order allow,deny
+    Deny from all
+    Satisfy All
+</DirectoryMatch>
+
+#
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog "/private/var/log/apache2/error_log"
+
+#
+# LogLevel: Control the number of messages logged to the error_log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+#
+LogLevel warn
+
+<IfModule log_config_module>
+    #
+    # The following directives define some format nicknames for use with
+    # a CustomLog directive (see below).
+    #
+    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+    LogFormat "%h %l %u %t \"%r\" %>s %b" common
+
+    <IfModule logio_module>
+      # You need to enable mod_logio.c to use %I and %O
+      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+    </IfModule>
+
+    #
+    # The location and format of the access logfile (Common Logfile Format).
+    # If you do not define any access logfiles within a <VirtualHost>
+    # container, they will be logged here.  Contrariwise, if you *do*
+    # define per-<VirtualHost> access logfiles, transactions will be
+    # logged therein and *not* in this file.
+    #
+    CustomLog "/private/var/log/apache2/access_log" common
+
+    #
+    # If you prefer a logfile with access, agent, and referer information
+    # (Combined Logfile Format) you can use the following directive.
+    #
+    #CustomLog "/private/var/log/apache2/access_log" combined
+</IfModule>
+
+<IfModule alias_module>
+    #
+    # Redirect: Allows you to tell clients about documents that used to 
+    # exist in your server's namespace, but do not anymore. The client 
+    # will make a new request for the document at its new location.
+    # Example:
+    # Redirect permanent /foo http://www.example.com/bar
+
+    #
+    # Alias: Maps web paths into filesystem paths and is used to
+    # access content that does not live under the DocumentRoot.
+    # Example:
+    # Alias /webpath /full/filesystem/path
+    #
+    # If you include a trailing / on /webpath then the server will
+    # require it to be present in the URL.  You will also likely
+    # need to provide a <Directory> section to allow access to
+    # the filesystem path.
+
+    #
+    # ScriptAlias: This controls which directories contain server scripts. 
+    # ScriptAliases are essentially the same as Aliases, except that
+    # documents in the target directory are treated as applications and
+    # run by the server when requested rather than as documents sent to the
+    # client.  The same rules about trailing "/" apply to ScriptAlias
+    # directives as to Alias.
+    #
+    ScriptAliasMatch ^/cgi-bin/((?!(?i:webobjects)).*$) "/Library/WebServer/CGI-Executables/$1"
+
+</IfModule>
+
+<IfModule cgid_module>
+    #
+    # ScriptSock: On threaded servers, designate the path to the UNIX
+    # socket used to communicate with the CGI daemon of mod_cgid.
+    #
+    #Scriptsock /private/var/run/cgisock
+</IfModule>
+
+#
+# "/Library/WebServer/CGI-Executables" should be changed to whatever your ScriptAliased
+# CGI directory exists, if you have that configured.
+#
+<Directory "/Library/WebServer/CGI-Executables">
+    AllowOverride None
+    Options None
+    Order allow,deny
+    Allow from all
+</Directory>
+
+#
+# DefaultType: the default MIME type the server will use for a document
+# if it cannot otherwise determine one, such as from filename extensions.
+# If your server contains mostly text or HTML documents, "text/plain" is
+# a good value.  If most of your content is binary, such as applications
+# or images, you may want to use "application/octet-stream" instead to
+# keep browsers from trying to display binary files as though they are
+# text.
+#
+DefaultType text/plain
+
+<IfModule mime_module>
+    #
+    # TypesConfig points to the file containing the list of mappings from
+    # filename extension to MIME-type.
+    #
+    TypesConfig /private/etc/apache2/mime.types
+
+    #
+    # AddType allows you to add to or override the MIME configuration
+    # file specified in TypesConfig for specific file types.
+    #
+    #AddType application/x-gzip .tgz
+    #
+    # AddEncoding allows you to have certain browsers uncompress
+    # information on the fly. Note: Not all browsers support this.
+    #
+    #AddEncoding x-compress .Z
+    #AddEncoding x-gzip .gz .tgz
+    #
+    # If the AddEncoding directives above are commented-out, then you
+    # probably should define those extensions to indicate media types:
+    #
+    AddType application/x-compress .Z
+    AddType application/x-gzip .gz .tgz
+
+    #
+    # AddHandler allows you to map certain file extensions to "handlers":
+    # actions unrelated to filetype. These can be either built into the server
+    # or added with the Action directive (see below)
+    #
+    # To use CGI scripts outside of ScriptAliased directories:
+    # (You will also need to add "ExecCGI" to the "Options" directive.)
+    #
+    #AddHandler cgi-script .cgi
+
+    # For type maps (negotiated resources):
+    #AddHandler type-map var
+
+    #
+    # Filters allow you to process content before it is sent to the client.
+    #
+    # To parse .shtml files for server-side includes (SSI):
+    # (You will also need to add "Includes" to the "Options" directive.)
+    #
+    #AddType text/html .shtml
+    #AddOutputFilter INCLUDES .shtml
+</IfModule>
+
+#
+# The mod_mime_magic module allows the server to use various hints from the
+# contents of the file itself to determine its type.  The MIMEMagicFile
+# directive tells the module where the hint definitions are located.
+#
+#MIMEMagicFile /private/etc/apache2/magic
+
+#
+# Customizable error responses come in three flavors:
+# 1) plain text 2) local redirects 3) external redirects
+#
+# Some examples:
+#ErrorDocument 500 "The server made a boo boo."
+#ErrorDocument 404 /missing.html
+#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+#ErrorDocument 402 http://www.example.com/subscription_info.html
+#
+
+#
+# MaxRanges: Maximum number of Ranges in a request before
+# returning the entire resource, or one of the special
+# values 'default', 'none' or 'unlimited'.
+# Default setting is to accept 200 Ranges.
+#MaxRanges unlimited
+
+#
+# EnableMMAP and EnableSendfile: On systems that support it, 
+# memory-mapping or the sendfile syscall is used to deliver
+# files.  This usually improves server performance, but must
+# be turned off when serving from networked-mounted 
+# filesystems or if support for these functions is otherwise
+# broken on your system.
+#
+#EnableMMAP off
+#EnableSendfile off
+
+# 6894961
+TraceEnable off
+
+# Supplemental configuration
+#
+# The configuration files in the /private/etc/apache2/extra/ directory can be 
+# included to add extra features or to modify the default configuration of 
+# the server, or you may simply copy their contents here and change as 
+# necessary.
+
+# Server-pool management (MPM specific)
+Include /private/etc/apache2/extra/httpd-mpm.conf
+
+# Multi-language error messages
+#Include /private/etc/apache2/extra/httpd-multilang-errordoc.conf
+
+# Fancy directory listings
+Include /private/etc/apache2/extra/httpd-autoindex.conf
+
+# Language settings
+Include /private/etc/apache2/extra/httpd-languages.conf
+
+# User home directories
+Include /private/etc/apache2/extra/httpd-userdir.conf
+
+# Real-time info on requests and configuration
+#Include /private/etc/apache2/extra/httpd-info.conf
+
+# Virtual hosts
+#Include /private/etc/apache2/extra/httpd-vhosts.conf
+
+# Local access to the Apache HTTP Server Manual
+Include /private/etc/apache2/extra/httpd-manual.conf
+
+# Distributed authoring and versioning (WebDAV)
+#Include /private/etc/apache2/extra/httpd-dav.conf
+
+# Various default settings
+#Include /private/etc/apache2/extra/httpd-default.conf
+
+# Secure (SSL/TLS) connections
+#Include /private/etc/apache2/extra/httpd-ssl.conf
+#
+# Note: The following must must be present to support
+#       starting without SSL on platforms with no /dev/random equivalent
+#       but a statically compiled-in mod_ssl.
+#
+<IfModule ssl_module>
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+</IfModule>
+
+Include /private/etc/apache2/other/*.conf
--- a/samples/AsciiDoc/encoding.asciidoc
+++ b/samples/AsciiDoc/encoding.asciidoc
@@ -0,0 +1,13 @@
+Gregory Romé has written an AsciiDoc plugin for the Redmine project management application.
+
+https://github.com/foo-users/foo
+へと `vicmd` キーマップを足してみている試み、
+アニメーションgifです。
+
+tag::romé[]
+Gregory Romé has written an AsciiDoc plugin for the Redmine project management application.
+end::romé[]
+
+== Überschrift
+
+* Codierungen sind verrückt auf älteren Versionen von Ruby
--- a/samples/AsciiDoc/list.asc
+++ b/samples/AsciiDoc/list.asc
@@ -0,0 +1,13 @@
+AsciiDoc Home Page
+==================
+
+Title
+-----
+
+Example Articles
+~~~~~~~~~~~~~~~~
+- Item 1
+
+- Item 2
+
+- Item 3
--- a/samples/AsciiDoc/sample.adoc
+++ b/samples/AsciiDoc/sample.adoc
@@ -0,0 +1,25 @@
+Document Title
+==============
+Doc Writer <thedoc@asciidoctor.org>
+:idprefix: id_
+
+Preamble paragraph.
+
+NOTE: This is test, only a test.
+
+== Section A
+
+*Section A* paragraph.
+
+=== Section A Subsection
+
+*Section A* 'subsection' paragraph.
+
+== Section B
+
+*Section B* paragraph.
+
+.Section B list
+* Item 1
+* Item 2
+* Item 3
--- a/samples/AspectJ/CacheAspect.aj
+++ b/samples/AspectJ/CacheAspect.aj
@@ -0,0 +1,41 @@
+package com.blogspot.miguelinlas3.aspectj.cache;
+
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import org.aspectj.lang.JoinPoint;
+
+import com.blogspot.miguelinlas3.aspectj.cache.marker.Cachable;
+
+/**
+ * This simple aspect simulates the behaviour of a very simple cache
+ *  
+ * @author migue
+ *
+ */
+public aspect CacheAspect {
+
+	public pointcut cache(Cachable cachable): execution(@Cachable * * (..)) && @annotation(cachable);
+	
+	Object around(Cachable cachable): cache(cachable){
+	
+		String evaluatedKey = this.evaluateKey(cachable.scriptKey(), thisJoinPoint);
+		
+		if(cache.containsKey(evaluatedKey)){
+			System.out.println("Cache hit for key " + evaluatedKey);
+			return this.cache.get(evaluatedKey);
+		}
+		
+		System.out.println("Cache miss for key " + evaluatedKey);
+		Object value = proceed(cachable);
+		cache.put(evaluatedKey, value);
+		return value;
+	}
+	
+	protected String evaluateKey(String key, JoinPoint joinPoint) {
+		// TODO add some smart staff to allow simple scripting in @Cachable annotation
+		return key;
+	}
+	
+	protected Map<String, Object> cache = new WeakHashMap<String, Object>();
+}
--- a/samples/AspectJ/OptimizeRecursionCache.aj
+++ b/samples/AspectJ/OptimizeRecursionCache.aj
@@ -0,0 +1,50 @@
+package aspects.caching;
+
+import java.util.Map;
+
+/**
+ * Cache aspect for optimize recursive functions.
+ * 
+ * @author Migueli
+ * @date 05/11/2013
+ * @version 1.0
+ *
+ */
+public abstract aspect OptimizeRecursionCache {
+		
+	@SuppressWarnings("rawtypes")
+	private Map _cache;
+	
+	public OptimizeRecursionCache() {
+		_cache = getCache();
+	}
+	
+	@SuppressWarnings("rawtypes")
+	abstract public Map getCache();
+	
+	abstract public pointcut operation(Object o);
+
+	pointcut topLevelOperation(Object o): operation(o) && !cflowbelow(operation(Object));
+
+	before(Object o) : topLevelOperation(o) {
+		System.out.println("Seeking value for " + o);
+	}
+
+	Object around(Object o) : operation(o) {
+		Object cachedValue = _cache.get(o);
+		if (cachedValue != null) {
+			System.out.println("Found cached value for " + o + ": " + cachedValue);
+			return cachedValue;
+		}
+		return proceed(o);
+	}
+
+	@SuppressWarnings("unchecked")
+	after(Object o) returning(Object result) : topLevelOperation(o) {
+		_cache.put(o, result);
+	}
+	
+	after(Object o) returning(Object result) : topLevelOperation(o) {
+		System.out.println("cache size: " + _cache.size());
+	}
+}
--- a/samples/Assembly/External
+++ b/samples/Assembly/External
@@ -0,0 +1,66 @@
+	ORG	0000h
+	SJMP	START
+	ORG	0003h
+	LCALL	INT0_ISR
+	RETI
+	ORG	000Bh
+	LCALL	T0_ISR
+	RETI
+	ORG	0013h
+	LCALL	INT1_ISR
+	RETI
+	ORG	001Bh
+	LCALL	T1_ISR
+	RETI
+	ORG	0023h
+	LCALL	UART_ISR
+	RETI
+	ORG	0030h
+START:
+	MOV	A,#11111110b
+	SETB	IT0	; Set External Interrupt 0 to be falling edge triggered
+	SETB	EX0	; Enable External Interrut 0
+	SETB	EA	; Enable Interrupt
+LEFT:			
+	CJNE	A,#01111111b,LOOP1
+	JMP	RIGHT
+LOOP1:
+	MOV	P1,A
+	RL	A	
+	LCALL	DELAY
+	SJMP	LEFT	
+RIGHT:
+	CJNE	A,#11111110b,LOOP2
+	JMP	LEFT
+LOOP2:
+	MOV	P1,A
+	RR	A	
+	LCALL	DELAY
+	SJMP	RIGHT
+	
+INT0_ISR:
+	MOV	R1,#3
+FLASH:
+	MOV	P1,#00h
+	LCALL	DELAY
+	MOV	P1,#0FFh
+	LCALL	DELAY
+	DJNZ	R1,FLASH
+	RET
+T0_ISR:
+	RET
+INT1_ISR:
+	RET
+T1_ISR:
+	RET
+UART_ISR:
+	RET
+
+DELAY:	MOV	R5,#20	;R5*20 mS
+D1:     MOV	R6,#40
+D2:     MOV	R7,#249
+	DJNZ	R7,$
+ 	DJNZ	R6,D2
+  	DJNZ	R5,D1
+   	RET
+	END
--- a/samples/Assembly/FASM.asm
+++ b/samples/Assembly/FASM.asm
@@ -0,0 +1,350 @@
+
+; flat assembler interface for Win32
+; Copyright (c) 1999-2014, Tomasz Grysztar.
+; All rights reserved.
+
+	format	PE console
+
+section '.text' code readable executable
+
+start:
+
+	mov	[con_handle],STD_OUTPUT_HANDLE
+	mov	esi,_logo
+	call	display_string
+
+	call	get_params
+	jc	information
+
+	call	init_memory
+
+	mov	esi,_memory_prefix
+	call	display_string
+	mov	eax,[memory_end]
+	sub	eax,[memory_start]
+	add	eax,[additional_memory_end]
+	sub	eax,[additional_memory]
+	shr	eax,10
+	call	display_number
+	mov	esi,_memory_suffix
+	call	display_string
+
+	call	[GetTickCount]
+	mov	[start_time],eax
+
+	call	preprocessor
+	call	parser
+	call	assembler
+	call	formatter
+
+	call	display_user_messages
+	movzx	eax,[current_pass]
+	inc	eax
+	call	display_number
+	mov	esi,_passes_suffix
+	call	display_string
+	call	[GetTickCount]
+	sub	eax,[start_time]
+	xor	edx,edx
+	mov	ebx,100
+	div	ebx
+	or	eax,eax
+	jz	display_bytes_count
+	xor	edx,edx
+	mov	ebx,10
+	div	ebx
+	push	edx
+	call	display_number
+	mov	dl,'.'
+	call	display_character
+	pop	eax
+	call	display_number
+	mov	esi,_seconds_suffix
+	call	display_string
+      display_bytes_count:
+	mov	eax,[written_size]
+	call	display_number
+	mov	esi,_bytes_suffix
+	call	display_string
+	xor	al,al
+	jmp	exit_program
+
+information:
+	mov	esi,_usage
+	call	display_string
+	mov	al,1
+	jmp	exit_program
+
+get_params:
+	mov	[input_file],0
+	mov	[output_file],0
+	mov	[symbols_file],0
+	mov	[memory_setting],0
+	mov	[passes_limit],100
+	call	[GetCommandLine]
+	mov	esi,eax
+	mov	edi,params
+    find_command_start:
+	lodsb
+	cmp	al,20h
+	je	find_command_start
+	cmp	al,22h
+	je	skip_quoted_name
+    skip_name:
+	lodsb
+	cmp	al,20h
+	je	find_param
+	or	al,al
+	jz	all_params
+	jmp	skip_name
+    skip_quoted_name:
+	lodsb
+	cmp	al,22h
+	je	find_param
+	or	al,al
+	jz	all_params
+	jmp	skip_quoted_name
+    find_param:
+	lodsb
+	cmp	al,20h
+	je	find_param
+	cmp	al,'-'
+	je	option_param
+	cmp	al,0Dh
+	je	all_params
+	or	al,al
+	jz	all_params
+	cmp	[input_file],0
+	jne	get_output_file
+	mov	[input_file],edi
+	jmp	process_param
+      get_output_file:
+	cmp	[output_file],0
+	jne	bad_params
+	mov	[output_file],edi
+    process_param:
+	cmp	al,22h
+	je	string_param
+    copy_param:
+	stosb
+	lodsb
+	cmp	al,20h
+	je	param_end
+	cmp	al,0Dh
+	je	param_end
+	or	al,al
+	jz	param_end
+	jmp	copy_param
+    string_param:
+	lodsb
+	cmp	al,22h
+	je	string_param_end
+	cmp	al,0Dh
+	je	param_end
+	or	al,al
+	jz	param_end
+	stosb
+	jmp	string_param
+    option_param:
+	lodsb
+	cmp	al,'m'
+	je	memory_option
+	cmp	al,'M'
+	je	memory_option
+	cmp	al,'p'
+	je	passes_option
+	cmp	al,'P'
+	je	passes_option
+	cmp	al,'s'
+	je	symbols_option
+	cmp	al,'S'
+	je	symbols_option
+    bad_params:
+	stc
+	ret
+    get_option_value:
+	xor	eax,eax
+	mov	edx,eax
+    get_option_digit:
+	lodsb
+	cmp	al,20h
+	je	option_value_ok
+	cmp	al,0Dh
+	je	option_value_ok
+	or	al,al
+	jz	option_value_ok
+	sub	al,30h
+	jc	invalid_option_value
+	cmp	al,9
+	ja	invalid_option_value
+	imul	edx,10
+	jo	invalid_option_value
+	add	edx,eax
+	jc	invalid_option_value
+	jmp	get_option_digit
+    option_value_ok:
+	dec	esi
+	clc
+	ret
+    invalid_option_value:
+	stc
+	ret
+    memory_option:
+	lodsb
+	cmp	al,20h
+	je	memory_option
+	cmp	al,0Dh
+	je	bad_params
+	or	al,al
+	jz	bad_params
+	dec	esi
+	call	get_option_value
+	or	edx,edx
+	jz	bad_params
+	cmp	edx,1 shl (32-10)
+	jae	bad_params
+	mov	[memory_setting],edx
+	jmp	find_param
+    passes_option:
+	lodsb
+	cmp	al,20h
+	je	passes_option
+	cmp	al,0Dh
+	je	bad_params
+	or	al,al
+	jz	bad_params
+	dec	esi
+	call	get_option_value
+	or	edx,edx
+	jz	bad_params
+	cmp	edx,10000h
+	ja	bad_params
+	mov	[passes_limit],dx
+	jmp	find_param
+    symbols_option:
+	mov	[symbols_file],edi
+      find_symbols_file_name:
+	lodsb
+	cmp	al,20h
+	jne	process_param
+	jmp	find_symbols_file_name
+    param_end:
+	dec	esi
+    string_param_end:
+	xor	al,al
+	stosb
+	jmp	find_param
+    all_params:
+	cmp	[input_file],0
+	je	bad_params
+	clc
+	ret
+
+include 'system.inc'
+
+include '..\errors.inc'
+include '..\symbdump.inc'
+include '..\preproce.inc'
+include '..\parser.inc'
+include '..\exprpars.inc'
+include '..\assemble.inc'
+include '..\exprcalc.inc'
+include '..\formats.inc'
+include '..\x86_64.inc'
+include '..\avx.inc'
+
+include '..\tables.inc'
+include '..\messages.inc'
+
+section '.data' data readable writeable
+
+include '..\version.inc'
+
+_copyright db 'Copyright (c) 1999-2014, Tomasz Grysztar',0Dh,0Ah,0
+
+_logo db 'flat assembler  version ',VERSION_STRING,0
+_usage db 0Dh,0Ah
+       db 'usage: fasm <source> [output]',0Dh,0Ah
+       db 'optional settings:',0Dh,0Ah
+       db ' -m <limit>    set the limit in kilobytes for the available memory',0Dh,0Ah
+       db ' -p <limit>    set the maximum allowed number of passes',0Dh,0Ah
+       db ' -s <file>     dump symbolic information for debugging',0Dh,0Ah
+       db 0
+_memory_prefix db '  (',0
+_memory_suffix db ' kilobytes memory)',0Dh,0Ah,0
+_passes_suffix db ' passes, ',0
+_seconds_suffix db ' seconds, ',0
+_bytes_suffix db ' bytes.',0Dh,0Ah,0
+
+align 4
+
+include '..\variable.inc'
+
+con_handle dd ?
+memory_setting dd ?
+start_time dd ?
+bytes_count dd ?
+displayed_count dd ?
+character db ?
+last_displayed rb 2
+
+params rb 1000h
+options rb 1000h
+buffer rb 4000h
+
+stack 10000h
+
+section '.idata' import data readable writeable
+
+  dd 0,0,0,rva kernel_name,rva kernel_table
+  dd 0,0,0,0,0
+
+  kernel_table:
+    ExitProcess dd rva _ExitProcess
+    CreateFile dd rva _CreateFileA
+    ReadFile dd rva _ReadFile
+    WriteFile dd rva _WriteFile
+    CloseHandle dd rva _CloseHandle
+    SetFilePointer dd rva _SetFilePointer
+    GetCommandLine dd rva _GetCommandLineA
+    GetEnvironmentVariable dd rva _GetEnvironmentVariable
+    GetStdHandle dd rva _GetStdHandle
+    VirtualAlloc dd rva _VirtualAlloc
+    VirtualFree dd rva _VirtualFree
+    GetTickCount dd rva _GetTickCount
+    GetSystemTime dd rva _GetSystemTime
+    GlobalMemoryStatus dd rva _GlobalMemoryStatus
+    dd 0
+
+  kernel_name db 'KERNEL32.DLL',0
+
+  _ExitProcess dw 0
+    db 'ExitProcess',0
+  _CreateFileA dw 0
+    db 'CreateFileA',0
+  _ReadFile dw 0
+    db 'ReadFile',0
+  _WriteFile dw 0
+    db 'WriteFile',0
+  _CloseHandle dw 0
+    db 'CloseHandle',0
+  _SetFilePointer dw 0
+    db 'SetFilePointer',0
+  _GetCommandLineA dw 0
+    db 'GetCommandLineA',0
+  _GetEnvironmentVariable dw 0
+    db 'GetEnvironmentVariableA',0
+  _GetStdHandle dw 0
+    db 'GetStdHandle',0
+  _VirtualAlloc dw 0
+    db 'VirtualAlloc',0
+  _VirtualFree dw 0
+    db 'VirtualFree',0
+  _GetTickCount dw 0
+    db 'GetTickCount',0
+  _GetSystemTime dw 0
+    db 'GetSystemTime',0
+  _GlobalMemoryStatus dw 0
+    db 'GlobalMemoryStatus',0
+
+section '.reloc' fixups data readable discardable
--- a/samples/Assembly/forth.nasm
+++ b/samples/Assembly/forth.nasm
--- a/samples/Assembly/fp_sqr32_160_comba.inc
+++ b/samples/Assembly/fp_sqr32_160_comba.inc
@@ -0,0 +1,245 @@
+
+    push r2
+    dint
+    nop
+    bis #MPYDLYWRTEN,&MPY32CTL0
+    bic #MPYDLY32,&MPY32CTL0
+    mov #SUMEXT,r13
+    clr r12
+
+    mov @r15+,r4
+    mov @r15+,r5
+
+    mov @r15+,r6
+    mov @r15+,r7
+
+    mov @r15+,r8
+    mov @r15+,r9
+
+    mov @r15+,r10
+    mov @r15+,r11
+
+    sub #2*8,r15
+
+    /* SELF_STEP_FIRST */
+    mov r4,&MPY32L
+    mov r5,&MPY32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*0(r14)
+    mov &RES1,2*(0+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+
+    /* STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov r6,&OP2L
+    mov r7,&OP2H
+    add &SUMEXT,r12
+    mov r6,&OP2L
+    mov r7,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*2(r14)
+    add @r13,r12
+    mov &RES1,2*(2+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov r8,&OP2L
+    mov r9,&OP2H
+    add &SUMEXT,r12
+    mov r8,&OP2L
+    mov r9,&OP2H
+
+    /* SELF_STEP */
+    mov r6,&MAC32L
+    mov r7,&MAC32H
+    add @r13,r12
+    mov r6,&OP2L
+    mov r7,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*4(r14)
+    add @r13,r12
+    mov &RES1,2*(4+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov r10,&OP2L
+    mov r11,&OP2H
+    add &SUMEXT,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+
+    /* STEP_2MORE */
+    mov r6,&MAC32L
+    mov r7,&MAC32H
+    add @r13,r12
+    mov r8,&OP2L
+    mov r9,&OP2H
+    add &SUMEXT,r12
+    mov r8,&OP2L
+    mov r9,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*6(r14)
+    add @r13,r12
+    mov &RES1,2*(6+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov 2*8(r15),&OP2L
+    mov 2*9(r15),&OP2H
+    add &SUMEXT,r12
+    mov 2*8(r15),&OP2L
+    mov 2*9(r15),&OP2H
+
+    /* STEP_2MORE */
+    mov r6,&MAC32L
+    mov r7,&MAC32H
+    add @r13,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+    add &SUMEXT,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+
+    /* SELF_STEP */
+    mov r8,&MAC32L
+    mov r9,&MAC32H
+    add @r13,r12
+    mov r8,&OP2L
+    mov r9,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*8(r14)
+    add @r13,r12
+    mov &RES1,2*(8+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    mov 2*8(r15),r4
+    mov 2*(8+1)(r15),r5
+
+    /* STEP_1 */
+    mov r6,&MAC32L
+    mov r7,&MAC32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+    add &SUMEXT,r12
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* STEP_2MORE */
+    mov r8,&MAC32L
+    mov r9,&MAC32H
+    add @r13,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+    add &SUMEXT,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*10(r14)
+    add @r13,r12
+    mov &RES1,2*(10+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r8,&MAC32L
+    mov r9,&MAC32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+    add &SUMEXT,r12
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* SELF_STEP */
+    mov r10,&MAC32L
+    mov r11,&MAC32H
+    add @r13,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*12(r14)
+    add @r13,r12
+    mov &RES1,2*(12+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r10,&MAC32L
+    mov r11,&MAC32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+    add &SUMEXT,r12
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*14(r14)
+    add @r13,r12
+    mov &RES1,2*(14+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* SELF_STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*16(r14)
+    add @r13,r12
+    mov &RES1,2*(16+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* END */
+    mov &RES0,2*18(r14)
+    mov &RES1,2*(18+1)(r14)
+    pop r2
+    eint
--- a/samples/Assembly/lib.inc
+++ b/samples/Assembly/lib.inc
@@ -0,0 +1,170 @@
+
+; ------------------------------------------------------------------------
+; 显示 AL 中的数字
+; ------------------------------------------------------------------------
+DispAL:
+	push	ecx
+	push	edx
+	push	edi
+
+	mov	edi, [dwDispPos]
+
+	mov	ah, 0Fh			; 0000b: 黑底    1111b: 白字
+	mov	dl, al
+	shr	al, 4
+	mov	ecx, 2
+.begin:
+	and	al, 01111b
+	cmp	al, 9
+	ja	.1
+	add	al, '0'
+	jmp	.2
+.1:
+	sub	al, 0Ah
+	add	al, 'A'
+.2:
+	mov	[gs:edi], ax
+	add	edi, 2
+
+	mov	al, dl
+	loop	.begin
+	;add	edi, 2
+
+	mov	[dwDispPos], edi
+
+	pop	edi
+	pop	edx
+	pop	ecx
+
+	ret
+; DispAL 结束-------------------------------------------------------------
+
+
+; ------------------------------------------------------------------------
+; 显示一个整形数
+; ------------------------------------------------------------------------
+DispInt:
+	mov	eax, [esp + 4]
+	shr	eax, 24
+	call	DispAL
+
+	mov	eax, [esp + 4]
+	shr	eax, 16
+	call	DispAL
+
+	mov	eax, [esp + 4]
+	shr	eax, 8
+	call	DispAL
+
+	mov	eax, [esp + 4]
+	call	DispAL
+
+	mov	ah, 07h			; 0000b: 黑底    0111b: 灰字
+	mov	al, 'h'
+	push	edi
+	mov	edi, [dwDispPos]
+	mov	[gs:edi], ax
+	add	edi, 4
+	mov	[dwDispPos], edi
+	pop	edi
+
+	ret
+; DispInt 结束------------------------------------------------------------
+
+; ------------------------------------------------------------------------
+; 显示一个字符串
+; ------------------------------------------------------------------------
+DispStr:
+	push	ebp
+	mov	ebp, esp
+	push	ebx
+	push	esi
+	push	edi
+
+	mov	esi, [ebp + 8]	; pszInfo
+	mov	edi, [dwDispPos]
+	mov	ah, 0Fh
+.1:
+	lodsb
+	test	al, al
+	jz	.2
+	cmp	al, 0Ah	; 是回车吗?
+	jnz	.3
+	push	eax
+	mov	eax, edi
+	mov	bl, 160
+	div	bl
+	and	eax, 0FFh
+	inc	eax
+	mov	bl, 160
+	mul	bl
+	mov	edi, eax
+	pop	eax
+	jmp	.1
+.3:
+	mov	[gs:edi], ax
+	add	edi, 2
+	jmp	.1
+
+.2:
+	mov	[dwDispPos], edi
+
+	pop	edi
+	pop	esi
+	pop	ebx
+	pop	ebp
+	ret
+; DispStr 结束------------------------------------------------------------
+
+; ------------------------------------------------------------------------
+; 换行
+; ------------------------------------------------------------------------
+DispReturn:
+	push	szReturn
+	call	DispStr			;printf("\n");
+	add	esp, 4
+
+	ret
+; DispReturn 结束---------------------------------------------------------
+
+
+; ------------------------------------------------------------------------
+; 内存拷贝，仿 memcpy
+; ------------------------------------------------------------------------
+; void* MemCpy(void* es:pDest, void* ds:pSrc, int iSize);
+; ------------------------------------------------------------------------
+MemCpy:
+	push	ebp
+	mov	ebp, esp
+
+	push	esi
+	push	edi
+	push	ecx
+
+	mov	edi, [ebp + 8]	; Destination
+	mov	esi, [ebp + 12]	; Source
+	mov	ecx, [ebp + 16]	; Counter
+.1:
+	cmp	ecx, 0		; 判断计数器
+	jz	.2		; 计数器为零时跳出
+
+	mov	al, [ds:esi]		; ┓
+	inc	esi			; ┃
+					; ┣ 逐字节移动
+	mov	byte [es:edi], al	; ┃
+	inc	edi			; ┛
+
+	dec	ecx		; 计数器减一
+	jmp	.1		; 循环
+.2:
+	mov	eax, [ebp + 8]	; 返回值
+
+	pop	ecx
+	pop	edi
+	pop	esi
+	mov	esp, ebp
+	pop	ebp
+
+	ret			; 函数结束，返回
+; MemCpy 结束-------------------------------------------------------------
+
--- a/samples/Assembly/macros.inc
+++ b/samples/Assembly/macros.inc
@@ -0,0 +1,321 @@
+BLARGG_MACROS_INCLUDED = 1
+
+; Allows extra error checking with modified version
+; of ca65. Otherwise acts like a constant of 0.
+ADDR = 0
+
+; Switches to Segment and places Line there.
+; Line can be an .align directive, .res, .byte, etc.
+; Examples:
+; seg_data BSS, .align 256
+; seg_data RODATA, {message: .byte "Test",0}
+.macro seg_data Segment, Line
+	.pushseg
+	.segment .string(Segment)
+		Line
+	.popseg
+.endmacro
+
+; Reserves Size bytes in Segment for Name.
+; If Size is omitted, reserves one byte.
+.macro seg_res Segment, Name, Size
+	.ifblank Size
+		seg_data Segment, Name: .res 1
+	.else
+		seg_data Segment, Name: .res Size
+	.endif
+.endmacro
+
+; Shortcuts for zeropage, bss, and stack
+.define zp_res  seg_res ZEROPAGE,
+.define nv_res  seg_res NVRAM,
+.define bss_res seg_res BSS,
+.define sp_res  seg_res STACK,
+.define zp_byte zp_res
+
+; Copies byte from Src to Addr. If Src begins with #,
+; it sets Addr to the immediate value.
+; Out: A = byte copied
+; Preserved: X, Y
+.macro mov Addr, Src
+	lda Src
+	sta Addr
+.endmacro
+
+; Copies word from Src to Addr. If Src begins with #,
+; it sets Addr the immediate value.
+; Out: A = high byte of word
+; Preserved: X, Y
+.macro movw Addr, Src
+	.if .match( .left( 1, {Src} ), # )
+		lda #<(.right( .tcount( {Src} )-1, {Src} ))
+		sta Addr
+		lda #>(.right( .tcount( {Src} )-1, {Src} ))
+		sta 1+(Addr)
+	.else
+		lda Src
+		sta Addr
+		lda 1+(Src)
+		sta 1+(Addr)
+	.endif
+.endmacro
+
+; Increments 16-bit value at Addr.
+; Out: EQ/NE based on resulting 16-bit value
+; Preserved: A, X, Y
+.macro incw Addr
+	.local @Skip
+	inc Addr
+	bne @Skip
+	inc 1+(Addr)
+@Skip:
+.endmacro
+
+; Adds Src to word at Addr.
+; Out: A = high byte of result, carry set appropriately
+; Preserved: X, Y
+.macro addw Addr, Src
+	.if .match( .left( 1, {Src} ), # )
+		addw_ Addr,(.right( .tcount( {Src} )-1, {Src} ))
+	.else
+		lda Addr
+		clc
+		adc Src
+		sta Addr
+		
+		lda 1+(Addr)
+		adc 1+(Src)
+		sta 1+(Addr)
+	.endif
+.endmacro
+.macro addw_ Addr, Imm
+	lda Addr
+	clc
+	adc #<Imm
+	sta Addr
+	
+	;.if (Imm >> 8) <> 0
+		lda 1+(Addr)
+		adc #>Imm
+		sta 1+(Addr)
+	;.else
+	;   .local @Skip
+	;   bcc @Skip
+	;   inc 1+(Addr)
+	;@Skip:
+	;.endif
+.endmacro
+
+; Splits list of words into tables of low and high bytes
+; Example: split_words foo, {$1234, $5678}
+; expands to:
+; foo_l: $34, $78
+; foo_h: $12, $56
+; foo_count = 2
+.macro split_words Label, Words
+	.ident (.concat (.string(Label), "_l")): .lobytes Words
+	.ident (.concat (.string(Label), "_h")): .hibytes Words
+	.ident (.concat (.string(Label), "_count")) = * - .ident (.concat (.string(Label), "_h"))
+.endmacro
+
+.macro SELECT Bool, True, False, Extra
+	.ifndef Bool
+		False Extra
+	.elseif Bool <> 0
+		True Extra
+	.else
+		False Extra
+	.endif
+.endmacro
+
+.macro DEFAULT Name, Value
+	.ifndef Name
+		Name = Value
+	.endif
+.endmacro
+
+.ifp02
+	; 6502 doesn't define these alternate names
+	.define blt bcc
+	.define bge bcs
+.endif
+.define jlt jcc
+.define jge jcs
+
+; Jxx Target = Bxx Target, except it can go farther than
+; 128 bytes. Implemented via branch around a JMP.
+
+; Don't use ca65's longbranch, because they fail for @labels
+;.macpack longbranch
+
+.macro jeq Target
+	bne *+5
+	jmp Target
+.endmacro
+
+.macro jne Target
+	beq *+5
+	jmp Target
+.endmacro
+
+.macro jmi Target
+	bpl *+5
+	jmp Target
+.endmacro
+
+.macro jpl Target
+	bmi *+5
+	jmp Target
+.endmacro
+
+.macro jcs Target
+	bcc *+5
+	jmp Target
+.endmacro
+
+.macro jcc Target
+	bcs *+5
+	jmp Target
+.endmacro
+
+.macro jvs Target
+	bvc *+5
+	jmp Target
+.endmacro
+
+.macro jvc Target
+	bvs *+5
+	jmp Target
+.endmacro
+
+
+; Passes constant data to routine in addr
+; Preserved: A, X, Y
+.macro jsr_with_addr routine,data
+	.local Addr
+	pha
+	lda #<Addr
+	sta addr
+	lda #>Addr
+	sta addr+1
+	pla
+	jsr routine
+	seg_data RODATA,{Addr: data}
+.endmacro
+
+; Calls routine multiple times, with A having the
+; value 'start' the first time, 'start+step' the
+; second time, up to 'end' for the last time.
+.macro for_loop routine,start,end,step
+	.local @for_loop
+	lda #start
+@for_loop:
+	pha
+	jsr routine
+	pla
+	clc
+	adc #step
+	cmp #<((end)+(step))
+	bne @for_loop
+.endmacro
+
+; Calls routine n times. The value of A in the routine
+; counts from 0 to n-1.
+.macro loop_n_times routine,n
+	for_loop routine,0,n-1,+1
+.endmacro
+
+; Same as for_loop, except uses 16-bit value in YX.
+; -256 <= step <= 255
+.macro for_loop16 routine,start,end,step
+.if (step) < -256 || (step) > 255
+	.error "Step must be within -256 to 255"
+.endif
+	.local @for_loop_skip
+	.local @for_loop
+	ldy #>(start)
+	lda #<(start)
+@for_loop:
+	tax
+	pha
+	tya
+	pha
+	jsr routine
+	pla
+	tay
+	pla
+	clc
+	adc #step
+.if (step) > 0
+	bcc @for_loop_skip
+	iny
+.else
+	bcs @for_loop_skip
+	dey
+.endif
+@for_loop_skip:
+	cmp #<((end)+(step))
+	bne @for_loop
+	cpy #>((end)+(step))
+	bne @for_loop
+.endmacro
+
+; Stores byte at addr
+; Preserved: X, Y
+.macro setb addr, byte
+	lda #byte
+	sta addr
+.endmacro
+
+; Stores word at addr
+; Preserved: X, Y
+.macro setw addr, word
+	lda #<(word)
+	sta addr
+	lda #>(word)
+	sta addr+1
+.endmacro
+
+; Loads XY with 16-bit immediate or value at address
+.macro ldxy Arg
+	.if .match( .left( 1, {Arg} ), # )
+		ldy #<(.right( .tcount( {Arg} )-1, {Arg} ))
+		ldx #>(.right( .tcount( {Arg} )-1, {Arg} ))
+	.else
+		ldy (Arg)
+		ldx (Arg)+1
+	.endif
+.endmacro
+
+; Increments XY as 16-bit register, in CONSTANT time.
+; Z flag set based on entire result.
+; Preserved: A
+; Time: 7 clocks
+.macro inxy
+	iny ; 2
+	beq *+4 ; 3
+		; -1
+	bne *+3 ; 3
+		; -1
+	inx ; 2
+.endmacro
+
+; Negates A and adds it to operand
+.macro subaf Operand
+	eor #$FF
+	sec
+	adc Operand
+.endmacro
+
+; Initializes CPU registers to reasonable values
+; Preserved: A, Y
+.macro init_cpu_regs
+	sei
+	cld     ; unnecessary on NES, but might help on clone
+	ldx #$FF
+	txs
+	.ifndef BUILD_NSF
+		inx
+		stx PPUCTRL
+	.endif
+.endmacro
--- a/samples/Awk/test.awk
+++ b/samples/Awk/test.awk
@@ -0,0 +1,121 @@
+#!/bin/awk -f
+
+BEGIN {
+  # It is not possible to define output file names here because
+  # FILENAME is not define in the BEGIN section
+  n = "";
+  printf "Generating data files ...";
+  network_max_bandwidth_in_byte = 10000000;
+  network_max_packet_per_second = 1000000;
+  last3 = 0;
+  last4 = 0;
+  last5 = 0;
+  last6 = 0;
+}
+{
+  if ($1 ~ /Average/)
+    { # Skip the Average values
+      n = "";
+      next;
+    }
+
+  if ($2 ~ /all/)
+    { # This is the cpu info
+      print $3 > FILENAME".cpu.user.dat";
+#	  print $4 > FILENAME".cpu.nice.dat";
+      print $5 > FILENAME".cpu.system.dat";
+#     print $6 > FILENAME".cpu.iowait.dat";
+      print $7 > FILENAME".cpu.idle.dat";
+      print 100-$7 > FILENAME".cpu.busy.dat";
+    }
+  if ($2 ~ /eth0/)
+    { # This is the eth0 network info
+      if ($3 > network_max_packet_per_second)
+	print last3 > FILENAME".net.rxpck.dat"; # Total number of packets received per second.
+      else
+	{
+	  last3 = $3;
+	  print $3 > FILENAME".net.rxpck.dat"; # Total number of packets received per second.
+	}
+      if ($4 > network_max_packet_per_second)
+	print last4 > FILENAME".net.txpck.dat"; # Total number of packets transmitted per second.
+      else
+	{
+	  last4 = $4;
+	  print $4 > FILENAME".net.txpck.dat"; # Total number of packets transmitted per second.
+	}
+      if ($5 > network_max_bandwidth_in_byte)
+	print last5 > FILENAME".net.rxbyt.dat"; # Total number of bytes received per second.
+      else
+	{
+	  last5 = $5;
+	  print $5 > FILENAME".net.rxbyt.dat"; # Total number of bytes received per second.
+	}
+      if ($6 > network_max_bandwidth_in_byte)
+	print last6 > FILENAME".net.txbyt.dat"; # Total number of bytes transmitted per second.
+      else
+	{
+	  last6 = $6;
+	  print $6 > FILENAME".net.txbyt.dat"; # Total number of bytes transmitted per second.
+	}
+#     print $7 > FILENAME".net.rxcmp.dat"; # Number of compressed packets received per second (for cslip etc.).
+#     print $8 > FILENAME".net.txcmp.dat"; # Number of compressed packets transmitted per second.
+#     print $9 > FILENAME".net.rxmcst.dat"; # Number of multicast packets received per second.
+    }
+
+  # Detect which is the next info to be parsed
+  if ($2 ~ /proc|cswch|tps|kbmemfree|totsck/)
+    {
+      n = $2;
+    }
+
+  # Only get lines with numbers (real data !)
+  if ($2 ~ /[0-9]/)
+    {
+      if (n == "proc/s")
+	{ # This is the proc/s info
+	  print $2 > FILENAME".proc.dat";
+#	  n = "";
+	}
+      if (n == "cswch/s")
+	{ # This is the context switches per second info
+	  print $2 > FILENAME".ctxsw.dat";
+#	  n = "";
+	}
+      if (n == "tps")
+	{ # This is the disk info
+	  print $2 > FILENAME".disk.tps.dat"; # total transfers per second
+	  print $3 > FILENAME".disk.rtps.dat"; # read requests per second
+	  print $4 > FILENAME".disk.wtps.dat"; # write requests per second
+	  print $5 > FILENAME".disk.brdps.dat"; # block reads per second
+	  print $6 > FILENAME".disk.bwrps.dat"; # block writes per second
+#	  n = "";
+	}
+      if (n == "kbmemfree")
+	{ # This is the mem info
+	  print $2 > FILENAME".mem.kbmemfree.dat"; # Amount of free memory available in kilobytes.
+	  print $3 > FILENAME".mem.kbmemused.dat"; # Amount of used memory in kilobytes. This does not take into account memory used by the kernel itself.
+	  print $4 > FILENAME".mem.memused.dat"; # Percentage of used memory.
+#         It appears the kbmemshrd has been removed from the sysstat output - ntolia
+#	  print $X > FILENAME".mem.kbmemshrd.dat"; # Amount of memory shared by the system in kilobytes.  Always zero with 2.4 kernels.
+#	  print $5 > FILENAME".mem.kbbuffers.dat"; # Amount of memory used as buffers by the kernel in kilobytes.
+	  print $6 > FILENAME".mem.kbcached.dat"; # Amount of memory used to cache data by the kernel in kilobytes.
+#	  print $7 > FILENAME".mem.kbswpfree.dat"; # Amount of free swap space in kilobytes.
+#	  print $8 > FILENAME".mem.kbswpused.dat"; # Amount of used swap space in kilobytes.
+	  print $9 > FILENAME".mem.swpused.dat"; # Percentage of used swap space.
+#	  n = "";
+ 	}
+      if (n == "totsck")
+	{ # This is the socket info
+	  print $2 > FILENAME".sock.totsck.dat"; # Total number of used sockets.
+	  print $3 > FILENAME".sock.tcpsck.dat"; # Number of TCP sockets currently in use.
+#	  print $4 > FILENAME".sock.udpsck.dat"; # Number of UDP sockets currently in use.
+#	  print $5 > FILENAME".sock.rawsck.dat"; # Number of RAW sockets currently in use.
+#	  print $6 > FILENAME".sock.ip-frag.dat"; # Number of IP fragments currently in use.
+#	  n = "";
+ 	}
+    }
+}
+END {
+  print " '" FILENAME "' done.";
+}
--- a/samples/BitBake/gstreamer-libav.bb
+++ b/samples/BitBake/gstreamer-libav.bb
@@ -0,0 +1,25 @@
+include gstreamer1.0-libav.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
+                    file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
+                    file://gst-libs/ext/libav/LICENSE;md5=23a54f59b82572c203a559346e89ed57 \
+                    file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
+                    file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
+
+SRC_URI = " \
+    http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \
+    file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \
+    "
+SRC_URI[md5sum] = "86540dee14d31daf976eb2713f2294f3"
+SRC_URI[sha256sum] = "585eb7971006100ad771a852e07bd2f3e23bcc6eb0b1253a40b5a0e40e4e7418"
+
+LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \
+  --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \
+  --ranlib='${RANLIB}' \
+  ${GSTREAMER_1_0_DEBUG}"
+
+S = "${WORKDIR}/gst-libav-${PV}"
+
--- a/samples/BitBake/qtbase-native.bb
+++ b/samples/BitBake/qtbase-native.bb
@@ -0,0 +1,13 @@
+require qt5-git.inc
+require ${PN}.inc
+
+do_install_append() {
+    # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
+    # e.g. qt3d, qtwayland
+    ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
+}
+
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 168 commits
+SRCREV = "08cbbde61778276ccdda73d89fd64d02c623779f"
+
--- a/samples/BlitzBasic/HalfAndDouble.bb
+++ b/samples/BlitzBasic/HalfAndDouble.bb
@@ -0,0 +1,147 @@
+
+Local bk = CreateBank(8)
+PokeFloat bk, 0, -1
+Print Bin(PeekInt(bk, 0))
+Print %1000000000000000
+Print Bin(1 Shl 31)
+Print $1f
+Print $ff
+Print $1f + (127 - 15)
+Print Hex(%01111111100000000000000000000000)
+Print Hex(~%11111111100000000000000000000000)
+
+Print Bin(FloatToHalf(-2.5))
+Print HalfToFloat(FloatToHalf(-200000000000.0))
+
+Print Bin(FToI(-2.5))
+
+WaitKey
+End
+
+
+; Half-precision (16-bit) arithmetic library
+;============================================
+
+Global Half_CBank_
+
+Function FToI(f#)
+	If Half_CBank_ = 0 Then Half_CBank_ = CreateBank(4)
+	PokeFloat Half_CBank_, 0, f
+	Return PeekInt(Half_CBank_, 0)
+End Function
+
+Function HalfToFloat#(h)
+	Local signBit, exponent, fraction, fBits
+	
+	signBit = (h And 32768) <> 0
+	exponent = (h And %0111110000000000) Shr 10
+	fraction = (h And %0000001111111111)
+	
+	If exponent = $1F Then exponent = $FF : ElseIf exponent Then exponent = (exponent - 15) + 127
+	fBits = (signBit Shl 31) Or (exponent Shl 23) Or (fraction Shl 13)
+	
+	If Half_CBank_ = 0 Then Half_CBank_ = CreateBank(4)
+	PokeInt Half_CBank_, 0, fBits
+	Return PeekFloat(Half_CBank_, 0)
+End Function
+
+Function FloatToHalf(f#)
+	Local signBit, exponent, fraction, fBits
+	
+	If Half_CBank_ = 0 Then Half_CBank_ = CreateBank(4)
+	PokeFloat Half_CBank_, 0, f
+	fBits = PeekInt(Half_CBank_, 0)
+	
+	signBit = (fBits And (1 Shl 31)) <> 0
+	exponent = (fBits And $7F800000) Shr 23
+	fraction = fBits And $007FFFFF
+	
+	If exponent
+		exponent = exponent - 127
+		If Abs(exponent) > $1F
+			If exponent <> ($FF - 127) Then fraction = 0
+			exponent = $1F * Sgn(exponent)
+		Else
+			exponent = exponent + 15
+		EndIf
+		exponent = exponent And %11111
+	EndIf
+	fraction = fraction Shr 13
+	
+	Return (signBit Shl 15) Or (exponent Shl 10) Or fraction
+End Function
+
+Function HalfAdd(l, r)
+	
+End Function
+
+Function HalfSub(l, r)
+	
+End Function
+
+Function HalfMul(l, r)
+	
+End Function
+
+Function HalfDiv(l, r)
+	
+End Function
+
+Function HalfLT(l, r)
+	
+End Function
+
+Function HalfGT(l, r)
+	
+End Function
+
+
+; Double-precision (64-bit) arithmetic library)
+;===============================================
+
+Global DoubleOut[1], Double_CBank_
+
+Function DoubleToFloat#(d[1])
+	
+End Function
+
+Function FloatToDouble(f#)
+	
+End Function
+
+Function IntToDouble(i)
+	
+End Function
+
+Function SefToDouble(s, e, f)
+	
+End Function
+
+Function DoubleAdd(l, r)
+	
+End Function
+
+Function DoubleSub(l, r)
+	
+End Function
+
+Function DoubleMul(l, r)
+	
+End Function
+
+Function DoubleDiv(l, r)
+	
+End Function
+
+Function DoubleLT(l, r)
+	
+End Function
+
+Function DoubleGT(l, r)
+	
+End Function
+
+
+;~IDEal Editor Parameters:
+;~F#1A#20#2F
+;~C#Blitz3D
--- a/samples/BlitzBasic/LList.bb
+++ b/samples/BlitzBasic/LList.bb
@@ -0,0 +1,369 @@
+
+; Double-linked list container class
+;====================================
+
+; with thanks to MusicianKool, for concept and issue fixes
+
+
+Type LList
+	Field head_.ListNode
+	Field tail_.ListNode
+End Type
+
+Type ListNode
+	Field pv_.ListNode
+	Field nx_.ListNode
+	Field Value
+End Type
+
+Type Iterator
+	Field Value
+	Field l_.LList
+	Field cn_.ListNode, cni_
+End Type
+
+
+;Create a new LList object
+Function CreateList.LList()
+	Local l.LList = New LList
+	
+	l\head_ = New ListNode
+	l\tail_ = New ListNode
+	
+	l\head_\nx_ = l\tail_		;End caps
+	l\head_\pv_ = l\head_		;These make it more or less safe to iterate freely
+	l\head_\Value = 0
+	
+	l\tail_\nx_ = l\tail_
+	l\tail_\pv_ = l\head_
+	l\tail_\Value = 0
+	
+	Return l
+End Function
+
+;Free a list and all elements (not any values)
+Function FreeList(l.LList)
+	ClearList l
+	Delete l\head_
+	Delete l\tail_
+	Delete l
+End Function
+
+;Remove all the elements from a list (does not free values)
+Function ClearList(l.LList)
+	Local n.ListNode = l\head_\nx_
+	While n <> l\tail_
+		Local nx.ListNode = n\nx_
+		Delete n
+		n = nx
+	Wend
+	l\head_\nx_ = l\tail_
+	l\tail_\pv_ = l\head_
+End Function
+
+;Count the number of elements in a list (slow)
+Function ListLength(l.LList)
+	Local i.Iterator = GetIterator(l), elems
+	While EachIn(i)
+		elems = elems + 1
+	Wend
+	Return elems
+End Function
+
+;Return True if a list contains a given value
+Function ListContains(l.LList, Value)
+	Return (ListFindNode(l, Value) <> Null)
+End Function
+
+;Create a linked list from the intvalues in a bank (slow)
+Function ListFromBank.LList(bank)
+	Local l.LList = CreateList()
+	Local size = BankSize(bank), p
+	
+	For p = 0 To size - 4 Step 4
+		ListAddLast l, PeekInt(bank, p)
+	Next
+	
+	Return l
+End Function
+
+;Create a bank containing all the values in a list (slow)
+Function ListToBank(l.LList)
+	Local size = ListLength(l) * 4
+	Local bank = CreateBank(size)
+	
+	Local i.Iterator = GetIterator(l), p = 0
+	While EachIn(i)
+		PokeInt bank, p, i\Value
+		p = p + 4
+	Wend
+	
+	Return bank
+End Function
+
+;Swap the contents of two list objects
+Function SwapLists(l1.LList, l2.LList)
+	Local tempH.ListNode = l1\head_, tempT.ListNode = l1\tail_
+	l1\head_ = l2\head_
+	l1\tail_ = l2\tail_
+	l2\head_ = tempH
+	l2\tail_ = tempT
+End Function
+
+;Create a new list containing the same values as the first
+Function CopyList.LList(lo.LList)
+	Local ln.LList = CreateList()
+	Local i.Iterator = GetIterator(lo) : While EachIn(i)
+		ListAddLast ln, i\Value
+	Wend
+	Return ln
+End Function
+
+;Reverse the order of elements of a list
+Function ReverseList(l.LList)
+	Local n1.ListNode, n2.ListNode, tmp.ListNode
+	
+	n1 = l\head_
+	n2 = l\head_\nx_
+	
+	While n1 <> l\tail_
+		n1\pv_ = n2
+		tmp = n2\nx_
+		n2\nx_ = n1
+		n1 = n2
+		n2 = tmp
+	Wend
+	
+	tmp = l\head_
+	l\head_ = l\tail_
+	l\tail_ = tmp
+	
+	l\head_\pv_ = l\head_
+	l\tail_\nx_ = l\tail_
+End Function
+
+;Search a list to retrieve the first node with the given value
+Function ListFindNode.ListNode(l.LList, Value)
+	Local n.ListNode = l\head_\nx_
+	
+	While n <> l\tail_
+		If n\Value = Value Then Return n
+		n = n\nx_
+	Wend
+	
+	Return Null
+End Function
+
+;Append a value to the end of a list (fast) and return the node
+Function ListAddLast.ListNode(l.LList, Value)
+	Local n.ListNode = New ListNode
+	
+	n\pv_ = l\tail_\pv_
+	n\nx_ = l\tail_
+	n\Value = Value
+	
+	l\tail_\pv_ = n
+	n\pv_\nx_ = n
+	
+	Return n
+End Function
+
+;Attach a value to the start of a list (fast) and return the node
+Function ListAddFirst.ListNode(l.LList, Value)
+	Local n.ListNode = New ListNode
+	
+	n\pv_ = l\head_
+	n\nx_ = l\head_\nx_
+	n\Value = Value
+	
+	l\head_\nx_ = n
+	n\nx_\pv_ = n
+	
+	Return n
+End Function
+
+;Remove the first occurence of the given value from a list
+Function ListRemove(l.LList, Value)
+	Local n.ListNode = ListFindNode(l, Value)
+	If n <> Null Then RemoveListNode n
+End Function
+
+;Remove a node from a list
+Function RemoveListNode(n.ListNode)
+	n\pv_\nx_ = n\nx_
+	n\nx_\pv_ = n\pv_
+	Delete n
+End Function
+
+;Return the value of the element at the given position from the start of the list,
+;or backwards from the end of the list for a negative index
+Function ValueAtIndex(l.LList, index)
+	Local n.ListNode = ListNodeAtIndex(l, index)
+	If n <> Null Then Return n\Value : Else Return 0
+End Function
+
+;Return the ListNode at the given position from the start of the list, or backwards
+;from the end of the list for a negative index, or Null if invalid
+Function ListNodeAtIndex.ListNode(l.LList, index)
+	Local e, n.ListNode
+	
+	If index >= 0
+		n = l\head_
+		For e = 0 To index
+			n = n\nx_
+		Next
+		If n = l\tail_ Then n = Null	;Beyond the end of the list - not valid
+		
+	Else	;Negative index - count backward
+		n = l\tail_
+		For e = 0 To index Step -1
+			n = n\pv_
+		Next
+		If n = l\head_ Then n = Null	;Before the start of the list - not valid
+		
+	EndIf
+	
+	Return n
+End Function
+
+;Replace a value at the given position (added by MusicianKool)
+Function ReplaceValueAtIndex(l.LList,index,value)
+	Local n.ListNode = ListNodeAtIndex(l,index)
+	If n <> Null Then n\Value = value:Else Return 0
+End Function
+
+;Remove and return a value at the given position (added by MusicianKool)
+Function RemoveNodeAtIndex(l.LList,index)
+	Local n.ListNode = ListNodeAtIndex(l,index),tval
+	If n <> Null Then tval = n\Value:RemoveListNode(n):Return tval:Else Return 0
+End Function
+
+;Retrieve the first value from a list
+Function ListFirst(l.LList)
+	If l\head_\nx_ <> l\tail_ Then Return l\head_\nx_\Value
+End Function
+
+;Retrieve the last value from a list
+Function ListLast(l.LList)
+	If l\tail_\pv_ <> l\head_ Then Return l\tail_\pv_\Value
+End Function
+
+;Remove the first element from a list, and return its value
+Function ListRemoveFirst(l.LList)
+	Local val
+	If l\head_\nx_ <> l\tail_
+		val = l\head_\nx_\Value
+		RemoveListNode l\head_\nx_
+	EndIf
+	Return val
+End Function
+
+;Remove the last element from a list, and return its value
+Function ListRemoveLast(l.LList)
+	Local val
+	If l\tail_\pv_ <> l\head_
+		val = l\tail_\pv_\Value
+		RemoveListNode l\tail_\pv_
+	EndIf
+	Return val
+End Function
+
+;Insert a value into a list before the specified node, and return the new node
+Function InsertBeforeNode.ListNode(Value, n.ListNode)
+	Local bef.ListNode = New ListNode
+	
+	bef\pv_ = n\pv_
+	bef\nx_ = n
+	bef\Value = Value
+	
+	n\pv_ = bef
+	bef\pv_\nx_ = bef
+	
+	Return bef
+End Function
+
+;Insert a value into a list after the specified node, and return then new node
+Function InsertAfterNode.ListNode(Value, n.ListNode)
+	Local aft.ListNode = New ListNode
+	
+	aft\nx_ = n\nx_
+	aft\pv_ = n
+	aft\Value = Value
+	
+	n\nx_ = aft
+	aft\nx_\pv_ = aft
+	
+	Return aft
+End Function
+
+;Get an iterator object to use with a loop
+;This function means that most programs won't have to think about deleting iterators manually
+;(in general only a small, constant number will be created)
+Function GetIterator.Iterator(l.LList)
+	Local i.Iterator
+	
+	If l = Null Then RuntimeError "Cannot create Iterator for Null"
+	
+	For i = Each Iterator		;See if there's an available iterator at the moment
+		If i\l_ = Null Then Exit
+	Next
+	
+	If i = Null Then i = New Iterator	;If there wasn't, create one
+	
+	i\l_ = l
+	i\cn_ = l\head_
+	i\cni_ = -1
+	i\Value = 0		;No especial reason why this has to be anything, but meh
+	
+	Return i
+End Function
+
+;Use as the argument to While to iterate over the members of a list
+Function EachIn(i.Iterator)
+	
+	i\cn_ = i\cn_\nx_
+	
+	If i\cn_ <> i\l_\tail_		;Still items in the list
+		i\Value = i\cn_\Value
+		i\cni_ = i\cni_ + 1
+		Return True
+		
+	Else
+		i\l_ = Null		;Disconnect from the list, having reached the end
+		i\cn_ = Null
+		i\cni_ = -1
+		Return False
+		
+	EndIf
+End Function
+
+;Remove from the containing list the element currently pointed to by an iterator
+Function IteratorRemove(i.Iterator)
+	If (i\cn_ <> i\l_\head_) And (i\cn_ <> i\l_\tail_)
+		Local temp.ListNode = i\cn_
+		
+		i\cn_ = i\cn_\pv_
+		i\cni_ = i\cni_ - 1
+		i\Value = 0
+		
+		RemoveListNode temp
+		
+		Return True
+	Else
+		Return False
+	EndIf
+End Function
+
+;Call this before breaking out of an EachIn loop, to disconnect the iterator from the list
+Function IteratorBreak(i.Iterator)
+	i\l_ = Null
+	i\cn_ = Null
+	i\cni_ = -1
+	i\Value = 0
+End Function
+
+
+;~IDEal Editor Parameters:
+;~F#5#A#10#18#2A#32#3E#47#4C#58#66#6F#78#8F#9B#A9#B7#BD#C5#CC
+;~F#E3#E9#EF#F4#F9#103#10D#11B#12B#13F#152#163
+;~C#Blitz3D
--- a/samples/BlitzBasic/PObj.bb
+++ b/samples/BlitzBasic/PObj.bb
@@ -0,0 +1,66 @@
+
+Local i, start, result
+
+Local s.Sum3Obj = New Sum3Obj
+
+For i = 1 To 100000
+	s = New Sum3Obj
+	result = Handle Before s
+	Delete s
+Next
+
+start = MilliSecs()
+For i = 1 To 1000000
+	result = Sum3_(MakeSum3Obj(i, i, i))
+Next
+start = MilliSecs() - start
+Print start
+
+start = MilliSecs()
+For i = 1 To 1000000
+	result = Sum3(i, i, i)
+Next
+start = MilliSecs() - start
+Print start
+
+WaitKey
+End
+
+
+Function Sum3(a, b, c)
+	Return a + b + c
+End Function
+
+
+Type Sum3Obj
+	Field isActive
+	Field a, b, c
+End Type
+
+Function MakeSum3Obj(a, b, c)
+	Local s.Sum3Obj = Last Sum3Obj
+	If s\isActive Then s = New Sum3Obj
+	s\isActive = True
+	s\a = a
+	s\b = b
+	s\c = c
+	
+	Restore label
+	Read foo
+	
+	Return Handle(s)
+End Function
+
+.label
+Data (10 + 2), 12, 14
+:
+Function Sum3_(a_)
+	Local a.Sum3Obj = Object.Sum3Obj a_
+	Local return_ =  a\a + a\b + a\c
+	Insert a Before First Sum3Obj :: a\isActive = False
+	Return return_
+End Function
+
+
+;~IDEal Editor Parameters:
+;~C#Blitz3D
--- a/samples/BlitzMax/sample.bmx
+++ b/samples/BlitzMax/sample.bmx
@@ -0,0 +1,25 @@
+SuperStrict
+
+Framework Brl.StandardIO
+
+Type TMyType
+	Field property:int
+
+	Function A:int(param:int)
+		'do nothing
+	End Function
+
+	Method B:int(param:int)
+		'do nothing
+	End Method
+End Type
+
+
+Global my:TMyType = new TMyType
+?Win32
+	my.A()
+	my.B()
+?Linux
+	my.B()
+	my.A()
+?
--- a/samples/Bluespec/TL.bsv
+++ b/samples/Bluespec/TL.bsv
@@ -0,0 +1,167 @@
+package TL;
+
+interface TL;
+   method Action ped_button_push();
+
+         (* always_enabled *)
+         method Action set_car_state_N(Bool x);
+         (* always_enabled *)
+         method Action set_car_state_S(Bool x);
+         (* always_enabled *)
+         method Action set_car_state_E(Bool x);
+         (* always_enabled *)
+         method Action set_car_state_W(Bool x);
+
+   method Bool lampRedNS();
+   method Bool lampAmberNS();
+   method Bool lampGreenNS();
+
+   method Bool lampRedE();
+   method Bool lampAmberE();
+   method Bool lampGreenE();
+
+   method Bool lampRedW();
+   method Bool lampAmberW();
+   method Bool lampGreenW();
+
+   method Bool lampRedPed();
+   method Bool lampAmberPed();
+   method Bool lampGreenPed();
+endinterface: TL
+
+typedef enum {
+         AllRed,
+         GreenNS, AmberNS,
+         GreenE, AmberE,
+         GreenW, AmberW,
+         GreenPed, AmberPed} TLstates deriving (Eq, Bits);
+
+typedef UInt#(5) Time32;
+typedef UInt#(20) CtrSize;
+
+(* synthesize *)
+module sysTL(TL);
+   Time32 allRedDelay = 2;
+   Time32 amberDelay = 4;
+   Time32 nsGreenDelay = 20;
+   Time32 ewGreenDelay = 10;
+   Time32 pedGreenDelay = 10;
+   Time32 pedAmberDelay = 6;
+
+   CtrSize clocks_per_sec = 100;
+
+   Reg#(TLstates) state <- mkReg(AllRed);
+   Reg#(TLstates) next_green <- mkReg(GreenNS);
+   Reg#(Time32) secs <- mkReg(0);
+   Reg#(Bool) ped_button_pushed <- mkReg(False);
+         Reg#(Bool) car_present_N <- mkReg(True);
+   Reg#(Bool) car_present_S <- mkReg(True);
+   Reg#(Bool) car_present_E <- mkReg(True);
+   Reg#(Bool) car_present_W <- mkReg(True);
+         Bool car_present_NS = car_present_N || car_present_S;
+   Reg#(CtrSize) cycle_ctr <- mkReg(0);
+
+   rule dec_cycle_ctr (cycle_ctr != 0);
+      cycle_ctr <= cycle_ctr - 1;
+   endrule
+
+   Rules low_priority_rule = (rules
+                        rule inc_sec (cycle_ctr == 0);
+                                 secs <= secs + 1;
+                                 cycle_ctr <= clocks_per_sec;
+                        endrule endrules);
+
+   function Action next_state(TLstates ns);
+         action
+                                 state <= ns;
+                                 secs <= 0;
+      endaction
+   endfunction: next_state
+
+   function TLstates green_seq(TLstates x);
+      case (x)
+                                 GreenNS: return (GreenE);
+                                 GreenE:  return (GreenW);
+                                 GreenW:  return (GreenNS);
+      endcase
+   endfunction
+
+   function Bool car_present(TLstates x);
+      case (x)
+                                 GreenNS: return (car_present_NS);
+                                 GreenE:  return (car_present_E);
+                                 GreenW:  return (car_present_W);
+      endcase
+   endfunction
+
+   function Rules make_from_green_rule(TLstates green_state, Time32 delay, Bool car_is_present, TLstates ns);
+                        return (rules
+                                 rule from_green (state == green_state && (secs >= delay || !car_is_present));
+                                                next_state(ns);
+                                 endrule endrules);
+   endfunction: make_from_green_rule
+
+   function Rules make_from_amber_rule(TLstates amber_state, TLstates ng);
+      return (rules
+                                 rule from_amber (state == amber_state && secs >= amberDelay);
+                                                next_state(AllRed);
+                                                next_green <= ng;
+                                 endrule endrules);
+   endfunction: make_from_amber_rule
+
+   Rules hprs[7];
+
+   hprs[1] = make_from_green_rule(GreenNS, nsGreenDelay, car_present_NS, AmberNS);
+   hprs[2] = make_from_amber_rule(AmberNS, GreenE);
+   hprs[3] = make_from_green_rule(GreenE, ewGreenDelay, car_present_E, AmberE);
+   hprs[4] = make_from_amber_rule(AmberE, GreenW);
+   hprs[5] = make_from_green_rule(GreenW, ewGreenDelay, car_present_W, AmberW);
+   hprs[6] = make_from_amber_rule(AmberW, GreenNS);
+
+         hprs[0] = (rules
+                        rule fromAllRed (state == AllRed && secs >= allRedDelay);
+                                 if (ped_button_pushed) action
+                                                ped_button_pushed <= False;
+                                                next_state(GreenPed);
+                                 endaction else if (car_present(next_green))
+                              next_state(next_green);
+                           else if (car_present(green_seq(next_green)))
+                                    next_state(green_seq(next_green));
+         else if (car_present(green_seq(green_seq(next_green))))
+                                    next_state(green_seq(green_seq(next_green)));
+         else
+                                    noAction;
+                        endrule: fromAllRed endrules);
+
+         Rules high_priority_rules = hprs[0];
+   for (Integer i = 1; i<7; i=i+1)
+      high_priority_rules = rJoin(hprs[i], high_priority_rules);
+
+         addRules(preempts(high_priority_rules, low_priority_rule));
+
+   method Action ped_button_push();
+      ped_button_pushed <= True;
+   endmethod: ped_button_push
+
+   method Action set_car_state_N(b) ; car_present_N <= b; endmethod
+   method Action set_car_state_S(b) ; car_present_S <= b; endmethod
+   method Action set_car_state_E(b) ; car_present_E <= b; endmethod
+   method Action set_car_state_W(b) ; car_present_W <= b; endmethod
+
+   method lampRedNS() = (!(state == GreenNS || state == AmberNS));
+   method lampAmberNS() = (state == AmberNS);
+   method lampGreenNS() = (state == GreenNS);
+   method lampRedE() = (!(state == GreenE || state == AmberE));
+   method lampAmberE() = (state == AmberE);
+   method lampGreenE() = (state == GreenE);
+   method lampRedW() = (!(state == GreenW || state == AmberW));
+   method lampAmberW() = (state == AmberW);
+   method lampGreenW() = (state == GreenW);
+
+   method lampRedPed() = (!(state == GreenPed || state == AmberPed));
+   method lampAmberPed() = (state == AmberPed);
+   method lampGreenPed() = (state == GreenPed);
+
+endmodule: sysTL
+
+endpackage: TL
--- a/samples/Bluespec/TbTL.bsv
+++ b/samples/Bluespec/TbTL.bsv
@@ -0,0 +1,109 @@
+package TbTL;
+
+import TL::*;
+
+interface Lamp;
+   method Bool changed;
+   method Action show_offs;
+   method Action show_ons;
+   method Action reset;
+endinterface
+
+module mkLamp#(String name, Bool lamp)(Lamp);
+   Reg#(Bool) prev <- mkReg(False);
+
+   method changed = (prev != lamp);
+
+   method Action show_offs;
+      if (prev && !lamp)
+      $write (name + " off, ");
+   endmethod
+
+   method Action show_ons;
+      if (!prev && lamp)
+      $write (name + " on, ");
+   endmethod
+
+   method Action reset;
+      prev <= lamp;
+   endmethod
+endmodule
+
+
+(* synthesize *)
+module mkTest();
+   let dut <- sysTL;
+
+   Reg#(Bit#(16)) ctr <- mkReg(0);
+
+   Reg#(Bool) carN <- mkReg(False);
+   Reg#(Bool) carS <- mkReg(False);
+   Reg#(Bool) carE <- mkReg(False);
+   Reg#(Bool) carW <- mkReg(False);
+
+   Lamp lamps[12];
+
+   lamps[0] <- mkLamp("0:  NS  red  ", dut.lampRedNS);
+   lamps[1] <- mkLamp("1:  NS  amber", dut.lampAmberNS);
+   lamps[2] <- mkLamp("2:  NS  green", dut.lampGreenNS);
+   lamps[3] <- mkLamp("3:  E   red  ", dut.lampRedE);
+   lamps[4] <- mkLamp("4:  E   amber", dut.lampAmberE);
+   lamps[5] <- mkLamp("5:  E   green", dut.lampGreenE);
+   lamps[6] <- mkLamp("6:  W   red  ", dut.lampRedW);
+   lamps[7] <- mkLamp("7:  W   amber", dut.lampAmberW);
+   lamps[8] <- mkLamp("8:  W   green", dut.lampGreenW);
+
+   lamps[9]  <- mkLamp("9:  Ped red  ", dut.lampRedPed);
+   lamps[10] <- mkLamp("10: Ped amber", dut.lampAmberPed);
+   lamps[11] <- mkLamp("11: Ped green", dut.lampGreenPed);
+
+   rule start (ctr == 0);
+      $dumpvars;
+   endrule
+
+   rule detect_cars;
+      dut.set_car_state_N(carN);
+      dut.set_car_state_S(carS);
+      dut.set_car_state_E(carE);
+      dut.set_car_state_W(carW);
+   endrule
+
+   rule go;
+      ctr <= ctr + 1;
+      if (ctr == 5000) carN <= True;
+      if (ctr == 6500) carN <= False;
+      if (ctr == 12_000) dut.ped_button_push;
+   endrule
+
+   rule stop (ctr > 32768);
+      $display("TESTS FINISHED");
+      $finish(0);
+   endrule
+
+   function do_offs(l) = l.show_offs;
+      function do_ons(l) = l.show_ons;
+      function do_reset(l) = l.reset;
+
+      function do_it(f);
+         action
+         for (Integer i=0; i<12; i=i+1)
+            f(lamps[i]);
+         endaction
+      endfunction
+
+      function any_changes();
+         Bool b = False;
+         for (Integer i=0; i<12; i=i+1)
+             b = b || lamps[i].changed;
+         return b;
+      endfunction
+
+      rule show (any_changes());
+      do_it(do_offs);
+      do_it(do_ons);
+      do_it(do_reset);
+      $display("(at time %d)", $time);
+   endrule
+endmodule
+
+endpackage
--- a/samples/Brainfuck/factor.b
+++ b/samples/Brainfuck/factor.b
@@ -0,0 +1,195 @@
+* factor an arbitrarily large positive integer
+*
+* Copyright (C) 1999 by Brian Raiter
+* under the GNU General Public License
+
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>-
+
+*
+* read in the number
+*
+
+<<<<<<<<<+
+[-[>>>>>>>>>>][-]<<<<<<<<<<[[->>>>>>>>>>+<<<<<<<<<<]<<<<<<<<<<]
+  >>>>>>>>>>,----------]
+>>>>>>>>>>[------------------------------------->>>>>>>>>->]
+<[+>[>>>>>>>>>+>]<-<<<<<<<<<<]-
+
+*
+* display the number and initialize the loop variable to two
+*
+
+[>++++++++++++++++++++++++++++++++++++++++++++++++.
+  ------------------------------------------------<<<<<<<<<<<]
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++.
+--------------------------.[-]
+>>>>>>>>>>>>++<<<<+
+
+*
+* the main loop
+*
+
+[ [-]>>
+
+  *
+  * make copies of the number and the loop variable
+  *
+
+  [>>>>[-]>[-]>[-]>[-]
+    >[-]>[-]
+    <<<<<<<[->>>+>+<<<<]>>>>>>>>]
+  <<<<<<<<<<[>>>>>>[-<<<<+>>>>]<<<<<<<<<<<<<<<<]>>>>>>>>>>
+  [>[->>>+>>+<<<<<]>>>>>>>>>]
+  <<<<<<<<<<[>>>>>>[-<<<<<+>>>>>]<<<<<<<<<<<<<<<<]>>>>>>>>>>
+
+  *
+  * divide the number by the loop variable
+  *
+
+  [>>>[-]>>>[-]>[-]>>>]                                  initialize
+  <<<<<<<<<<[<<<<<<<<<<]
+  >>>>>>>>>[-]>>>>>>>+<<<<<<<<[+]+
+  [ ->>                               double divisor until above dividend
+    [>>>>>>[->++<]>>>>]<<<<<<<<<<
+    [>>>>>>>>[-]>[-]
+       <<<<[->>>++<<<]<<<<<<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>>[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<
+            [->--------->>>>>>>>>+<<<<<<<<<<[->+<]]]]]]]]]]]>>]
+    <<<<<<<<<<[>>>>>>>>>[-<+<<<+>>>>]<<<<<<<<<<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>[-<+>[-<+>[-<+>[-<+>[-<+>[-<+>[-<+>[-<+>[-<+>
+            [-<--------->>>>>>>>>>>+<<<<<<<<<<[-<+>]]]]]]]]]]]>>>]
+    <<<<<<<<<<
+    [>>>>[->>>+>>+<<<<<]<<<<<<<<<<<<<<]
+    >>>>>>>>>>[>>>>>>>[-<<<+>>>]>>>]<<<<<<<<<<
+    [>>>>>>>>[->-<]>
+      [<<<<<<<<<[<[-]>>>>>>>>>>[-<<<<<<<<<<+>>>>>>>>>>]<<<<<<<<<<<<<<<<<<<]
+        >>>>>>>>>>>>>>>>>>>]
+      <<<<<<<<<<<<<<<<<<<]
+    >>>>>>>>>[+[+[+[+[+[+[+[+[+[+[[-]<+>]]]]]]]]]]]<
+  ]
+  >>>>>>>>
+  [                                   subtract divisor from dividend
+    <<<<<<
+    [>>>>>>>>[-]>[-]<<<<<[->>>+>+<<<<]>>>>>>]<<<<<<<<<<
+    [>>>>>>>>[-<<<<+>>>>]<<<[->>>+>+<<<<]<<<<<<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>>>[-<<<<+>>>>]>]<<<<<<<<<<
+    [>>>>>>>>[-<->]<<<<<<<<<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<
+            [++++++++++[+>-<]>>>>>>>>>>-<<<<<<<<<<]]]]]]]]]]]>>>]
+    >>>>>>>+
+    [                                 if difference is nonnegative then
+      [-]<<<<<<<<<<<<<<<<<            replace dividend and increment quotient
+      [>>>>[-]>>>>[-<<<<+>>>>]<<[->>+<<]<<<<<<<<<<<<<<<<]>>>>>>>>>>
+      [>>>>>>>>[->+<<<+>>]>>]<<<<<<<<<<
+      [>>>[->>>>>>+<<<<<<]<<<<<<<<<<<<<]>>>>>>>>>>
+      [>>>>>>>>>[-<<<<<<+>>>>>>[-<<<<<<+>>>>>>
+                [-<<<<<<+>>>>>>[-<<<<<<+>>>>>>
+                [-<<<<<<+>>>>>>[-<<<<<<+>>>>>>
+                [-<<<<<<+>>>>>>[-<<<<<<+>>>>>>
+                [-<<<<<<+>>>>>>[-<<<<<<--------->>>>>>>>>>>>>>>>+<<<<<<<<<<
+                [-<<<<<<+>>>>>>]]]]]]]]]]]>]
+      >>>>>>>
+    ]                                 halve divisor and loop until zero
+    <<<<<<<<<<<<<<<<<[<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>>[-]<<[->+<]<[->>>+<<<]>>>>>]<<<<<<<<<<
+    [+>>>>>>>[-<<<<<<<+>>>>>>>[-<<<<<<<->>>>>>+>
+             [-<<<<<<<+>>>>>>>[-<<<<<<<->>>>>>+>
+             [-<<<<<<<+>>>>>>>[-<<<<<<<->>>>>>+>
+             [-<<<<<<<+>>>>>>>[-<<<<<<<->>>>>>+>
+             [-<<<<<<<+>>>>>>>]]]]]]]]]<<<<<<<
+             [->>>>>>>+<<<<<<<]-<<<<<<<<<<]
+    >>>>>>>
+    [-<<<<<<<<<<<+>>>>>>>>>>>]
+      >>>[>>>>>>>[-<<<<<<<<<<<+++++>>>>>>>>>>>]>>>]<<<<<<<<<<
+    [+>>>>>>>>[-<<<<<<<<+>>>>>>>>[-<<<<<<<<->>>>>+>>>
+              [-<<<<<<<<+>>>>>>>>[-<<<<<<<<->>>>>+>>>
+              [-<<<<<<<<+>>>>>>>>[-<<<<<<<<->>>>>+>>>
+              [-<<<<<<<<+>>>>>>>>[-<<<<<<<<->>>>>+>>>
+              [-<<<<<<<<+>>>>>>>>]]]]]]]]]<<<<<<<<
+              [->>>>>>>>+<<<<<<<<]-<<<<<<<<<<]
+    >>>>>>>>[-<<<<<<<<<<<<<+>>>>>>>>>>>>>]>>
+    [>>>>>>>>[-<<<<<<<<<<<<<+++++>>>>>>>>>>>>>]>>]<<<<<<<<<<
+    [<<<<<<<<<<]>>>>>>>>>>
+    >>>>>>
+  ]
+  <<<<<<
+
+  *
+  * make copies of the loop variable and the quotient
+  *
+
+  [>>>[->>>>+>+<<<<<]>>>>>>>]
+  <<<<<<<<<<
+  [>>>>>>>[-<<<<+>>>>]<<<<<[->>>>>+>>+<<<<<<<]<<<<<<<<<<<<]
+  >>>>>>>>>>[>>>>>>>[-<<<<<+>>>>>]>>>]<<<<<<<<<<
+
+  *
+  * break out of the loop if the quotient is larger than the loop variable
+  *
+
+  [>>>>>>>>>[-<->]<
+    [<<<<<<<<
+      [<<[-]>>>>>>>>>>[-<<<<<<<<<<+>>>>>>>>>>]<<<<<<<<<<<<<<<<<<]
+    >>>>>>>>>>>>>>>>>>]<<<<<<<<<<<<<<<<<<]
+  >>>>>>>>[>-<[+[+[+[+[+[+[+[+[+[[-]>+<]]]]]]]]]]]>+
+
+  [ [-]
+
+    *
+    * partially increment the loop variable
+    *
+
+    <[-]+>>>>+>>>>>>>>[>>>>>>>>>>]<<<<<<<<<<
+
+    *
+    * examine the remainder for nonzero digits
+    *
+
+    [<<<<<<[<<<<[<<<<<<<<<<]>>>>+<<<<<<<<<<]<<<<]
+    >>>>>>>>>>>>>>>>>>>>[>>>>>>>>>>]<<<<<<<<<<[<<<<<<<<<<]
+    >>>>-
+
+    [ [+]
+
+      *
+      * decrement the loop variable and replace the number with the quotient
+      *
+
+      >>>>>>>>-<<[>[-]>>[-<<+>>]>>>>>>>]<<<<<<<<<<
+
+      *
+      * display the loop variable
+      *
+
+      [+>>[>>>>>>>>+>>]<<-<<<<<<<<<<]-
+      [>>++++++++++++++++++++++++++++++++++++++++++++++++.
+         ------------------------------------------------<<<<<<<<<<<<]
+      ++++++++++++++++++++++++++++++++.[-]>>>>
+
+    ]
+
+    *
+    * normalize the loop variable
+    *
+
+    >>>>>>
+    [>>[->>>>>+<<<<<[->>>>>+<<<<<
+       [->>>>>+<<<<<[->>>>>+<<<<<
+       [->>>>>+<<<<<[->>>>>+<<<<<
+       [->>>>>+<<<<<[->>>>>+<<<<<
+       [->>>>>+<<<<<[->>>>>--------->>>>>+<<<<<<<<<<
+       [->>>>>+<<<<<]]]]]]]]]]]>>>>>>>>]
+    <<<<<<<<<<[>>>>>>>[-<<<<<+>>>>>]<<<<<<<<<<<<<<<<<]
+    >>>>>>>>>
+
+  ]<
+
+]>>
+
+*
+* display the number and end
+*
+
+[>>>>>>>>>>]<<<<<<<<<<[+>[>>>>>>>>>+>]<-<<<<<<<<<<]-
+[>++++++++++++++++++++++++++++++++++++++++++++++++.<<<<<<<<<<<]
++++++++++.
--- a/samples/Brainfuck/fib100.bf
+++ b/samples/Brainfuck/fib100.bf
@@ -0,0 +1,13 @@
+# Calculate and output all fibonacci numbers under 100
+
+++++++++++
+>+>>>>++++++++++++++++++++++++++++++++++++++++++++
+>++++++++++++++++++++++++++++++++<<<<<<[>[>>>>>>+>
+<<<<<<<-]>>>>>>>[<<<<<<<+>>>>>>>-]<[>++++++++++[-
+<-[>>+>+<<<-]>>>[<<<+>>>-]+<[>[-]<[-]]>[<<[>>>+<<<
+-]>>[-]]<<]>>>[>>+>+<<<-]>>>[<<<+>>>-]+<[>[-]<[-]]
+>[<<+>>[-]]<<<<<<<]>>>>>[+++++++++++++++++++++++++
+++++++++++++++++++++++.[-]]++++++++++<[->-<]>++++
++++++++++++++++++++++++++++++++++++++++++++.[-]<<
+<<<<<<<<<<[>>>+>+<<<<-]>>>>[<<<<+>>>>-]<-[>>.>.<<<
+[-]]<<[>>+>+<<<-]>>>[<<<+>>>-]<<[<+>-]>[<+>-]<<<-]
--- a/samples/Brainfuck/hello.bf
+++ b/samples/Brainfuck/hello.bf
@@ -0,0 +1,4 @@
+// More complex version of hello world
+
+>++++++++[<+++++++++>-]<.>>+>+>++>[-]+<[>[->+<<++++>]<<]>.+++++++..+++.>
+>+++++++.<<<[[-]<[-]>]<+++++++++++++++.>>.+++.------.--------.>>+.>++++.
--- a/samples/Brainfuck/helloworld.bf
+++ b/samples/Brainfuck/helloworld.bf
@@ -0,0 +1,3 @@
+// Hello World
+
++++++++[>++++[>++>+++>+++>+<<<<-]>+>+>->>+[<]<-]>>.>---.+++++++..+++.>>.<-.<.+++.------.--------.>>+.>++.
--- a/samples/Brainfuck/rot13.bf
+++ b/samples/Brainfuck/rot13.bf
@@ -0,0 +1,30 @@
+# ROT13 cipher
+
+-,+[                         Read first character and start outer character reading loop
+    -[                       Skip forward if character is 0
+        >>++++[>++++++++<-]  Set up divisor (32) for division loop
+                               (MEMORY LAYOUT: dividend copy remainder divisor quotient zero zero)
+        <+<-[                Set up dividend (x minus 1) and enter division loop
+            >+>+>-[>>>]      Increase copy and remainder / reduce divisor / Normal case: skip forward
+            <[[>+<-]>>+>]    Special case: move remainder back to divisor and increase quotient
+            <<<<<-           Decrement dividend
+        ]                    End division loop
+    ]>>>[-]+                 End skip loop; zero former divisor and reuse space for a flag
+    >--[-[<->+++[-]]]<[         Zero that flag unless quotient was 2 or 3; zero quotient; check flag
+        ++++++++++++<[       If flag then set up divisor (13) for second division loop
+                               (MEMORY LAYOUT: zero copy dividend divisor remainder quotient zero zero)
+            >-[>+>>]         Reduce divisor; Normal case: increase remainder
+            >[+[<+>-]>+>>]   Special case: increase remainder / move it back to divisor / increase quotient
+            <<<<<-           Decrease dividend
+        ]                    End division loop
+        >>[<+>-]             Add remainder back to divisor to get a useful 13
+        >[                   Skip forward if quotient was 0
+            -[               Decrement quotient and skip forward if quotient was 1
+                -<<[-]>>     Zero quotient and divisor if quotient was 2
+            ]<<[<<->>-]>>    Zero divisor and subtract 13 from copy if quotient was 1
+        ]<<[<<+>>-]          Zero divisor and add 13 to copy if quotient was 0
+    ]                        End outer skip loop (jump to here if ((character minus 1)/32) was not 2 or 3)
+    <[-]                     Clear remainder from first division if second division was skipped
+    <.[-]                    Output ROT13ed character from copy and clear it
+    <-,+                     Read next character
+]                            End character reading loop
--- a/samples/Brightscript/SimpleGrid.brs
+++ b/samples/Brightscript/SimpleGrid.brs
@@ -0,0 +1,305 @@
+' *********************************************************
+' **  Simple Grid Screen Demonstration App
+' **  Jun 2010
+' **  Copyright (c) 2010 Roku Inc. All Rights Reserved.
+' *********************************************************
+
+'************************************************************
+'** Application startup
+'************************************************************
+Sub Main()
+
+    'initialize theme attributes like titles, logos and overhang color
+    initTheme()
+  
+    gridstyle = "Flat-Movie"
+
+    'set to go, time to get started
+    while gridstyle <> ""
+        print "starting grid style= ";gridstyle
+        screen=preShowGridScreen(gridstyle)
+        gridstyle = showGridScreen(screen, gridstyle)
+    end while
+
+End Sub
+
+
+'*************************************************************
+'** Set the configurable theme attributes for the application
+'** 
+'** Configure the custom overhang and Logo attributes
+'** These attributes affect the branding of the application
+'** and are artwork, colors and offsets specific to the app
+'*************************************************************
+
+Sub initTheme()
+    app = CreateObject("roAppManager")
+    app.SetTheme(CreateDefaultTheme())
+End Sub
+
+'******************************************************
+'** @return The default application theme.
+'** Screens can make slight adjustments to the default
+'** theme by getting it from here and then overriding
+'** individual theme attributes.
+'******************************************************
+Function CreateDefaultTheme() as Object
+    theme = CreateObject("roAssociativeArray")
+
+    theme.ThemeType = "generic-dark"
+
+    ' All these are greyscales
+    theme.GridScreenBackgroundColor = "#363636"
+    theme.GridScreenMessageColor    = "#808080"
+    theme.GridScreenRetrievingColor = "#CCCCCC"
+    theme.GridScreenListNameColor   = "#FFFFFF"
+
+    ' Color values work here
+    theme.GridScreenDescriptionTitleColor    = "#001090"
+    theme.GridScreenDescriptionDateColor     = "#FF005B"
+    theme.GridScreenDescriptionRuntimeColor  = "#5B005B"
+    theme.GridScreenDescriptionSynopsisColor = "#606000"
+    
+    'used in the Grid Screen
+    theme.CounterTextLeft           = "#FF0000"
+    theme.CounterSeparator          = "#00FF00"
+    theme.CounterTextRight          = "#0000FF"
+    
+    theme.GridScreenLogoHD          = "pkg:/images/Overhang_Test_HD.png"
+
+    theme.GridScreenLogoOffsetHD_X  = "0"
+    theme.GridScreenLogoOffsetHD_Y  = "0"
+    theme.GridScreenOverhangHeightHD = "99"
+
+    theme.GridScreenLogoSD          = "pkg:/images/Overhang_Test_SD43.png"
+    theme.GridScreenOverhangHeightSD = "66"
+    theme.GridScreenLogoOffsetSD_X  = "0"
+    theme.GridScreenLogoOffsetSD_Y  = "0"
+    
+    ' to use your own focus ring artwork 
+    'theme.GridScreenFocusBorderSD        = "pkg:/images/GridCenter_Border_Movies_SD43.png"
+    'theme.GridScreenBorderOffsetSD  = "(-26,-25)"
+    'theme.GridScreenFocusBorderHD        = "pkg:/images/GridCenter_Border_Movies_HD.png"
+    'theme.GridScreenBorderOffsetHD  = "(-28,-20)"
+    
+    ' to use your own description background artwork
+    'theme.GridScreenDescriptionImageSD  = "pkg:/images/Grid_Description_Background_SD43.png"
+    'theme.GridScreenDescriptionOffsetSD = "(125,170)"
+    'theme.GridScreenDescriptionImageHD  = "pkg:/images/Grid_Description_Background_HD.png"
+    'theme.GridScreenDescriptionOffsetHD = "(190,255)"
+    
+
+    return theme
+End Function
+
+'******************************************************
+'** Perform any startup/initialization stuff prior to 
+'** initially showing the screen.  
+'******************************************************
+Function preShowGridScreen(style as string) As Object
+
+    m.port=CreateObject("roMessagePort")
+    screen = CreateObject("roGridScreen")
+    screen.SetMessagePort(m.port)
+'    screen.SetDisplayMode("best-fit")
+    screen.SetDisplayMode("scale-to-fill")
+
+    screen.SetGridStyle(style)
+    return screen
+
+End Function
+
+
+'******************************************************
+'** Display the gird screen and wait for events from 
+'** the screen. The screen will show retreiving while
+'** we fetch and parse the feeds for the show posters
+'******************************************************
+Function showGridScreen(screen As Object, gridstyle as string) As string
+
+    print "enter showGridScreen"
+
+    categoryList = getCategoryList()
+    categoryList[0] = "GridStyle: " + gridstyle
+    screen.setupLists(categoryList.count())
+    screen.SetListNames(categoryList)
+    StyleButtons = getGridControlButtons()
+    screen.SetContentList(0, StyleButtons)
+    for i = 1 to categoryList.count()-1
+        screen.SetContentList(i, getShowsForCategoryItem(categoryList[i]))
+    end for
+    screen.Show()
+
+    while true
+        print "Waiting for message"
+        msg = wait(0, m.port)
+        'msg = wait(0, screen.GetMessagePort())     ' getmessageport does not work on gridscreen
+        print "Got Message:";type(msg)
+        if type(msg) = "roGridScreenEvent" then
+            print "msg= "; msg.GetMessage() " , index= "; msg.GetIndex(); " data= "; msg.getData()
+            if msg.isListItemFocused() then
+                print"list item focused | current show = "; msg.GetIndex()
+            else if msg.isListItemSelected() then
+                row = msg.GetIndex()
+                selection = msg.getData()
+                print "list item selected row= "; row; " selection= "; selection
+
+                ' Did we get a selection from the gridstyle selection row?
+                if (row = 0)
+                    ' yes, return so we can come back with new style
+                    return StyleButtons[selection].Title
+                endif
+
+                'm.curShow = displayShowDetailScreen(showList[msg.GetIndex()])
+            else if msg.isScreenClosed() then
+                return ""
+            end if
+        end If
+    end while
+
+
+End Function
+
+'**********************************************************
+'** When a poster on the home screen is selected, we call
+'** this function passing an roAssociativeArray with the 
+'** ContentMetaData for the selected show.  This data should 
+'** be sufficient for the springboard to display
+'**********************************************************
+Function displayShowDetailScreen(category as Object, showIndex as Integer) As Integer
+
+    'add code to create springboard, for now we do nothing
+    return 1
+
+End Function
+
+
+'**************************************************************
+'** Return the list of categories to display in the filter
+'** banner. The result is an roArray containing the names of 
+'** all of the categories. All just static data for the example.
+'***************************************************************
+Function getCategoryList() As Object
+
+    categoryList = [ "GridStyle", "Reality", "History", "News", "Comedy", "Drama"]
+    return categoryList
+
+End Function
+
+
+'********************************************************************
+'** Given the category from the filter banner, return an array 
+'** of ContentMetaData objects (roAssociativeArray's) representing 
+'** the shows for the category. For this example, we just cheat and
+'** create and return a static array with just the minimal items
+'** set, but ideally, you'd go to a feed service, fetch and parse
+'** this data dynamically, so content for each category is dynamic
+'********************************************************************
+Function getShowsForCategoryItem(category As Object) As Object
+
+    print "getting shows for category "; category
+
+    showList = [
+        {
+            Title: category + ": Header",
+            releaseDate: "1976",
+            length: 3600-600,
+            Description:"This row is category " + category,
+            hdBranded: true,
+            HDPosterUrl:"http://upload.wikimedia.org/wikipedia/commons/4/43/Gold_star_on_blue.gif",
+            SDPosterUrl:"http://upload.wikimedia.org/wikipedia/commons/4/43/Gold_star_on_blue.gif",
+            Description:"Short Synopsis #1",
+            Synopsis:"Length",
+            StarRating:10,
+        }
+        {
+            Title: category + ": Beverly Hillbillies",
+            releaseDate: "1969",
+            rating: "PG",
+            Description:"Come and listen to a story about a man named Jed: Poor mountaineer, barely kept his family fed. Then one day he was shootin at some food, and up through the ground came a bubblin crude. Oil that is, black gold, Texas tea.",
+            numEpisodes:42,
+            contentType:"season",
+            HDPosterUrl:"http://upload.wikimedia.org/wikipedia/en/4/4e/The_Beverly_Hillbillies.jpg",
+            SDPosterUrl:"http://upload.wikimedia.org/wikipedia/en/4/4e/The_Beverly_Hillbillies.jpg",
+            StarRating:80,
+            UserStarRating:40
+        }
+        {
+            Title: category + ": Babylon 5",
+            releaseDate: "1996",
+            rating: "PG",
+            Description:"The show centers on the Babylon 5 space station: a focal point for politics, diplomacy, and conflict during the years 2257-2262.",
+            numEpisodes:102,
+            contentType:"season",
+            HDPosterUrl:"http://upload.wikimedia.org/wikipedia/en/9/9d/Smb5-s4.jpg",
+            SDPosterUrl:"http://upload.wikimedia.org/wikipedia/en/9/9d/Smb5-s4.jpg",
+            StarRating:80,
+            UserStarRating:40
+        }
+        {
+            Title: category + ": John F. Kennedy",
+            releaseDate: "1961",
+            rating: "PG",
+            Description:"My fellow citizens of the world: ask not what America will do for you, but what together we can do for the freedom of man.",
+            HDPosterUrl:"http://upload.wikimedia.org/wikipedia/en/5/52/Jfk_happy_birthday_1.jpg",
+            SDPosterUrl:"http://upload.wikimedia.org/wikipedia/en/5/52/Jfk_happy_birthday_1.jpg",
+            StarRating:100
+        }
+        {
+            Title: category + ": Man on the Moon",
+            releaseDate: "1969",
+            rating: "PG",
+            Description:"That's one small step for a man, one giant leap for mankind.",
+            HDPosterUrl:"http://upload.wikimedia.org/wikipedia/commons/1/1e/Apollo_11_first_step.jpg",
+            SDPosterUrl:"http://upload.wikimedia.org/wikipedia/commons/1/1e/Apollo_11_first_step.jpg",
+            StarRating:100
+        }
+        {
+            Title: category + ": I have a Dream",
+            releaseDate: "1963",
+            rating: "PG",
+            Description:"I have a dream that my four little children will one day live in a nation where they will not be judged by the color of their skin, but by the content of their character.",
+            HDPosterUrl:"http://upload.wikimedia.org/wikipedia/commons/8/81/Martin_Luther_King_-_March_on_Washington.jpg",
+            SDPosterUrl:"http://upload.wikimedia.org/wikipedia/commons/8/81/Martin_Luther_King_-_March_on_Washington.jpg",
+            StarRating:100
+        }
+    ]
+
+    return showList
+End Function
+    
+function getGridControlButtons() as object
+        buttons = [
+            { Title: "Flat-Movie"
+              ReleaseDate: "HD:5x2 SD:5x2"
+              Description: "Flat-Movie (Netflix) style"
+              HDPosterUrl:"http://upload.wikimedia.org/wikipedia/commons/4/43/Gold_star_on_blue.gif"
+              SDPosterUrl:"http://upload.wikimedia.org/wikipedia/commons/4/43/Gold_star_on_blue.gif"
+            }
+            { Title: "Flat-Landscape"
+              ReleaseDate: "HD:5x3 SD:4x3"
+              Description: "Channel Store"
+              HDPosterUrl:"http://upload.wikimedia.org/wikipedia/commons/thumb/9/96/Dunkery_Hill.jpg/800px-Dunkery_Hill.jpg",
+              SDPosterUrl:"http://upload.wikimedia.org/wikipedia/commons/thumb/9/96/Dunkery_Hill.jpg/800px-Dunkery_Hill.jpg",
+            }
+            { Title: "Flat-Portrait"
+              ReleaseDate: "HD:5x2 SD:5x2"
+              Description: "3x4 style posters"
+              HDPosterUrl:"http://upload.wikimedia.org/wikipedia/commons/9/9f/Kane_George_Gurnett.jpg",
+              SDPosterUrl:"http://upload.wikimedia.org/wikipedia/commons/9/9f/Kane_George_Gurnett.jpg",
+            }
+            { Title: "Flat-Square"
+              ReleaseDate: "HD:7x3 SD:6x3"
+              Description: "1x1 style posters"
+              HDPosterUrl:"http://upload.wikimedia.org/wikipedia/commons/thumb/d/de/SQUARE_SHAPE.svg/536px-SQUARE_SHAPE.svg.png",
+              SDPosterUrl:"http://upload.wikimedia.org/wikipedia/commons/thumb/d/de/SQUARE_SHAPE.svg/536px-SQUARE_SHAPE.svg.png",
+            }
+            { Title: "Flat-16x9"
+              ReleaseDate: "HD:5x3 SD:4x3"
+              Description: "HD style posters"
+              HDPosterUrl:"http://upload.wikimedia.org/wikipedia/commons/thumb/2/22/%C3%89cran_TV_plat.svg/200px-%C3%89cran_TV_plat.svg.png",
+              SDPosterUrl:"http://upload.wikimedia.org/wikipedia/commons/thumb/2/22/%C3%89cran_TV_plat.svg/200px-%C3%89cran_TV_plat.svg.png",
+            }
+       ]
+       return buttons
+End Function
--- a/samples/C#/AssemblyInfo.cs
+++ b/samples/C#/AssemblyInfo.cs
@@ -0,0 +1,26 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("Simple")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("1.0.*")]
+
+// The following attributes are used to specify the signing key for the assembly, 
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
--- a/samples/C#/BsonPropertyValue.cs
+++ b/samples/C#/BsonPropertyValue.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace MongoDB.Serialization.Descriptors
+{
+    internal class BsonPropertyValue
+    {
+        public bool IsDictionary { get; private set; }
+
+        public Type Type { get; private set; }
+
+        public object Value { get; private set; }
+
+        public BsonPropertyValue(Type type, object value, bool isDictionary)
+        {
+            Type = type;
+            Value = value;
+            IsDictionary = isDictionary;
+        }
+    }
+}
--- a/samples/C#/Index.cshtml
+++ b/samples/C#/Index.cshtml
@@ -0,0 +1,45 @@
+@{
+    ViewBag.Title = "Home Page";
+}
+@section featured {
+    <section class="featured">
+        <div class="content-wrapper">
+            <hgroup class="title">
+                <h1>@ViewBag.Title.</h1>
+                <h2>@ViewBag.Message</h2>
+            </hgroup>
+            <p>
+                To learn more about ASP.NET MVC visit
+                <a href="http://asp.net/mvc" title="ASP.NET MVC Website">http://asp.net/mvc</a>.
+                The page features <mark>videos, tutorials, and samples</mark> to help you get the most from ASP.NET MVC.
+                If you have any questions about ASP.NET MVC visit
+                <a href="http://forums.asp.net/1146.aspx/1?MVC" title="ASP.NET MVC Forum">our forums</a>.
+            </p>
+        </div>
+    </section>
+}
+<h3>We suggest the following:</h3>
+<ol class="round">
+    <li class="one">
+        <h5>Getting Started</h5>
+        ASP.NET MVC gives you a powerful, patterns-based way to build dynamic websites that
+        enables a clean separation of concerns and that gives you full control over markup
+        for enjoyable, agile development. ASP.NET MVC includes many features that enable
+        fast, TDD-friendly development for creating sophisticated applications that use
+        the latest web standards.
+        <a href="http://go.microsoft.com/fwlink/?LinkId=245151">Learn more…</a>
+    </li>
+
+    <li class="two">
+        <h5>Add NuGet packages and jump-start your coding</h5>
+        NuGet makes it easy to install and update free libraries and tools.
+        <a href="http://go.microsoft.com/fwlink/?LinkId=245153">Learn more…</a>
+    </li>
+
+    <li class="three">
+        <h5>Find Web Hosting</h5>
+        You can easily find a web hosting company that offers the right mix of features
+        and price for your applications.
+        <a href="http://go.microsoft.com/fwlink/?LinkId=245157">Learn more…</a>
+    </li>
+</ol>
--- a/samples/C#/MongoExpressionVisitor.cs
+++ b/samples/C#/MongoExpressionVisitor.cs
@@ -0,0 +1,153 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace MongoDB.Linq.Expressions
+{
+    internal class MongoExpressionVisitor : ExpressionVisitor
+    {
+        protected override Expression Visit(Expression exp)
+        {
+            if (exp == null)
+                return null;
+            switch ((MongoExpressionType)exp.NodeType)
+            {
+                case MongoExpressionType.Collection:
+                    return VisitCollection((CollectionExpression)exp);
+                case MongoExpressionType.Field:
+                    return VisitField((FieldExpression)exp);
+                case MongoExpressionType.Projection:
+                    return VisitProjection((ProjectionExpression)exp);
+                case MongoExpressionType.Select:
+                    return VisitSelect((SelectExpression)exp);
+                case MongoExpressionType.Aggregate:
+                    return VisitAggregate((AggregateExpression)exp);
+                case MongoExpressionType.AggregateSubquery:
+                    return VisitAggregateSubquery((AggregateSubqueryExpression)exp);
+                case MongoExpressionType.Scalar:
+                    return VisitScalar((ScalarExpression)exp);
+                default:
+                    return base.Visit(exp);
+            }
+        }
+
+        protected virtual Expression VisitAggregate(AggregateExpression aggregate)
+        {
+            var exp = Visit(aggregate.Argument);
+            if (exp != aggregate.Argument)
+                return new AggregateExpression(aggregate.Type, aggregate.AggregateType, exp, aggregate.Distinct);
+
+            return aggregate;
+        }
+
+        protected virtual Expression VisitAggregateSubquery(AggregateSubqueryExpression aggregateSubquery)
+        {
+            Expression e = Visit(aggregateSubquery.AggregateAsSubquery);
+            ScalarExpression subquery = (ScalarExpression)e;
+            if (subquery != aggregateSubquery.AggregateAsSubquery)
+                return new AggregateSubqueryExpression(aggregateSubquery.GroupByAlias, aggregateSubquery.AggregateInGroupSelect, subquery);
+            return aggregateSubquery;
+        }
+
+        protected virtual Expression VisitCollection(CollectionExpression collection)
+        {
+            return collection;
+        }
+
+        protected virtual Expression VisitField(FieldExpression field)
+        {
+            var e = Visit(field.Expression);
+            if (field.Expression != e)
+                field = new FieldExpression(e, field.Alias, field.Name);
+
+            return field;
+        }
+
+        protected virtual Expression VisitProjection(ProjectionExpression projection)
+        {
+            var source = (SelectExpression)Visit(projection.Source);
+            var projector = Visit(projection.Projector);
+            if (source != projection.Source || projector != projection.Projector)
+                return new ProjectionExpression(source, projector, projection.Aggregator);
+            return projection;
+        }
+
+        protected ReadOnlyCollection<OrderExpression> VisitOrderBy(ReadOnlyCollection<OrderExpression> orderBys)
+        {
+            if (orderBys != null) 
+            {
+                List<OrderExpression> alternate = null;
+                for (int i = 0, n = orderBys.Count; i < n; i++) 
+                {
+                    OrderExpression expr = orderBys[i];
+                    Expression e = this.Visit(expr.Expression);
+                    if (alternate == null && e != expr.Expression) 
+                        alternate = orderBys.Take(i).ToList();
+                    if (alternate != null) 
+                        alternate.Add(new OrderExpression(expr.OrderType, e));
+                }
+                if (alternate != null) 
+                    return alternate.AsReadOnly();
+            }
+            return orderBys;
+        }
+
+        protected virtual Expression VisitScalar(ScalarExpression scalar)
+        {
+            SelectExpression select = (SelectExpression)Visit(scalar.Select);
+            if (select != scalar.Select)
+                return new ScalarExpression(scalar.Type, select);
+            return scalar;
+        }
+
+        protected virtual Expression VisitSelect(SelectExpression select)
+        {
+            var from = VisitSource(select.From);
+            var where = Visit(select.Where);
+            var groupBy = Visit(select.GroupBy);
+            var orderBy = VisitOrderBy(select.OrderBy);
+            var skip = Visit(select.Skip);
+            var take = Visit(select.Take);
+            var fields = VisitFieldDeclarationList(select.Fields);
+            if (from != select.From || where != select.Where || orderBy != select.OrderBy || groupBy != select.GroupBy || skip != select.Skip || take != select.Take || fields != select.Fields)
+                return new SelectExpression(select.Alias, fields, from, where, orderBy, groupBy, select.IsDistinct, skip, take);
+            return select;
+        }
+
+        protected virtual Expression VisitSource(Expression source)
+        {
+            return Visit(source);
+        }
+
+        protected virtual Expression VisitSubquery(SubqueryExpression subquery)
+        {
+            switch ((MongoExpressionType)subquery.NodeType)
+            {
+                case MongoExpressionType.Scalar:
+                    return VisitScalar((ScalarExpression)subquery);
+            }
+            return subquery;
+        }
+
+        protected virtual ReadOnlyCollection<FieldDeclaration> VisitFieldDeclarationList(ReadOnlyCollection<FieldDeclaration> fields)
+        {
+            if (fields == null)
+                return fields;
+
+            List<FieldDeclaration> alternate = null;
+            for (int i = 0, n = fields.Count; i < n; i++)
+            {
+                var f = fields[i];
+                var e = Visit(f.Expression);
+                if (f.Expression != e && alternate == null)
+                    alternate = fields.Take(i).ToList();
+                if (alternate != null)
+                    alternate.Add(new FieldDeclaration(f.Name, e));
+            }
+            if (alternate != null)
+                return alternate.AsReadOnly();
+            return fields;
+        }
+    }
+}
--- a/samples/C#/Program.cs
+++ b/samples/C#/Program.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LittleSampleApp
+{
+  /// <summary>
+  /// Just what it says on the tin. A little sample application for Linguist to try out.
+  /// 
+  /// </summary>
+  class Program
+  {
+    static void Main(string[] args)
+    {
+      Console.WriteLine("Hello, I am a little sample application to test GitHub's Linguist module.");
+      Console.WriteLine("I also include a Razor MVC file just to prove it handles cshtml files now.");
+    }
+  }
+}
--- a/samples/C++/16F88.h
+++ b/samples/C++/16F88.h
@@ -0,0 +1,86 @@
+/*
+ * This file is part of PIC
+ * Copyright © 2012 Rachel Mant (dx-mon@users.sourceforge.net)
+ *
+ * PIC is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PIC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+enum PIC16F88Instruction
+{
+	ADDWF,
+	ANDWF,
+	CLRF,
+	CLRW,
+	COMF,
+	DECF,
+	DECFSZ,
+	INCF,
+	INCFSZ,
+	IORWF,
+	MOVF,
+	MOVWF,
+	NOP,
+	RLF,
+	RRF,
+	SUBWF,
+	SWAPF,
+	XORWF,
+	BCF,
+	BSF,
+	BTFSC,
+	BTFSS,
+	ADDLW,
+	ANDLW,
+	CALL,
+	CLRWDT,
+	GOTO,
+	IORLW,
+	MOVLW,
+	RETFIE,
+	RETLW,
+	RETURN,
+	SLEEP,
+	SUBLW,
+	XORLW
+};
+
+class PIC16F88
+{
+public:
+	PIC16F88(ROM *ProgramMemory);
+	void Step();
+
+private:
+	uint8_t q;
+	bool nextIsNop, trapped;
+	Memory *memory;
+	ROM *program;
+	Stack<uint16_t, 8> *CallStack;
+	Register<uint16_t> *PC;
+	Register<> *WREG, *PCL, *STATUS, *PCLATCH;
+	PIC16F88Instruction inst;
+	uint16_t instrWord;
+
+private:
+	void DecodeInstruction();
+	void ProcessInstruction();
+
+	uint8_t GetBank();
+	uint8_t GetMemoryContents(uint8_t partialAddress);
+	void SetMemoryContents(uint8_t partialAddress, uint8_t newVal);
+	void CheckZero(uint8_t value);
+	void StoreValue(uint8_t value, bool updateZero);
+	uint8_t SetCarry(bool val);
+	uint16_t GetPCHFinalBits();
+};
--- a/Show More
+++ b/Show More