diff --git a/.gitignore b/.gitignore
index 4a9e65c468f9883e34e77d0a0e1a2be0673685c0..fe4df04f77ef74c6c1167052980790e636aad427 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,7 @@
 /.settings
 /www/css
 /www/less/lib
+/www/wdn
 /.buildpath
+/vendor
+/tmp
diff --git a/.settings/org.eclipse.php.core.prefs b/.settings/org.eclipse.php.core.prefs
deleted file mode 100644
index 2187f6d6b69a07f0950acb4115ca6f1c171706d4..0000000000000000000000000000000000000000
--- a/.settings/org.eclipse.php.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Apr 15 08:48:11 CDT 2010
-eclipse.preferences.version=1
-include_path=0;/UNL_Search
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..3aca2de9f1227a5e42a05a769ca27f80edc30b78
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,125 @@
+var every = require('lodash/collection/every');
+var fs = require('fs');
+
+module.exports = function (grunt) {
+  var lessDir = 'www/less';
+  var lessVendorDir = lessDir + '/lib';
+  var cssDir = 'www/css';
+  var jsDir = 'www/js';
+
+  var cssFiles = [
+    'search',
+    'search-google',
+  ];
+
+  var jsFiles = [
+    jsDir + '/search.js',
+  ];
+
+  var wdnMixinLibBaseUrl = 'https://raw.githubusercontent.com/unl/wdntemplates/4.1/wdn/templates_4.1/less/_mixins/';
+  var wdnMixins = [
+    'breakpoints.less',
+    'colors.less',
+    'fonts.less',
+  ];
+  var allMixinsExist = every(wdnMixins, function(value) {
+    return fs.existsSync(lessVendorDir + '/' + value);
+  });
+
+  var lessFiles = {};
+  cssFiles.forEach(function(file) {
+    lessFiles[cssDir + '/' + file + '.css'] = lessDir + '/' + file + '.less';
+  });
+
+  var builtJsFiles = {};
+  builtJsFiles[jsDir + '/search.min.js'] = jsFiles;
+
+  var autoprefixPlugin = new (require('less-plugin-autoprefix'))({browsers: ["last 2 versions"]});
+  var cleanCssPlugin = new (require('less-plugin-clean-css'))();
+
+  // load all grunt tasks matching the ['grunt-*', '@*/grunt-*'] patterns
+  require('load-grunt-tasks')(grunt);
+
+  grunt.initConfig({
+    'curl-dir': {
+      'less-libs': {
+        src: wdnMixins.map(function(file) {
+          return wdnMixinLibBaseUrl + file;
+        }),
+        dest: lessVendorDir
+      }
+    },
+    less: {
+      all: {
+        options: {
+            paths: [lessDir],
+            plugins: [
+              autoprefixPlugin,
+              cleanCssPlugin
+            ]
+          },
+          files: lessFiles
+      }
+    },
+    uglify: {
+      options: {
+        sourceMap: true
+      },
+      all: {
+        files: builtJsFiles
+      }
+    },
+    requirejs: {
+      all: {
+        options: {
+          appDir: 'www/js/embed-src/',
+          baseUrl: './',
+          dir: 'www/js/embed/',
+          optimize: 'uglify2',
+          logLevel: 2,
+          preserveLicenseComments: false,
+          generateSourceMaps: true,
+          paths: {
+            'requireLib': 'require'
+          },
+          map: {
+            "*": {
+              css: 'require-css/css'
+            }
+          },
+          modules: [
+            {
+              name: 'all',
+              create: true,
+              include: ['requireLib', 'require-css/css', 'ga', 'main'],
+              exclude: ['require-css/normalize']
+            }
+          ]
+        }
+      }
+    },
+    clean: {
+      css: Object.keys(lessFiles).concat(lessVendorDir),
+      js: Object.keys(builtJsFiles).concat(jsDir + '/**/*.map')
+    },
+    watch: {
+      less: {
+        files: lessDir + '/**/*.less',
+        tasks: ['less']
+      }
+    }
+  });
+
+  // establish grunt default
+  var defaultTasks = ['less', 'uglify', 'requirejs'];
+  var localTasks = defaultTasks.slice();
+  if (!allMixinsExist) {
+    defaultTasks.unshift('curl-dir');
+  }
+  grunt.registerTask('default', defaultTasks);
+  grunt.registerTask('all-local', localTasks);
+
+  // legacy targets from Makefile
+  grunt.registerTask('all', ['default']);
+  grunt.registerTask('js', ['uglify']);
+};
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 9e0e49f50b690f7dcb70887558f94da850576d53..0000000000000000000000000000000000000000
--- a/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-SHELL := /bin/bash
-CURL := curl
-
-# NodeJS Find/Install
-NODE_PATH = $(shell ./find-node-or-install)
-PATH := $(NODE_PATH):$(shell echo $$PATH)
-
-# External Build Tools
-NODE_DIR = node_modules
-LESSC = $(NODE_DIR)/less/bin/lessc
-UGLIFYJS = $(NODE_DIR)/uglify-js/bin/uglifyjs
-
-# Local Vars
-LESS_LIB = www/less/lib
-
-# External Dependencies
-LESSHAT := $(LESS_LIB)/lesshat.less
-WDN_MIXINS := \
-	$(LESS_LIB)/breakpoints.less \
-	$(LESS_LIB)/colors.less \
-	$(LESS_LIB)/fonts.less
-
-WDN_LIB_RAW = https://raw.githubusercontent.com/unl/wdntemplates/master/wdn/templates_4.0/less/_mixins/
-LESSHAT_RAW = https://raw.githubusercontent.com/csshat/lesshat/c8c211b2442734bfc1ae2509ff0ccebdc2e73664/build/lesshat.less
-
-# Built Files
-CSS_OBJ = www/css/search.css
-JS_OBJ = www/js/search.min.js
-
-all: less js
-
-less: $(CSS_OBJ)
-
-js: $(JS_OBJ)
-
-clean:
-	rm -r $(NODE_DIR)
-	rm -r $(LESS_LIB)
-	rm $(JS_OBJ)
-	rm $(CSS_OBJ)
-	
-$(CSS_OBJ): www/less/search.less $(LESSC) $(LESSHAT) $(WDN_MIXINS)
-	$(LESSC) --clean-css $< $@
-	
-$(LESSC):
-	npm install less less-plugin-clean-css
-
-$(LESS_LIB)/%.less:
-	@mkdir -p $(@D)
-	$(CURL) -s $(WDN_LIB_RAW)$(@F) -o $@
-
-$(LESSHAT):
-	@mkdir -p $(@D)
-	$(CURL) -s $(LESSHAT_RAW) -o $@
-	
-$(UGLIFYJS):
-	npm install uglify-js
-	
-$(JS_OBJ): www/js/search.js $(UGLIFYJS)
-	$(UGLIFYJS) -c -m -o $@ -p 2 --source-map $(<).map --source-map-url $(<F).map $<
-	
-.PHONY: all less js clean
diff --git a/README b/README.md
similarity index 89%
rename from README
rename to README.md
index 44f04e7f46399239a815c22e6706785ada01179a..fddd758faa8599f2d3cc52a73aa35b98ae38aba0 100644
--- a/README
+++ b/README.md
@@ -11,4 +11,4 @@ Querystring parameters:
 To build and run this project:
 
 1. Copy/Update config.sample.php to config.inc.php (see in-file documentation)
-2. Run `make`
+2. run `composer install && npm install && grunt`
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000000000000000000000000000000000000..c55bb57f31140c9bd5175e121465fd096238b59f
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,11 @@
+{
+  "autoload": {
+    "psr-0": {
+      "UNL": "src/"
+    }
+  },
+  "require": {
+    "unl/php-wdn-templates": "^4.1",
+    "ezyang/htmlpurifier": "^4.7"
+  }
+}
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 0000000000000000000000000000000000000000..7f4fb35d4806462c5339d181be39b158ec1cbc6d
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,430 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "hash": "f17d4e9d564c0acba4f1de21967b413c",
+    "content-hash": "c6195cd1756aa110358f46cb9356f29b",
+    "packages": [
+        {
+            "name": "ezyang/htmlpurifier",
+            "version": "v4.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ezyang/htmlpurifier.git",
+                "reference": "ae1828d955112356f7677c465f94f7deb7d27a40"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/ae1828d955112356f7677c465f94f7deb7d27a40",
+                "reference": "ae1828d955112356f7677c465f94f7deb7d27a40",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "HTMLPurifier": "library/"
+                },
+                "files": [
+                    "library/HTMLPurifier.composer.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL"
+            ],
+            "authors": [
+                {
+                    "name": "Edward Z. Yang",
+                    "email": "admin@htmlpurifier.org",
+                    "homepage": "http://ezyang.com"
+                }
+            ],
+            "description": "Standards compliant HTML filter written in PHP",
+            "homepage": "http://htmlpurifier.org/",
+            "keywords": [
+                "html"
+            ],
+            "time": "2015-08-05 01:03:42"
+        },
+        {
+            "name": "unl/php-dwt-parser",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/unl/phpdwtparser.git",
+                "reference": "1de8770c4d8675771d1529c2f81d96e0aa51931f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/unl/phpdwtparser/zipball/1de8770c4d8675771d1529c2f81d96e0aa51931f",
+                "reference": "1de8770c4d8675771d1529c2f81d96e0aa51931f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "zaininnari/html-minifier": "*",
+                "zendframework/zend-code": "^2.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "bin": [
+                "bin/createTemplates.php"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "UNL\\DWT\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kevin Abel (kabel)",
+                    "email": "kabel2@unl.edu",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Brett Bieber (saltybeagle)",
+                    "email": "brett.bieber@gmail.com",
+                    "role": "Retired Developer"
+                }
+            ],
+            "description": "A PHP library for parsing DWT files and turning them into PHP classes",
+            "homepage": "http://wdn.unl.edu/",
+            "time": "2016-01-05 21:35:46"
+        },
+        {
+            "name": "unl/php-wdn-templates",
+            "version": "v4.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/unl/phpunltemplates.git",
+                "reference": "ddece80fce8611c22fa674a0f36eac3ddf4ca423"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/unl/phpunltemplates/zipball/ddece80fce8611c22fa674a0f36eac3ddf4ca423",
+                "reference": "ddece80fce8611c22fa674a0f36eac3ddf4ca423",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "unl/php-dwt-parser": "1.0.*"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0",
+                "satooshi/php-coveralls": "^0.7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "UNL\\Templates\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kevin Abel (kabel)",
+                    "email": "kabel2@unl.edu",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Brett Bieber (saltybeagle)",
+                    "email": "brett.bieber@gmail.com",
+                    "role": "Retired Developer"
+                },
+                {
+                    "name": "Ned Hummel (nhummel2)",
+                    "email": "nhummel2@math.unl.edu",
+                    "role": "Retired Developer"
+                }
+            ],
+            "description": "A PHP library for rendering the UNL templates",
+            "homepage": "http://wdn.unl.edu/",
+            "time": "2015-12-15 00:14:04"
+        },
+        {
+            "name": "zaininnari/html-minifier",
+            "version": "0.4.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zaininnari/html-minifier.git",
+                "reference": "5b94d85705626f9bb33b7c667bc4400088ed4ece"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zaininnari/html-minifier/zipball/5b94d85705626f9bb33b7c667bc4400088ed4ece",
+                "reference": "5b94d85705626f9bb33b7c667bc4400088ed4ece",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "satooshi/php-coveralls": "dev-master"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "zz": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "The BSD 3-Clause License"
+            ],
+            "authors": [
+                {
+                    "name": "Google inc",
+                    "homepage": "http://www.chromium.org/blink",
+                    "role": "Author"
+                },
+                {
+                    "name": "zaininnari",
+                    "homepage": "https://github.com/zaininnari/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "The Blink HTMLTokenizer ported to PHP.",
+            "homepage": "https://github.com/zaininnari/html-minifier",
+            "keywords": [
+                "Blink",
+                "HTML minify",
+                "php"
+            ],
+            "time": "2015-08-18 14:10:55"
+        },
+        {
+            "name": "zendframework/zend-code",
+            "version": "2.6.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-code.git",
+                "reference": "c4e8f976a772cfb14b47dabd69b5245a423082b4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-code/zipball/c4e8f976a772cfb14b47dabd69b5245a423082b4",
+                "reference": "c4e8f976a772cfb14b47dabd69b5245a423082b4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "zendframework/zend-eventmanager": "^2.6|^3.0"
+            },
+            "require-dev": {
+                "doctrine/annotations": "~1.0",
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-stdlib": "~2.7"
+            },
+            "suggest": {
+                "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
+                "zendframework/zend-stdlib": "Zend\\Stdlib component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev",
+                    "dev-develop": "2.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Code\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides facilities to generate arbitrary code using an object oriented interface",
+            "homepage": "https://github.com/zendframework/zend-code",
+            "keywords": [
+                "code",
+                "zf2"
+            ],
+            "time": "2016-01-05 05:58:37"
+        },
+        {
+            "name": "zendframework/zend-eventmanager",
+            "version": "2.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-eventmanager.git",
+                "reference": "a03de810b99b0302059ab744c535d464b8dc4721"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/a03de810b99b0302059ab744c535d464b8dc4721",
+                "reference": "a03de810b99b0302059ab744c535d464b8dc4721",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "zendframework/zend-stdlib": "~2.5"
+            },
+            "require-dev": {
+                "athletic/athletic": "dev-master",
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev",
+                    "dev-develop": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\EventManager\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-eventmanager",
+            "keywords": [
+                "eventmanager",
+                "zf2"
+            ],
+            "time": "2015-10-06 11:53:40"
+        },
+        {
+            "name": "zendframework/zend-hydrator",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-hydrator.git",
+                "reference": "f3ed8b833355140350bbed98d8a7b8b66875903f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/f3ed8b833355140350bbed98d8a7b8b66875903f",
+                "reference": "f3ed8b833355140350bbed98d8a7b8b66875903f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "zendframework/zend-stdlib": "^2.5.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "^2.0@dev",
+                "zendframework/zend-eventmanager": "^2.5.1",
+                "zendframework/zend-filter": "^2.5.1",
+                "zendframework/zend-inputfilter": "^2.5.1",
+                "zendframework/zend-serializer": "^2.5.1",
+                "zendframework/zend-servicemanager": "^2.5.1"
+            },
+            "suggest": {
+                "zendframework/zend-eventmanager": "^2.5.1, to support aggregate hydrator usage",
+                "zendframework/zend-filter": "^2.5.1, to support naming strategy hydrator usage",
+                "zendframework/zend-serializer": "^2.5.1, to use the SerializableStrategy",
+                "zendframework/zend-servicemanager": "^2.5.1, to support hydrator plugin manager usage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev",
+                    "dev-develop": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Hydrator\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-hydrator",
+            "keywords": [
+                "hydrator",
+                "zf2"
+            ],
+            "time": "2015-09-17 14:06:43"
+        },
+        {
+            "name": "zendframework/zend-stdlib",
+            "version": "2.7.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-stdlib.git",
+                "reference": "cae029346a33663b998507f94962eb27de060683"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cae029346a33663b998507f94962eb27de060683",
+                "reference": "cae029346a33663b998507f94962eb27de060683",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "zendframework/zend-hydrator": "~1.0"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1",
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-config": "~2.5",
+                "zendframework/zend-eventmanager": "~2.5",
+                "zendframework/zend-filter": "~2.5",
+                "zendframework/zend-inputfilter": "~2.5",
+                "zendframework/zend-serializer": "~2.5",
+                "zendframework/zend-servicemanager": "~2.5"
+            },
+            "suggest": {
+                "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
+                "zendframework/zend-filter": "To support naming strategy hydrator usage",
+                "zendframework/zend-serializer": "Zend\\Serializer component",
+                "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Stdlib\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-stdlib",
+            "keywords": [
+                "stdlib",
+                "zf2"
+            ],
+            "time": "2015-10-15 15:57:32"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": []
+}
diff --git a/config.sample.php b/config.sample.php
index 12bdcd12e088076837635788f35c5db383a90b8b..cb8ec5323e4eb4e21e278ea707b4ae607b308f7e 100644
--- a/config.sample.php
+++ b/config.sample.php
@@ -3,9 +3,7 @@
 ini_set('display_errors', false);
 error_reporting(E_ALL);
 
-set_include_path(dirname(__FILE__).'/src:'.dirname(__FILE__).'/lib/php:'.get_include_path());
-
-require_once 'UNL/Autoload.php';
+require __DIR__ . '/vendor/autoload.php';
 
 /* A Google Loader API Key is presumably needed to ensure proper functionality.
  * Register for an API Key at http://code.google.com/apis/loader/signup.html
diff --git a/find-node-or-install b/find-node-or-install
deleted file mode 100755
index 37a3e86b04e3a9205f5c8d95ea9e40e4c32cbda5..0000000000000000000000000000000000000000
--- a/find-node-or-install
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Finds the bin directory where node and npm are installed, or installs a
-# local copy of them in a temp folder if not found. Then outputs where they
-# are.
-#
-# Usage and install instructions:
-# https://github.com/hugojosefson/find-node-or-install
-##############################################################################
-
-# Creates temp dir which stays the same every time this script executes
-function setTEMP_DIR()
-{
-  local NEW_OS_SUGGESTED_TEMP_FILE=$(mktemp -t asdXXXXX)
-  local OS_ROOT_TEMP_DIR=$(dirname ${NEW_OS_SUGGESTED_TEMP_FILE})
-  rm ${NEW_OS_SUGGESTED_TEMP_FILE}
-  TEMP_DIR=${OS_ROOT_TEMP_DIR}/nvm
-  mkdir -p ${TEMP_DIR}
-}
-
-# Break on error
-set -e
-
-# Try to find node, but don't break if not found
-NODE=$(which node || true)
-
-if [[ -n "${NODE}" ]]; then
-  # Good. We found it.
-  echo $(dirname ${NODE})
-else
-  # Did not find node. Better install it.
-  # Do it in a temp dir, which stays the same every time this script executes
-  setTEMP_DIR
-  cd ${TEMP_DIR}
-
-  # Do we have nvm here?
-  if [[ ! -d "nvm" ]]; then
-    git clone git://github.com/creationix/nvm.git >/dev/null
-  fi
-
-  # Clear and set NVM_* env variables to our installation
-  mkdir -p .nvm
-  export NVM_DIR=$( (cd .nvm && pwd) )
-  unset NVM_PATH
-  unset NVM_BIN
-
-  # Load nvm into current shell
-  . nvm/nvm.sh >/dev/null
-
-  # Install and use latest 0.10.* node
-  nvm install 0.10 >/dev/null
-  nvm alias default 0.10 >/dev/null
-  nvm use default >/dev/null
-
-  # Find and output node's bin directory
-  NODE=$(which node)
-  echo $(dirname ${NODE})
-fi
diff --git a/lib/.configsnapshots/configsnapshot-2010-04-15 09-10-17.xml b/lib/.configsnapshots/configsnapshot-2010-04-15 09-10-17.xml
deleted file mode 100644
index 36af4d2110de43e69ac5fba9f69347089b54db32..0000000000000000000000000000000000000000
--- a/lib/.configsnapshots/configsnapshot-2010-04-15 09-10-17.xml	
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<pearconfig version="1.0"><php_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/php</php_dir><ext_dir>/usr/local/php5/lib/php/extensions/no-debug-non-zts-20060613/</ext_dir><cfg_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/cfg</cfg_dir><doc_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/docs</doc_dir><bin_dir>/usr/local/bin</bin_dir><data_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/data</data_dir><www_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/www</www_dir><test_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/tests</test_dir><src_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/src</src_dir><php_bin>/usr/local/bin/php</php_bin><php_ini>/usr/local/lib/php.ini</php_ini><php_prefix></php_prefix><php_suffix></php_suffix></pearconfig>
diff --git a/lib/.configsnapshots/configsnapshot-2011-03-10 14-06-27.xml b/lib/.configsnapshots/configsnapshot-2011-03-10 14-06-27.xml
deleted file mode 100644
index fc3fd54b3e71b85d208a67189f87afb956f7733a..0000000000000000000000000000000000000000
--- a/lib/.configsnapshots/configsnapshot-2011-03-10 14-06-27.xml	
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<pearconfig version="1.0"><php_dir>/Users/bbieber/Documents/workspace/UNL_Search/trunk/lib/php</php_dir><ext_dir>/usr/local/lib/php/extensions/no-debug-non-zts-20090626/</ext_dir><cfg_dir>/Users/bbieber/Documents/workspace/UNL_Search/trunk/lib/cfg</cfg_dir><doc_dir>/Users/bbieber/Documents/workspace/UNL_Search/trunk/lib/docs</doc_dir><bin_dir>/usr/local/bin</bin_dir><data_dir>/Users/bbieber/Documents/workspace/UNL_Search/trunk/lib/data</data_dir><www_dir>/Users/bbieber/Documents/workspace/UNL_Search/trunk/lib/www</www_dir><test_dir>/Users/bbieber/Documents/workspace/UNL_Search/trunk/lib/tests</test_dir><src_dir>/Users/bbieber/Documents/workspace/UNL_Search/trunk/lib/src</src_dir><php_bin>/usr/local/bin/php</php_bin><php_ini>/usr/local/lib/php.ini</php_ini><php_prefix></php_prefix><php_suffix></php_suffix></pearconfig>
diff --git a/lib/.configsnapshots/configsnapshot-2011-08-30 16-34-36.xml b/lib/.configsnapshots/configsnapshot-2011-08-30 16-34-36.xml
deleted file mode 100644
index eab7b1fc697873e0ba14633a142314e6dc8f7de6..0000000000000000000000000000000000000000
--- a/lib/.configsnapshots/configsnapshot-2011-08-30 16-34-36.xml	
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<pearconfig version="1.0"><php_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/php</php_dir><ext_dir>/usr/local/lib/php/extensions/no-debug-non-zts-20090626/</ext_dir><cfg_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/cfg</cfg_dir><doc_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/docs</doc_dir><bin_dir>/usr/local/bin</bin_dir><data_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/data</data_dir><www_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/www</www_dir><test_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/tests</test_dir><src_dir>/Users/bbieber/Documents/workspace/UNL_Search/lib/src</src_dir><php_bin>/usr/local/bin/php</php_bin><php_ini>/usr/local/lib/php.ini</php_ini><php_prefix></php_prefix><php_suffix></php_suffix></pearconfig>
diff --git a/lib/.configsnapshots/configsnapshot-2014-04-14 09-00-33.xml b/lib/.configsnapshots/configsnapshot-2014-04-14 09-00-33.xml
deleted file mode 100644
index af55c0bc2f89d44f3c2b7859214409897c61c35c..0000000000000000000000000000000000000000
--- a/lib/.configsnapshots/configsnapshot-2014-04-14 09-00-33.xml	
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<pearconfig version="1.0"><php_dir>/Users/kabel/Documents/workspace/UNL_Search/lib/php</php_dir><ext_dir>/usr/lib/php/extensions/no-debug-non-zts-20100525</ext_dir><cfg_dir>/Users/kabel/Documents/workspace/UNL_Search/lib/cfg</cfg_dir><doc_dir>/Users/kabel/Documents/workspace/UNL_Search/lib/docs</doc_dir><bin_dir>/usr/bin</bin_dir><data_dir>/Users/kabel/Documents/workspace/UNL_Search/lib/data</data_dir><www_dir>/Users/kabel/Documents/workspace/UNL_Search/lib/www</www_dir><test_dir>/Users/kabel/Documents/workspace/UNL_Search/lib/tests</test_dir><src_dir>/Users/kabel/Documents/workspace/UNL_Search/lib/src</src_dir><php_bin>/usr/bin/php</php_bin><php_ini>/etc/php.ini</php_ini><php_prefix></php_prefix><php_suffix></php_suffix></pearconfig>
diff --git a/lib/.pear2registry b/lib/.pear2registry
deleted file mode 100644
index 149ebb1b7140853237287420807cead8370ce07c..0000000000000000000000000000000000000000
Binary files a/lib/.pear2registry and /dev/null differ
diff --git a/lib/.xmlregistry/channels/channel-__uri.xml b/lib/.xmlregistry/channels/channel-__uri.xml
deleted file mode 100644
index 987a5938d21ff15cb9d5a48bd0f9ba85a01366e8..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/channels/channel-__uri.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0http://pear.php.net/dtd/channel-1.0.xsd">
- <name>__uri</name>
- <suggestedalias>__uri</suggestedalias>
- <summary>Pseudo-channel for static packages</summary>
- <servers>
-  <primary>
-   <xmlrpc>
-    <function version="1.0">****</function>
-   </xmlrpc>
-  </primary>
- </servers>
-</channel>
diff --git a/lib/.xmlregistry/channels/channel-doc.php.net.xml b/lib/.xmlregistry/channels/channel-doc.php.net.xml
deleted file mode 100644
index d221a21bb166d01bd1460fba227cb8c11378aecb..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/channels/channel-doc.php.net.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0http://pear.php.net/dtd/channel-1.0.xsd">
- <name>doc.php.net</name>
- <summary>PHP Documentation team</summary>
- <suggestedalias>phpdocs</suggestedalias>
- <servers>
-  <primary>
-   <rest>
-    <baseurl type="REST1.0">http://doc.php.net/rest/</baseurl>
-    <baseurl type="REST1.1">http://doc.php.net/rest/</baseurl>
-   </rest>
-  </primary>
- </servers>
-</channel>
diff --git a/lib/.xmlregistry/channels/channel-htmlpurifier.org.xml b/lib/.xmlregistry/channels/channel-htmlpurifier.org.xml
deleted file mode 100644
index 0c057ddc67c37b4d0d0719f2a9bd355f208fa5b8..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/channels/channel-htmlpurifier.org.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0http://pear.php.net/dtd/channel-1.0.xsd">
- <name>htmlpurifier.org</name>
- <summary>PEAR channel for HTML Purifier library</summary>
- <suggestedalias>hp</suggestedalias>
- <servers>
-  <primary>
-   <rest>
-    <baseurl type="REST1.0">http://htmlpurifier.org/Chiara_PEAR_Server_REST/</baseurl>
-    <baseurl type="REST1.1">http://htmlpurifier.org/Chiara_PEAR_Server_REST/</baseurl>
-   </rest>
-  </primary>
- </servers>
-</channel>
diff --git a/lib/.xmlregistry/channels/channel-pear.php.net.xml b/lib/.xmlregistry/channels/channel-pear.php.net.xml
deleted file mode 100644
index c7098913388f024799a647718a87e499845383cc..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/channels/channel-pear.php.net.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0http://pear.php.net/dtd/channel-1.0.xsd">
- <name>pear.php.net</name>
- <suggestedalias>pear</suggestedalias>
- <summary>PHP Extension and Application Repository</summary>
- <servers>
-  <primary>
-   <rest>
-    <baseurl type="REST1.0">http://pear.php.net/rest/</baseurl>
-    <baseurl type="REST1.1">http://pear.php.net/rest/</baseurl>
-    <baseurl type="REST1.2">http://pear.php.net/rest/</baseurl>
-    <baseurl type="REST1.3">http://pear.php.net/rest/</baseurl>
-   </rest>
-  </primary>
-  <mirror host="us.pear.php.net">
-   <rest>
-    <baseurl type="REST1.0">http://us.pear.php.net/rest/</baseurl>
-    <baseurl type="REST1.1">http://us.pear.php.net/rest/</baseurl>
-    <baseurl type="REST1.2">http://us.pear.php.net/rest/</baseurl>
-    <baseurl type="REST1.3">http://us.pear.php.net/rest/</baseurl>
-   </rest>
-  </mirror>
-  <mirror host="de.pear.php.net" ssl="yes" port="3452">
-   <rest>
-    <baseurl type="REST1.0">https://de.pear.php.net:3452/rest/</baseurl>
-    <baseurl type="REST1.1">https://de.pear.php.net:3452/rest/</baseurl>
-    <baseurl type="REST1.2">https://de.pear.php.net:3452/rest/</baseurl>
-    <baseurl type="REST1.3">https://de.pear.php.net:3452/rest/</baseurl>
-   </rest>
-  </mirror>
- </servers>
-</channel>
diff --git a/lib/.xmlregistry/channels/channel-pear.unl.edu.xml b/lib/.xmlregistry/channels/channel-pear.unl.edu.xml
deleted file mode 100644
index 54bc5112df020cfa260abebaf9c024ec2984d8e5..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/channels/channel-pear.unl.edu.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0http://pear.php.net/dtd/channel-1.0.xsd">
- <name>pear.unl.edu</name>
- <summary>UNL PHP Extension and Application Repository</summary>
- <suggestedalias>unl</suggestedalias>
- <servers>
-  <primary>
-   <rest>
-    <baseurl type="REST1.0">http://pear.unl.edu/Chiara_PEAR_Server_REST/</baseurl>
-    <baseurl type="REST1.1">http://pear.unl.edu/Chiara_PEAR_Server_REST/</baseurl>
-    <baseurl type="REST1.3">http://pear.unl.edu/Chiara_PEAR_Server_REST/</baseurl>
-   </rest>
-  </primary>
- </servers>
-</channel>
diff --git a/lib/.xmlregistry/channels/channel-pear2.php.net.xml b/lib/.xmlregistry/channels/channel-pear2.php.net.xml
deleted file mode 100644
index dbcaccb25a38268191e77901c6f3be7714a91477..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/channels/channel-pear2.php.net.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0http://pear.php.net/dtd/channel-1.0.xsd">
- <name>pear2.php.net</name>
- <suggestedalias>pear2</suggestedalias>
- <summary>PEAR packages for PHP 5.3+ installed by Pyrus</summary>
- <servers>
-  <primary>
-   <rest>
-    <baseurl type="REST1.0">http://pear2.php.net/rest/</baseurl>
-    <baseurl type="REST1.1">http://pear2.php.net/rest/</baseurl>
-    <baseurl type="REST1.2">http://pear2.php.net/rest/</baseurl>
-    <baseurl type="REST1.3">http://pear2.php.net/rest/</baseurl>
-   </rest>
-  </primary>
- </servers>
-</channel>
diff --git a/lib/.xmlregistry/channels/channel-pecl.php.net.xml b/lib/.xmlregistry/channels/channel-pecl.php.net.xml
deleted file mode 100644
index cd6b257fc15d400fb0f1bcc38cdf57437c288a2b..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/channels/channel-pecl.php.net.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0http://pear.php.net/dtd/channel-1.0.xsd">
- <name>pecl.php.net</name>
- <suggestedalias>pecl</suggestedalias>
- <summary>PHP Extension Community Library</summary>
- <validatepackage version="1.0">PEAR_Validator_PECL</validatepackage>
- <servers>
-  <primary>
-   <xmlrpc>
-    <function version="1.0">logintest</function>
-    <function version="1.0">package.listLatestReleases</function>
-    <function version="1.0">package.listAll</function>
-    <function version="1.0">package.info</function>
-    <function version="1.0">package.getDownloadURL</function>
-    <function version="1.0">package.getDepDownloadURL</function>
-    <function version="1.0">package.search</function>
-    <function version="1.0">channel.listAll</function>
-   </xmlrpc>
-   <rest>
-    <baseurl type="REST1.0">http://pecl.php.net/rest/</baseurl>
-    <baseurl type="REST1.1">http://pecl.php.net/rest/</baseurl>
-   </rest>
-  </primary>
- </servers>
-</channel>
diff --git a/lib/.xmlregistry/channels/channelalias-__uri.txt b/lib/.xmlregistry/channels/channelalias-__uri.txt
deleted file mode 100644
index 9e550d0400c45929b0ab93c775a8a3f04c66f6b9..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/channels/channelalias-__uri.txt
+++ /dev/null
@@ -1 +0,0 @@
-__uri
\ No newline at end of file
diff --git a/lib/.xmlregistry/channels/channelalias-hp.txt b/lib/.xmlregistry/channels/channelalias-hp.txt
deleted file mode 100644
index 652f390dc87df37bb4f176cf32d0c8c03846f99a..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/channels/channelalias-hp.txt
+++ /dev/null
@@ -1 +0,0 @@
-htmlpurifier.org
\ No newline at end of file
diff --git a/lib/.xmlregistry/channels/channelalias-pear.txt b/lib/.xmlregistry/channels/channelalias-pear.txt
deleted file mode 100644
index f4730b991be41ec5fec3805cd68ce31a53963ca5..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/channels/channelalias-pear.txt
+++ /dev/null
@@ -1 +0,0 @@
-pear.php.net
\ No newline at end of file
diff --git a/lib/.xmlregistry/channels/channelalias-pear2.txt b/lib/.xmlregistry/channels/channelalias-pear2.txt
deleted file mode 100644
index 7911749f249888395a8754f5cb8ec2880c4039cb..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/channels/channelalias-pear2.txt
+++ /dev/null
@@ -1 +0,0 @@
-pear2.php.net
\ No newline at end of file
diff --git a/lib/.xmlregistry/channels/channelalias-pecl.txt b/lib/.xmlregistry/channels/channelalias-pecl.txt
deleted file mode 100644
index 2de48f1b005bd518dbb92e2b68df9d49431398d7..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/channels/channelalias-pecl.txt
+++ /dev/null
@@ -1 +0,0 @@
-pecl.php.net
\ No newline at end of file
diff --git a/lib/.xmlregistry/channels/channelalias-phpdocs.txt b/lib/.xmlregistry/channels/channelalias-phpdocs.txt
deleted file mode 100644
index 1e733d9cdf2d0df16d75b2d3e558d8d290158e9a..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/channels/channelalias-phpdocs.txt
+++ /dev/null
@@ -1 +0,0 @@
-doc.php.net
\ No newline at end of file
diff --git a/lib/.xmlregistry/channels/channelalias-unl.txt b/lib/.xmlregistry/channels/channelalias-unl.txt
deleted file mode 100644
index 674f01203962aefef0830ba386e0ad456924c94c..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/channels/channelalias-unl.txt
+++ /dev/null
@@ -1 +0,0 @@
-pear.unl.edu
\ No newline at end of file
diff --git a/lib/.xmlregistry/packages/htmlpurifier.org/HTMLPurifier/4.0.0-info.xml b/lib/.xmlregistry/packages/htmlpurifier.org/HTMLPurifier/4.0.0-info.xml
deleted file mode 100644
index 923a353dd2277f48601c8a31ea0da4ec5dd34790..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/packages/htmlpurifier.org/HTMLPurifier/4.0.0-info.xml
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.8.1" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0     http://pear.php.net/dtd/tasks-1.0.xsd     http://pear.php.net/dtd/package-2.0     http://pear.php.net/dtd/package-2.0.xsd">
- <name>HTMLPurifier</name>
- <channel>htmlpurifier.org</channel>
- <summary>Standards-compliant HTML filter</summary>
- <description>HTML Purifier is an HTML filter that will remove all malicious code
-    (better known as XSS) with a thoroughly audited, secure yet permissive
-    whitelist and will also make sure your documents are standards
-    compliant.</description>
- <lead>
-  <name>Edward Z. Yang</name>
-  <user>ezyang</user>
-  <email>admin@htmlpurifier.org</email>
-  <active>yes</active>
- </lead>
- <date>2010-04-15</date>
- <time>09:10:17</time>
- <version>
-  <release>4.0.0</release>
-  <api>4.0</api>
- </version>
- <stability>
-  <release>stable</release>
-  <api>stable</api>
- </stability>
- <license uri="http://www.gnu.org/licenses/lgpl.html">LGPL</license>
- <notes>
-HTML Purifier 4.0 is a major feature release focused on configuration
-It deprecates the $config-&gt;set('Ns', 'Directive', $value) syntax for
-$config-&gt;set('Ns.Directive', $value); both syntaxes work but the
-former will throw errors.  There are also some new features:  robust
-support for name/id, configuration inheritance, remove nbsp in
-the RemoveEmpty autoformatter, userland configuration directives
-and configuration serialization.
- </notes>
- <contents>
-  <dir name="/">
-   <file baseinstalldir="/" md5sum="8b1819c0ed397d313e5c76b062e6264d" name="HTMLPurifier/VarParserException.php" role="php"/>
-   <file baseinstalldir="/" md5sum="faa91653d527c5229b49253658ca80dd" name="HTMLPurifier/VarParser/Native.php" role="php"/>
-   <file baseinstalldir="/" md5sum="5e05d7b4f800f3cbca03efb3537277cb" name="HTMLPurifier/VarParser/Flexible.php" role="php"/>
-   <file baseinstalldir="/" md5sum="629508f0959354d4ebd99c527e704036" name="HTMLPurifier/VarParser.php" role="php"/>
-   <file baseinstalldir="/" md5sum="dbcd0c8ef8f54df0bf8945d5a61b2a9c" name="HTMLPurifier/URISchemeRegistry.php" role="php"/>
-   <file baseinstalldir="/" md5sum="dc9834550ddfe8edfc4a7c55bf32c05b" name="HTMLPurifier/URIScheme/nntp.php" role="php"/>
-   <file baseinstalldir="/" md5sum="2187e2b929cf26764e2a4acb24beaf46" name="HTMLPurifier/URIScheme/news.php" role="php"/>
-   <file baseinstalldir="/" md5sum="b847abc08adc931880036bcddde2362a" name="HTMLPurifier/URIScheme/mailto.php" role="php"/>
-   <file baseinstalldir="/" md5sum="add878b1199b2907f31135e89baebc12" name="HTMLPurifier/URIScheme/https.php" role="php"/>
-   <file baseinstalldir="/" md5sum="9e58f88917c4cbc385ba52c20c78e832" name="HTMLPurifier/URIScheme/http.php" role="php"/>
-   <file baseinstalldir="/" md5sum="18245d29655347bfb39c3342476a2d96" name="HTMLPurifier/URIScheme/ftp.php" role="php"/>
-   <file baseinstalldir="/" md5sum="4122f8aeaf11cc424c9a720c07ba0724" name="HTMLPurifier/URIScheme.php" role="php"/>
-   <file baseinstalldir="/" md5sum="d52d2040f01112af0e00f8b9bac38267" name="HTMLPurifier/URIParser.php" role="php"/>
-   <file baseinstalldir="/" md5sum="af92dd990abc627653f029dca94ed2d2" name="HTMLPurifier/URIFilter/Munge.php" role="php"/>
-   <file baseinstalldir="/" md5sum="f60d09064deb7203990b68895c6c8d66" name="HTMLPurifier/URIFilter/MakeAbsolute.php" role="php"/>
-   <file baseinstalldir="/" md5sum="a520831064417a45e03fd669b0f8256c" name="HTMLPurifier/URIFilter/HostBlacklist.php" role="php"/>
-   <file baseinstalldir="/" md5sum="f75e2069424d0b4f60988b1e8344cde8" name="HTMLPurifier/URIFilter/DisableExternalResources.php" role="php"/>
-   <file baseinstalldir="/" md5sum="9df1553f001cd2e5e574be075396a575" name="HTMLPurifier/URIFilter/DisableExternal.php" role="php"/>
-   <file baseinstalldir="/" md5sum="62112e5c17a05698309321ea85935061" name="HTMLPurifier/URIFilter.php" role="php"/>
-   <file baseinstalldir="/" md5sum="549903c3c3bfa86d91d3c2e2c8e065db" name="HTMLPurifier/URIDefinition.php" role="php"/>
-   <file baseinstalldir="/" md5sum="b150e8e19a71f29c19d7fdff69b4fd3d" name="HTMLPurifier/URI.php" role="php"/>
-   <file baseinstalldir="/" md5sum="9dcddc344c2d6d44698479dead8beead" name="HTMLPurifier/UnitConverter.php" role="php"/>
-   <file baseinstalldir="/" md5sum="ed32af45fe9dba652840c42075a7cdf3" name="HTMLPurifier/TokenFactory.php" role="php"/>
-   <file baseinstalldir="/" md5sum="a1ee2cf2a31f87fe63b5702ff82ed9ba" name="HTMLPurifier/Token/Text.php" role="php"/>
-   <file baseinstalldir="/" md5sum="21a3ed284d9cded0eba7e6910192f92b" name="HTMLPurifier/Token/Tag.php" role="php"/>
-   <file baseinstalldir="/" md5sum="abb859525c52a506e5f58c309431f3ca" name="HTMLPurifier/Token/Start.php" role="php"/>
-   <file baseinstalldir="/" md5sum="6dc6cdb4e980b6ffb9bb18ae73236ca9" name="HTMLPurifier/Token/End.php" role="php"/>
-   <file baseinstalldir="/" md5sum="b38096253b7361aa606beabbd361e744" name="HTMLPurifier/Token/Empty.php" role="php"/>
-   <file baseinstalldir="/" md5sum="0a93e4fcea3cf8114eec37914806e54f" name="HTMLPurifier/Token/Comment.php" role="php"/>
-   <file baseinstalldir="/" md5sum="cebdc28d8a702d0d2dfceb8c27196812" name="HTMLPurifier/Token.php" role="php"/>
-   <file baseinstalldir="/" md5sum="5e45fd1e8d10be6b9f4da28c765532ee" name="HTMLPurifier/TagTransform/Simple.php" role="php"/>
-   <file baseinstalldir="/" md5sum="a8e11a0600b535514f7d790fcb0e008e" name="HTMLPurifier/TagTransform/Font.php" role="php"/>
-   <file baseinstalldir="/" md5sum="3516a182bdf938206958c01134604b23" name="HTMLPurifier/TagTransform.php" role="php"/>
-   <file baseinstalldir="/" md5sum="74b777f59ffc04a9bcd19c815983d9f1" name="HTMLPurifier/tags" role="php"/>
-   <file baseinstalldir="/" md5sum="d2040cbc74c4ce31449d127719bcc6cb" name="HTMLPurifier/StringHashParser.php" role="php"/>
-   <file baseinstalldir="/" md5sum="934cbbd131e387f9e2cf0921e0c88936" name="HTMLPurifier/StringHash.php" role="php"/>
-   <file baseinstalldir="/" md5sum="3e085d73ce91a3d38f3017b112d07a0d" name="HTMLPurifier/Strategy/ValidateAttributes.php" role="php"/>
-   <file baseinstalldir="/" md5sum="6c6dbc3f24bccf2fdbfdbe9fe0912653" name="HTMLPurifier/Strategy/RemoveForeignElements.php" role="php"/>
-   <file baseinstalldir="/" md5sum="310ba416548021da80413cf04a90cce8" name="HTMLPurifier/Strategy/MakeWellFormed.php" role="php"/>
-   <file baseinstalldir="/" md5sum="48272af4271d1d6cc193052d9a175222" name="HTMLPurifier/Strategy/FixNesting.php" role="php"/>
-   <file baseinstalldir="/" md5sum="0324f1ab3397cb1544a51257994f576a" name="HTMLPurifier/Strategy/Core.php" role="php"/>
-   <file baseinstalldir="/" md5sum="55d2b2fd0577ebdcbbbf1312f4e6eb6e" name="HTMLPurifier/Strategy/Composite.php" role="php"/>
-   <file baseinstalldir="/" md5sum="05823f704d950d3a9debbd3784e4aaea" name="HTMLPurifier/Strategy.php" role="php"/>
-   <file baseinstalldir="/" md5sum="d17e7d5f8bc24cfc07f97aa7b014c4cd" name="HTMLPurifier/PropertyListIterator.php" role="php"/>
-   <file baseinstalldir="/" md5sum="319d75a5f8e6bbc8c644056a68a4aaec" name="HTMLPurifier/PropertyList.php" role="php"/>
-   <file baseinstalldir="/" md5sum="a46e55a618e944c96bbd09e5cfcf8cc1" name="HTMLPurifier/Printer/HTMLDefinition.php" role="php"/>
-   <file baseinstalldir="/" md5sum="d1d09c86a9c81b526bbd44c847344b6d" name="HTMLPurifier/Printer/CSSDefinition.php" role="php"/>
-   <file baseinstalldir="/" md5sum="512c6d0717c3fcb0bb0997594cdf7f3f" name="HTMLPurifier/Printer/ConfigForm.php" role="php"/>
-   <file baseinstalldir="/" md5sum="ee5990d6bb62017463a7a8d72c8288b5" name="HTMLPurifier/Printer/ConfigForm.js" role="php"/>
-   <file baseinstalldir="/" md5sum="c02f2fa8100745b88a85ed30e883fbc2" name="HTMLPurifier/Printer/ConfigForm.css" role="php"/>
-   <file baseinstalldir="/" md5sum="530db343c69ec3d4ba27e09e4b837903" name="HTMLPurifier/Printer.php" role="php"/>
-   <file baseinstalldir="/" md5sum="4d14a6fa6959c5c6993391b9946b57fe" name="HTMLPurifier/PercentEncoder.php" role="php"/>
-   <file baseinstalldir="/" md5sum="0f6893d064ab38c573384140159dd275" name="HTMLPurifier/Lexer/PH5P.php" role="php"/>
-   <file baseinstalldir="/" md5sum="8643ddf9638ba444abb3f0d14a906f1a" name="HTMLPurifier/Lexer/PEARSax3.php" role="php"/>
-   <file baseinstalldir="/" md5sum="461417b2a89ff805874fb3200edecc3a" name="HTMLPurifier/Lexer/DOMLex.php" role="php"/>
-   <file baseinstalldir="/" md5sum="f4a371e75951a563aa06c76afec748d5" name="HTMLPurifier/Lexer/DirectLex.php" role="php"/>
-   <file baseinstalldir="/" md5sum="a9d40a8c5ae52525e876cf061358bc1e" name="HTMLPurifier/Lexer.php" role="php"/>
-   <file baseinstalldir="/" md5sum="39382c387dc2a7dac903c2b63849a9a6" name="HTMLPurifier/Length.php" role="php"/>
-   <file baseinstalldir="/" md5sum="58a26316f701ac79ca439ce4d874b9d3" name="HTMLPurifier/LanguageFactory.php" role="php"/>
-   <file baseinstalldir="/" md5sum="7246930b43b3e3caea10e6bce02fa95e" name="HTMLPurifier/Language/messages/en.php" role="php"/>
-   <file baseinstalldir="/" md5sum="146f1c2d41e1fdf85f334a05a0dd41ca" name="HTMLPurifier/Language/messages/en-x-testmini.php" role="php"/>
-   <file baseinstalldir="/" md5sum="c1ea035c3a68aee24f6d4c264ee79d6b" name="HTMLPurifier/Language/messages/en-x-test.php" role="php"/>
-   <file baseinstalldir="/" md5sum="f645558786c86be0b603b7cfc82f7e12" name="HTMLPurifier/Language/classes/en-x-test.php" role="php"/>
-   <file baseinstalldir="/" md5sum="34c9de227562f8967141cbf9f565c289" name="HTMLPurifier/Language.php" role="php"/>
-   <file baseinstalldir="/" md5sum="027296ea99d041b96bfb9f86b4b2246f" name="HTMLPurifier/Injector/SafeObject.php" role="php"/>
-   <file baseinstalldir="/" md5sum="f6216052673d05748b26bfcbd51689f7" name="HTMLPurifier/Injector/RemoveEmpty.php" role="php"/>
-   <file baseinstalldir="/" md5sum="dbfe4673baeefc27fb505c867d56c5d4" name="HTMLPurifier/Injector/PurifierLinkify.php" role="php"/>
-   <file baseinstalldir="/" md5sum="a205c290b398a25a7f4b76a5401e54c4" name="HTMLPurifier/Injector/Linkify.php" role="php"/>
-   <file baseinstalldir="/" md5sum="e0ba2c64ec1ff45452069ea4a61194c8" name="HTMLPurifier/Injector/DisplayLinkURI.php" role="php"/>
-   <file baseinstalldir="/" md5sum="0d1dc975105ef1208e3228586335abaf" name="HTMLPurifier/Injector/AutoParagraph.php" role="php"/>
-   <file baseinstalldir="/" md5sum="9f1d4fac7ab8e8ba0a94a13cdfb5c644" name="HTMLPurifier/Injector.php" role="php"/>
-   <file baseinstalldir="/" md5sum="41e2004626f0e87d894ad091f91f6554" name="HTMLPurifier/IDAccumulator.php" role="php"/>
-   <file baseinstalldir="/" md5sum="b3fe48fa29465d75928b5a2917d4ba30" name="HTMLPurifier/HTMLModuleManager.php" role="php"/>
-   <file baseinstalldir="/" md5sum="4927a47ebe2721507baaddf7f66da265" name="HTMLPurifier/HTMLModule/XMLCommonAttributes.php" role="php"/>
-   <file baseinstalldir="/" md5sum="cbdf3deab781644fcc25dde08b441727" name="HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php" role="php"/>
-   <file baseinstalldir="/" md5sum="7f514a82cfd85b03d712274b5d249954" name="HTMLPurifier/HTMLModule/Tidy/XHTML.php" role="php"/>
-   <file baseinstalldir="/" md5sum="a00c39ef28493892552b3f3e452cf992" name="HTMLPurifier/HTMLModule/Tidy/Transitional.php" role="php"/>
-   <file baseinstalldir="/" md5sum="5215ba83a8f645d50077b748ab344b8a" name="HTMLPurifier/HTMLModule/Tidy/Strict.php" role="php"/>
-   <file baseinstalldir="/" md5sum="ad27e0f4952db6bd52a6798ce252c812" name="HTMLPurifier/HTMLModule/Tidy/Proprietary.php" role="php"/>
-   <file baseinstalldir="/" md5sum="f6bed98e1a7ebae0e09764956bdac4f2" name="HTMLPurifier/HTMLModule/Tidy/Name.php" role="php"/>
-   <file baseinstalldir="/" md5sum="4837b4cb0776cc1af14a21c1b877e078" name="HTMLPurifier/HTMLModule/Tidy.php" role="php"/>
-   <file baseinstalldir="/" md5sum="65b57e9b356a4d13b6f0c65dfcd337dd" name="HTMLPurifier/HTMLModule/Text.php" role="php"/>
-   <file baseinstalldir="/" md5sum="ad4c41177390713e568bdd96848e37f5" name="HTMLPurifier/HTMLModule/Target.php" role="php"/>
-   <file baseinstalldir="/" md5sum="7d6e6c2595498da192d69006c46d769d" name="HTMLPurifier/HTMLModule/Tables.php" role="php"/>
-   <file baseinstalldir="/" md5sum="4770bf322cefdc9b155d9faf2851e21f" name="HTMLPurifier/HTMLModule/StyleAttribute.php" role="php"/>
-   <file baseinstalldir="/" md5sum="074b0eb6b6c34a1992ab65aa67e29a35" name="HTMLPurifier/HTMLModule/Scripting.php" role="php"/>
-   <file baseinstalldir="/" md5sum="d02bfe5bcd269deac0cd7886ae288364" name="HTMLPurifier/HTMLModule/SafeObject.php" role="php"/>
-   <file baseinstalldir="/" md5sum="59f3c3ddec2793fdb18084a2b6da20b6" name="HTMLPurifier/HTMLModule/SafeEmbed.php" role="php"/>
-   <file baseinstalldir="/" md5sum="c87f9de5628a72270943de5496d36ddf" name="HTMLPurifier/HTMLModule/Ruby.php" role="php"/>
-   <file baseinstalldir="/" md5sum="aae031812e9fbe29dff05f23e1b4cda5" name="HTMLPurifier/HTMLModule/Proprietary.php" role="php"/>
-   <file baseinstalldir="/" md5sum="e503304a642c6786f6a11eb3ead87ddd" name="HTMLPurifier/HTMLModule/Presentation.php" role="php"/>
-   <file baseinstalldir="/" md5sum="a7cca883348645c6a77ec7db0932a610" name="HTMLPurifier/HTMLModule/Object.php" role="php"/>
-   <file baseinstalldir="/" md5sum="24b18ff07b334f19fc8c1e5f184d2570" name="HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php" role="php"/>
-   <file baseinstalldir="/" md5sum="9765121a41a8e2a372a65c6bd3b32789" name="HTMLPurifier/HTMLModule/Name.php" role="php"/>
-   <file baseinstalldir="/" md5sum="21bac4a6658e819d2b0c807351f300c1" name="HTMLPurifier/HTMLModule/List.php" role="php"/>
-   <file baseinstalldir="/" md5sum="e36d4f596bd85f285d243013495c8dcb" name="HTMLPurifier/HTMLModule/Legacy.php" role="php"/>
-   <file baseinstalldir="/" md5sum="911df038afaefbc0f662a3d6fa8d9554" name="HTMLPurifier/HTMLModule/Image.php" role="php"/>
-   <file baseinstalldir="/" md5sum="bb4790cbd4a68e90a2d1fb8b820d7147" name="HTMLPurifier/HTMLModule/Hypertext.php" role="php"/>
-   <file baseinstalldir="/" md5sum="73153b86492552a9fbb88340c770963f" name="HTMLPurifier/HTMLModule/Forms.php" role="php"/>
-   <file baseinstalldir="/" md5sum="5475ee52a8791d170b841cd6ad905094" name="HTMLPurifier/HTMLModule/Edit.php" role="php"/>
-   <file baseinstalldir="/" md5sum="381c8ba0950e07c6c82c42a642385800" name="HTMLPurifier/HTMLModule/CommonAttributes.php" role="php"/>
-   <file baseinstalldir="/" md5sum="e129432b77bb64fdc290d13987c45596" name="HTMLPurifier/HTMLModule/Bdo.php" role="php"/>
-   <file baseinstalldir="/" md5sum="9cbb7c9019e68203ca205eff77a61fe5" name="HTMLPurifier/HTMLModule.php" role="php"/>
-   <file baseinstalldir="/" md5sum="75a3e23b95fd758922132c79fdca9e56" name="HTMLPurifier/HTMLDefinition.php" role="php"/>
-   <file baseinstalldir="/" md5sum="51925aaea7436e6a75f4ccae2597d806" name="HTMLPurifier/Generator.php" role="php"/>
-   <file baseinstalldir="/" md5sum="5c61e7f9db9239ad5f23a4ef94e83d14" name="HTMLPurifier/Filter/YouTube.php" role="php"/>
-   <file baseinstalldir="/" md5sum="739249b8ed7c1e1ff906931b13d477f6" name="HTMLPurifier/Filter/ExtractStyleBlocks.php" role="php"/>
-   <file baseinstalldir="/" md5sum="33181bbe7f6e7e839796e73d4d2a790d" name="HTMLPurifier/Filter.php" role="php"/>
-   <file baseinstalldir="/" md5sum="6549f2e00060fd671149191f1e94eaf3" name="HTMLPurifier/Exception.php" role="php"/>
-   <file baseinstalldir="/" md5sum="3cc9e13fb56fb8816bd478e46522a926" name="HTMLPurifier/ErrorStruct.php" role="php"/>
-   <file baseinstalldir="/" md5sum="5aee849a4ef4f610cd383752697f6966" name="HTMLPurifier/ErrorCollector.php" role="php"/>
-   <file baseinstalldir="/" md5sum="85a29be7cf7434024284aeb333659c0b" name="HTMLPurifier/EntityParser.php" role="php"/>
-   <file baseinstalldir="/" md5sum="5e2066baba7c0c0de8ff0ecc38ce2a5c" name="HTMLPurifier/EntityLookup/entities.ser" role="php"/>
-   <file baseinstalldir="/" md5sum="1ebc1f6db1134f98ba757d16bec67d0a" name="HTMLPurifier/EntityLookup.php" role="php"/>
-   <file baseinstalldir="/" md5sum="fc3fee6ae7b5cfa04ce2c4ba8699a98b" name="HTMLPurifier/Encoder.php" role="php"/>
-   <file baseinstalldir="/" md5sum="b0025522437a72f339de994d0e26dd1d" name="HTMLPurifier/ElementDef.php" role="php"/>
-   <file baseinstalldir="/" md5sum="0ab0a6b2a7d358ab8532d897e8bfe729" name="HTMLPurifier/DoctypeRegistry.php" role="php"/>
-   <file baseinstalldir="/" md5sum="512fcd900313924eb7902442186a06cc" name="HTMLPurifier/Doctype.php" role="php"/>
-   <file baseinstalldir="/" md5sum="1df8a4f27f64b5473b41e4666f787c6d" name="HTMLPurifier/DefinitionCacheFactory.php" role="php"/>
-   <file baseinstalldir="/" md5sum="1e9429a2030745d25d245d9f06f7f065" name="HTMLPurifier/DefinitionCache/Serializer/README" role="php"/>
-   <file baseinstalldir="/" md5sum="d63b0aeacf255afb75982a14f1dd0daf" name="HTMLPurifier/DefinitionCache/Serializer.php" role="php"/>
-   <file baseinstalldir="/" md5sum="e27dfb4700f20a6ccd1ab8e498ce0ac6" name="HTMLPurifier/DefinitionCache/Null.php" role="php"/>
-   <file baseinstalldir="/" md5sum="9e8b84835e638f4f835e43405c50900f" name="HTMLPurifier/DefinitionCache/Decorator/Template.php.in" role="php"/>
-   <file baseinstalldir="/" md5sum="8acd4ef5453cc2c25612a665f46ca836" name="HTMLPurifier/DefinitionCache/Decorator/Memory.php" role="php"/>
-   <file baseinstalldir="/" md5sum="31e3ea9d5988c5a1ae3f369ddccbfead" name="HTMLPurifier/DefinitionCache/Decorator/Cleanup.php" role="php"/>
-   <file baseinstalldir="/" md5sum="f185adab8aad39c577d9d4900ed61b81" name="HTMLPurifier/DefinitionCache/Decorator.php" role="php"/>
-   <file baseinstalldir="/" md5sum="db24b53bab53b8ffa40b197e06078fe4" name="HTMLPurifier/DefinitionCache.php" role="php"/>
-   <file baseinstalldir="/" md5sum="a188cbe72b81f021578b989d1566f0b3" name="HTMLPurifier/Definition.php" role="php"/>
-   <file baseinstalldir="/" md5sum="d6018966da297fe60eeba65b9adc843a" name="HTMLPurifier/CSSDefinition.php" role="php"/>
-   <file baseinstalldir="/" md5sum="c1ed36707d08237daa646b3b8eeb30a4" name="HTMLPurifier/Context.php" role="php"/>
-   <file baseinstalldir="/" md5sum="1bd2243d0d7b68504723ebc5dddd0ea2" name="HTMLPurifier/ContentSets.php" role="php"/>
-   <file baseinstalldir="/" md5sum="9a57bfdb6b774679e2f5593d4c67d7f5" name="HTMLPurifier/ConfigSchema/ValidatorAtom.php" role="php"/>
-   <file baseinstalldir="/" md5sum="d9327f8aaab4fdc364107d0779310b3b" name="HTMLPurifier/ConfigSchema/Validator.php" role="php"/>
-   <file baseinstalldir="/" md5sum="5f3ddeed8119e52e8a83d9a2a292302b" name="HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="0b4694fa209765c9eb4017787db4cfa2" name="HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="35af9b45b2e0e12d68b23ce62a78fe0b" name="HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="63a87a1f19518c7dc68ff3cd05896656" name="HTMLPurifier/ConfigSchema/schema/URI.Munge.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="b59e10aecfd047b3a16a321d10d0f3ef" name="HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="1c3c1d44844d5a053480f31b93102434" name="HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="e9867d9bf1a9e50f832f0d95ed04106c" name="HTMLPurifier/ConfigSchema/schema/URI.Host.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="bd2f650220fe184f7b3569141e506e34" name="HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="ec8e59c56d5c044651291bc2fd3ec2df" name="HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="379b2f38f7a446c97d0cecf80b57eb12" name="HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="bdacaee370b43ee3f42057e1ce9acc5d" name="HTMLPurifier/ConfigSchema/schema/URI.Disable.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="19c20a0f38079e050aaca40a1d80153a" name="HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="6ae2a6306a4742c4406a3a7978c8cb8d" name="HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="3e8b627ac6dd450053e991531169b401" name="HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="91a4d5beceb354651773fc9dee5eae99" name="HTMLPurifier/ConfigSchema/schema/URI.Base.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="b631543031c811300774cd15ef5705ba" name="HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="db04b24ca81b77213fb8dc6b4a34e688" name="HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="1812d786966978cef85926fb306081f1" name="HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="782d42061de75233348a3c756e7540b9" name="HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="20606c0bb24a9ed5e51908cd49b5aa0d" name="HTMLPurifier/ConfigSchema/schema/Output.Newline.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="703a4fcb08a72ac358bf54d1a8363347" name="HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="d88546ab0eaf014b57e260d070c65ebe" name="HTMLPurifier/ConfigSchema/schema/info.ini" role="php"/>
-   <file baseinstalldir="/" md5sum="bdd5c7ed524c8b4e529e5b0d0b512b0b" name="HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="6c5f0ed641319d3ed0e70e98f40a3730" name="HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="580fe57f57c2633dcbf5ea61f03a2c17" name="HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="602bcdee9b9128369fece8dda6ca68d0" name="HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="98c27e81560886a8243301ecf1356a4e" name="HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="2627f4dfc25ae253e56241c1208b1861" name="HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="5aa156444b034221be9647486472d38c" name="HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="d7564565bfd9962ead012075a4f785d0" name="HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="0f3e26408858326c3ea07d07cd6f32ba" name="HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="827049a0989ef1af9d513b7cf0ebd088" name="HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="bf719ef499e5092b1745fdc0145544a8" name="HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="aaa953fcd68ebc340e9cb465e49951b6" name="HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="44bc257b528121bd62f852331ebf7583" name="HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="239a45c10f6eff0a180e0da5f89cf05a" name="HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="4236b3a52572b275840ea600ffe4c91e" name="HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="1797469f7d736a99d4e2aa67f5de7acd" name="HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="9a9c021bd1610663aee54f9d830fff0b" name="HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="27a1c037eda91bea2eee5229e4f1a058" name="HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="f7d9ac0023cccb32f6792cbfc82be402" name="HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="0f39567afbe1f3b9764b1350e494dd4a" name="HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="8bfa42cf1474478dc3069884a58e9441" name="HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="c7a97b0bb36b164149166153ca40cabe" name="HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="74625ff69c0bb72ac2ea00be938fd4a2" name="HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="fe80810deab2b76f801ce09c658a426e" name="HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="7941c66897f6cbfa436c00232b0c0319" name="HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="962dc2f6f680a67c76e90ca58defa8ba" name="HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="afffc795383c3d375ce1f8d538353004" name="HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="9df7447f59f04e26a711c9cd289c0d02" name="HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="6e099862fb32d89340d934cdc392ba82" name="HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="e39e05351052579f6db967f06eb34124" name="HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="973b359f1e0c27649c661665b6cce6b5" name="HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="636354d2cc7b1e142ed4b4bac719afe7" name="HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="1c27523a1bf4fb4bc1b5efeb31374bf1" name="HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="a610159b4dc4b4f090faab367df05913" name="HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="4cdc8843d64b8954826fe63ab800c4a4" name="HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="5766c211d61ee8e63d84221cdfc0c382" name="HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="eb240130a1906d9c6402db7da045e069" name="HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="6d9eb286dd0ad35fc9a42e888e437a11" name="HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="b1994238ead13791bfae55ac6ead56e2" name="HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="6c673a7c23196cdc6b4b430d8d77e4d0" name="HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="7d76686be9f82a742690c6bc5ac2172b" name="HTMLPurifier/ConfigSchema/schema/Core.Language.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="f6e08c75224c0681a0933aaa70122db1" name="HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="c79d40b21101ebe0f842c84b7f308e97" name="HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="e9f14e5050c5920c7e9006b9f28bd76f" name="HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="27a34d8862655c293db261bfa3b6690f" name="HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="438f7ac032cb0dd31e053c5791975eb3" name="HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="10b09a0750da4d12c0780bcd83bf40cb" name="HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="f9a2ba865c9358f9acdcb1af76c75248" name="HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="89a38cc8baee51e92df7a6f656c958ab" name="HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="8abd158052b5fe867664cb53dc7016ff" name="HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="abfa880ace0da126afa0404db057ccf3" name="HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="6ec326585143d337e8aa91a8449076aa" name="HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="ab8bbc7c368a70b8997cee521f0f8266" name="HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="3d2523b07cbea92b6928a2c32a3bbbc0" name="HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="a8a28c98305dd6a9abb5464acd5c7367" name="HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="e53542febfba19782c49cba0a61cc8c2" name="HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="28380c89a107c47d614155a10a2cbfdf" name="HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="d5f5ebc07893f09271b5910e9515827e" name="HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="21aea6427b2a3c2dfb298d02e96ec669" name="HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="bea8bbdbbd31448a02d92663214e984c" name="HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="12dd6d349d980eee22f922e963c001b4" name="HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="6271b4a4b8b7af81af43f19969c2bde3" name="HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="1b26b5763bb96c96c98abc3236ee6b19" name="HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="41ddfd49fafdfa843b26864ee200d983" name="HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="376c4ef45a5ca3cb19d77774856ddfdf" name="HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="97ddc74ca5ad0affb327e1f593ede768" name="HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="d96aa90796e69c12456daf563af1179a" name="HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="b08ddfb891716ac35c74b281827371b8" name="HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="d0bb87419dd6922763aaa8c4331d53fd" name="HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="a5d0f2c37dc21f4ca4c0aea1143bc906" name="HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="f8d19a8c404092f2f789ddb18cbe2c93" name="HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="35d99a66652595c744ebe8b0ffe48165" name="HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="417ac415d2e698fa41b3272c3357eae2" name="HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="cf02eb79ccac04001536539185d9112b" name="HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="e7572119a13e8d41d980954283020b1b" name="HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="a2a1e573097a562d5bf0e15e87033db8" name="HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="c7e804eef84fd4e84555da46f5e67d78" name="HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt" role="php"/>
-   <file baseinstalldir="/" md5sum="9d2d7c8e8a29bc9ba915d2ec0af4ed89" name="HTMLPurifier/ConfigSchema/schema.ser" role="php"/>
-   <file baseinstalldir="/" md5sum="2da487ed0053dd17f8f4c13a7b3cf04d" name="HTMLPurifier/ConfigSchema/InterchangeBuilder.php" role="php"/>
-   <file baseinstalldir="/" md5sum="b67c7f7562c9eac082a960b3be9f5f1f" name="HTMLPurifier/ConfigSchema/Interchange/Id.php" role="php"/>
-   <file baseinstalldir="/" md5sum="3b11731a184f921ad82632a4d5ca8ea3" name="HTMLPurifier/ConfigSchema/Interchange/Directive.php" role="php"/>
-   <file baseinstalldir="/" md5sum="16ec96e01b7a93a75f6c0d27a3044d2c" name="HTMLPurifier/ConfigSchema/Interchange.php" role="php"/>
-   <file baseinstalldir="/" md5sum="31bf3afba867409fdf11f75eaa3725fd" name="HTMLPurifier/ConfigSchema/Exception.php" role="php"/>
-   <file baseinstalldir="/" md5sum="2f3ef23752e2cb399fea85c3368b2d47" name="HTMLPurifier/ConfigSchema/Builder/Xml.php" role="php"/>
-   <file baseinstalldir="/" md5sum="a9d77f36c69fcdeeaffdddccf53b1aea" name="HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php" role="php"/>
-   <file baseinstalldir="/" md5sum="37ccb7351a8bcc8c49bba3c2d312996d" name="HTMLPurifier/ConfigSchema.php" role="php"/>
-   <file baseinstalldir="/" md5sum="aefeb82b17623a6d0594a084afb664b4" name="HTMLPurifier/Config.php" role="php"/>
-   <file baseinstalldir="/" md5sum="98c3856ffede2c519fa703dee541fc01" name="HTMLPurifier/ChildDef/Table.php" role="php"/>
-   <file baseinstalldir="/" md5sum="538d675731b05c7483ec31e1ae55ca4a" name="HTMLPurifier/ChildDef/StrictBlockquote.php" role="php"/>
-   <file baseinstalldir="/" md5sum="682f8da336f2a1dad1cd7880d4848076" name="HTMLPurifier/ChildDef/Required.php" role="php"/>
-   <file baseinstalldir="/" md5sum="6b324d68260f872dc1a9312608af70bf" name="HTMLPurifier/ChildDef/Optional.php" role="php"/>
-   <file baseinstalldir="/" md5sum="22f2d339fcb60c536e651f80f03f7c82" name="HTMLPurifier/ChildDef/Empty.php" role="php"/>
-   <file baseinstalldir="/" md5sum="13c44a1aaf1ab1b25744758cd1831b4f" name="HTMLPurifier/ChildDef/Custom.php" role="php"/>
-   <file baseinstalldir="/" md5sum="3c557d08cadb051c7e1711376da3acb8" name="HTMLPurifier/ChildDef/Chameleon.php" role="php"/>
-   <file baseinstalldir="/" md5sum="281eaa00a5e3ff98b611b5ebca97bcb0" name="HTMLPurifier/ChildDef.php" role="php"/>
-   <file baseinstalldir="/" md5sum="de2d3205b26e42deaa94d8d74e3692c4" name="HTMLPurifier/Bootstrap.php" role="php"/>
-   <file baseinstalldir="/" md5sum="53aebf76f83099026c95c03844ecf39b" name="HTMLPurifier/AttrValidator.php" role="php"/>
-   <file baseinstalldir="/" md5sum="b1ba10c4bcd37a7f5e9a6c97a81b18c8" name="HTMLPurifier/AttrTypes.php" role="php"/>
-   <file baseinstalldir="/" md5sum="45c48b09a03a9abef719748ce27c4728" name="HTMLPurifier/AttrTransform/Textarea.php" role="php"/>
-   <file baseinstalldir="/" md5sum="aeeb086b76d4bcb87d8a36a61b7ca644" name="HTMLPurifier/AttrTransform/ScriptRequired.php" role="php"/>
-   <file baseinstalldir="/" md5sum="e6239d696e5a698544d8aecef02871da" name="HTMLPurifier/AttrTransform/SafeParam.php" role="php"/>
-   <file baseinstalldir="/" md5sum="6575e1225807af9eb79e3c005b028591" name="HTMLPurifier/AttrTransform/SafeObject.php" role="php"/>
-   <file baseinstalldir="/" md5sum="c9814258f610f4cbc17b6a511289b329" name="HTMLPurifier/AttrTransform/SafeEmbed.php" role="php"/>
-   <file baseinstalldir="/" md5sum="03c2f1e68d493f53430c42d4c8806166" name="HTMLPurifier/AttrTransform/NameSync.php" role="php"/>
-   <file baseinstalldir="/" md5sum="563026acbdd46b682f91cdfea1103ce8" name="HTMLPurifier/AttrTransform/Name.php" role="php"/>
-   <file baseinstalldir="/" md5sum="0c9bfa9cdc93cff8714b237e854f4595" name="HTMLPurifier/AttrTransform/Length.php" role="php"/>
-   <file baseinstalldir="/" md5sum="17dd8373c191efd5c95bfe5fb79ed8fe" name="HTMLPurifier/AttrTransform/Lang.php" role="php"/>
-   <file baseinstalldir="/" md5sum="a0ee62ef96c7ac5c6add36ef47f9ba47" name="HTMLPurifier/AttrTransform/Input.php" role="php"/>
-   <file baseinstalldir="/" md5sum="107148ff2b640ff7afbfc59e638812f5" name="HTMLPurifier/AttrTransform/ImgSpace.php" role="php"/>
-   <file baseinstalldir="/" md5sum="87bd7efd4aaaa1f439a0a948d2c48a52" name="HTMLPurifier/AttrTransform/ImgRequired.php" role="php"/>
-   <file baseinstalldir="/" md5sum="f1f2fb8deb98f319592e4f55545facee" name="HTMLPurifier/AttrTransform/EnumToCSS.php" role="php"/>
-   <file baseinstalldir="/" md5sum="faca234a22422d5cf69ca7068145eac8" name="HTMLPurifier/AttrTransform/Border.php" role="php"/>
-   <file baseinstalldir="/" md5sum="b7d7e4d45de29fc50eefdc97e760e6d5" name="HTMLPurifier/AttrTransform/BoolToCSS.php" role="php"/>
-   <file baseinstalldir="/" md5sum="ec7f74671186c8e5e93a381cce6470fa" name="HTMLPurifier/AttrTransform/BgColor.php" role="php"/>
-   <file baseinstalldir="/" md5sum="3e6afa73230fc31d74eb382bd42bb18a" name="HTMLPurifier/AttrTransform/BdoDir.php" role="php"/>
-   <file baseinstalldir="/" md5sum="1decd9fa8e0777811024260549d29aaa" name="HTMLPurifier/AttrTransform/Background.php" role="php"/>
-   <file baseinstalldir="/" md5sum="18870fa532d982a78f20d00e93b6ba3e" name="HTMLPurifier/AttrTransform.php" role="php"/>
-   <file baseinstalldir="/" md5sum="44004a19ee045f386993905c84600d61" name="HTMLPurifier/AttrDef/URI/IPv6.php" role="php"/>
-   <file baseinstalldir="/" md5sum="da52096d6feb81bd8a40f9d5ed439139" name="HTMLPurifier/AttrDef/URI/IPv4.php" role="php"/>
-   <file baseinstalldir="/" md5sum="38b3ca8b1c3522fbbd27bce785bc58ab" name="HTMLPurifier/AttrDef/URI/Host.php" role="php"/>
-   <file baseinstalldir="/" md5sum="cebebf0d99b63ecd2072f37e69055b6c" name="HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php" role="php"/>
-   <file baseinstalldir="/" md5sum="958e3072379737950b8ce0f6823ac8eb" name="HTMLPurifier/AttrDef/URI/Email.php" role="php"/>
-   <file baseinstalldir="/" md5sum="05afd73beee5b644bc49790b7a0dde0f" name="HTMLPurifier/AttrDef/URI.php" role="php"/>
-   <file baseinstalldir="/" md5sum="0ad9dcd58ce4f104006b59a9df51802a" name="HTMLPurifier/AttrDef/Text.php" role="php"/>
-   <file baseinstalldir="/" md5sum="8fcf6999bbd3f2cd9d3780182d91be7d" name="HTMLPurifier/AttrDef/Switch.php" role="php"/>
-   <file baseinstalldir="/" md5sum="04a72938e4c07553d9a18ae6649cd90f" name="HTMLPurifier/AttrDef/Lang.php" role="php"/>
-   <file baseinstalldir="/" md5sum="f57bc53b7c7a29b0c4324e0ad2039c2a" name="HTMLPurifier/AttrDef/Integer.php" role="php"/>
-   <file baseinstalldir="/" md5sum="95962e03883b9a84496487a1f8af5da3" name="HTMLPurifier/AttrDef/HTML/Pixels.php" role="php"/>
-   <file baseinstalldir="/" md5sum="8face464a844799e3aab2e9f4f918868" name="HTMLPurifier/AttrDef/HTML/Nmtokens.php" role="php"/>
-   <file baseinstalldir="/" md5sum="122498f21ff87dcab5ec8f1dfb51d39c" name="HTMLPurifier/AttrDef/HTML/MultiLength.php" role="php"/>
-   <file baseinstalldir="/" md5sum="ed11d4126e34e45fd127650a45f0ee56" name="HTMLPurifier/AttrDef/HTML/LinkTypes.php" role="php"/>
-   <file baseinstalldir="/" md5sum="a38926a6e784e67d5cd7e9d657802214" name="HTMLPurifier/AttrDef/HTML/Length.php" role="php"/>
-   <file baseinstalldir="/" md5sum="bd36cb0c65c586c2d1dff7a44a4bf0dc" name="HTMLPurifier/AttrDef/HTML/ID.php" role="php"/>
-   <file baseinstalldir="/" md5sum="96026f3e8ffdc70e533f306e63322923" name="HTMLPurifier/AttrDef/HTML/FrameTarget.php" role="php"/>
-   <file baseinstalldir="/" md5sum="ed699f61359c5d7ab046d248253e5d9e" name="HTMLPurifier/AttrDef/HTML/Color.php" role="php"/>
-   <file baseinstalldir="/" md5sum="fa319109d0c0e5989a24f550c884c1b5" name="HTMLPurifier/AttrDef/HTML/Class.php" role="php"/>
-   <file baseinstalldir="/" md5sum="c579b5a145c447f1880c7bc6d3db774c" name="HTMLPurifier/AttrDef/HTML/Bool.php" role="php"/>
-   <file baseinstalldir="/" md5sum="1a11be0015a161c2a11d6c51305f45fa" name="HTMLPurifier/AttrDef/Enum.php" role="php"/>
-   <file baseinstalldir="/" md5sum="aea3d16cd52cbdf70ec2c9fd6e28b166" name="HTMLPurifier/AttrDef/CSS/URI.php" role="php"/>
-   <file baseinstalldir="/" md5sum="54f6f27a44bdb66d6197a46ba89213e8" name="HTMLPurifier/AttrDef/CSS/TextDecoration.php" role="php"/>
-   <file baseinstalldir="/" md5sum="10afadc403e14974645b3e1c17f83adb" name="HTMLPurifier/AttrDef/CSS/Percentage.php" role="php"/>
-   <file baseinstalldir="/" md5sum="0f1f03450117004aabb529c43f154334" name="HTMLPurifier/AttrDef/CSS/Number.php" role="php"/>
-   <file baseinstalldir="/" md5sum="2c4560cf0dd700ae39c0a553140ffd1b" name="HTMLPurifier/AttrDef/CSS/Multiple.php" role="php"/>
-   <file baseinstalldir="/" md5sum="3d888cc157a4ea616dc1e94dd5f1c21e" name="HTMLPurifier/AttrDef/CSS/ListStyle.php" role="php"/>
-   <file baseinstalldir="/" md5sum="6774b03e0b29672961ad4fba15c25787" name="HTMLPurifier/AttrDef/CSS/Length.php" role="php"/>
-   <file baseinstalldir="/" md5sum="9a9a4ef13940096bbe18037d54cb056f" name="HTMLPurifier/AttrDef/CSS/ImportantDecorator.php" role="php"/>
-   <file baseinstalldir="/" md5sum="59ca381609f084649bf71d8093eab3a9" name="HTMLPurifier/AttrDef/CSS/FontFamily.php" role="php"/>
-   <file baseinstalldir="/" md5sum="c14c12936339b03f24e9b50cd5273450" name="HTMLPurifier/AttrDef/CSS/Font.php" role="php"/>
-   <file baseinstalldir="/" md5sum="54e42fbf58fe9c70ef082d6a8f8be821" name="HTMLPurifier/AttrDef/CSS/Filter.php" role="php"/>
-   <file baseinstalldir="/" md5sum="a112e7c263f001b9ac062ea64201cccd" name="HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php" role="php"/>
-   <file baseinstalldir="/" md5sum="ac75113a9cbfe6bfe8d3afe36444f272" name="HTMLPurifier/AttrDef/CSS/Composite.php" role="php"/>
-   <file baseinstalldir="/" md5sum="4bd2e4e9cd6e71ca7a6cb5e62700b380" name="HTMLPurifier/AttrDef/CSS/Color.php" role="php"/>
-   <file baseinstalldir="/" md5sum="0301346329aae91bae8924c90d3d4688" name="HTMLPurifier/AttrDef/CSS/Border.php" role="php"/>
-   <file baseinstalldir="/" md5sum="ecc93e18d1aeea6e8231119575e40e9c" name="HTMLPurifier/AttrDef/CSS/BackgroundPosition.php" role="php"/>
-   <file baseinstalldir="/" md5sum="8a16f12cb9b9f6d941b7a82f1c40862c" name="HTMLPurifier/AttrDef/CSS/Background.php" role="php"/>
-   <file baseinstalldir="/" md5sum="f0232cc2a7573418b8ebe5efcf108c46" name="HTMLPurifier/AttrDef/CSS/AlphaValue.php" role="php"/>
-   <file baseinstalldir="/" md5sum="6caf3a641704cee2aeb15b4eb1c287c9" name="HTMLPurifier/AttrDef/CSS.php" role="php"/>
-   <file baseinstalldir="/" md5sum="c2ac5eb00e5fe0dfe53793a532243826" name="HTMLPurifier/AttrDef.php" role="php"/>
-   <file baseinstalldir="/" md5sum="5b1067853574bae62d9cd70370ff10af" name="HTMLPurifier/AttrCollections.php" role="php"/>
-   <file baseinstalldir="/" md5sum="23904b4310c99fa9da91bff4bd3b223a" name="HTMLPurifier.safe-includes.php" role="php"/>
-   <file baseinstalldir="/" md5sum="a630aa63016ded28453e109edc35d331" name="HTMLPurifier.php" role="php"/>
-   <file baseinstalldir="/" md5sum="25043ef5e632f88e8d5c825a8516a1cc" name="HTMLPurifier.kses.php" role="php"/>
-   <file baseinstalldir="/" md5sum="d1c01716d0f9c51bc61183466eb7e4c1" name="HTMLPurifier.includes.php" role="php"/>
-   <file baseinstalldir="/" md5sum="f09594e7a7db5826b4b3aef3b9f874ed" name="HTMLPurifier.func.php" role="php"/>
-   <file baseinstalldir="/" md5sum="4bb70e5ba6b06a23b8416cc0e59254bb" name="HTMLPurifier.autoload.php" role="php"/>
-   <file baseinstalldir="/" md5sum="0f6dba2689f471c382240c8d2d7892ba" name="HTMLPurifier.auto.php" role="php"/>
-  </dir>
- </contents>
- <dependencies>
-  <required>
-   <php>
-    <min>5.0.0</min>
-   </php>
-   <pearinstaller>
-    <min>1.4.3</min>
-   </pearinstaller>
-  </required>
- </dependencies>
- <phprelease>
-  <changelog>
-   <release>
-    <version>
-     <release>4.0.0</release>
-     <api>4.0</api>
-    </version>
-    <stability>
-     <release>stable</release>
-     <api>stable</api>
-    </stability>
-    <date>2009-07-07</date>
-    <license uri="http://www.gnu.org/licenses/lgpl.html">LGPL</license>
-    <notes>
-HTML Purifier 4.0 is a major feature release focused on configuration
-It deprecates the $config-&gt;set('Ns', 'Directive', $value) syntax for
-$config-&gt;set('Ns.Directive', $value); both syntaxes work but the
-former will throw errors.  There are also some new features:  robust
-support for name/id, configuration inheritance, remove nbsp in
-the RemoveEmpty autoformatter, userland configuration directives
-and configuration serialization.
-   </notes>
-   </release>
-  </changelog>
- </phprelease>
-</package>
diff --git a/lib/.xmlregistry/packages/pear.unl.edu/UNL_Autoload/0.5.0-info.xml b/lib/.xmlregistry/packages/pear.unl.edu/UNL_Autoload/0.5.0-info.xml
deleted file mode 100644
index e42cd50595111d19c604db954a48b397b18a30db..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/packages/pear.unl.edu/UNL_Autoload/0.5.0-info.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.8.0alpha1" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0     http://pear.php.net/dtd/tasks-1.0.xsd     http://pear.php.net/dtd/package-2.0     http://pear.php.net/dtd/package-2.0.xsd">
- <name>UNL_Autoload</name>
- <channel>pear.unl.edu</channel>
- <summary>An autoloader implementation for UNL PEAR packages</summary>
- <description>This package provides an autoloader for classes beginning
- with UNL_ and is mainly used for autoloading package files from http://pear.unl.edu/.</description>
- <lead>
-  <name>Brett Bieber</name>
-  <user>saltybeagle</user>
-  <email>brett.bieber@gmail.com</email>
-  <active>yes</active>
- </lead>
- <date>2010-04-15</date>
- <time>09:16:05</time>
- <version>
-  <release>0.5.0</release>
-  <api>0.5.0</api>
- </version>
- <stability>
-  <release>alpha</release>
-  <api>alpha</api>
- </stability>
- <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
- <notes>* First release.</notes>
- <contents>
-  <dir name="/">
-   <file baseinstalldir="/" md5sum="2d13c44763ebe506f915d211dcd8f00a" name="UNL/Autoload.php" role="php"/>
-  </dir>
- </contents>
- <dependencies>
-  <required>
-   <php>
-    <min>5.2.0</min>
-   </php>
-   <pearinstaller>
-    <min>1.4.3</min>
-   </pearinstaller>
-  </required>
- </dependencies>
- <phprelease>
-  <changelog>
-   <release>
-    <version>
-     <release>0.5.0</release>
-     <api>0.5.0</api>
-    </version>
-    <stability>
-     <release>alpha</release>
-     <api>alpha</api>
-    </stability>
-    <date>2008-11-10</date>
-    <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
-    <notes>* First release.</notes>
-   </release>
-  </changelog>
- </phprelease>
-</package>
diff --git a/lib/.xmlregistry/packages/pear.unl.edu/UNL_Cache_Lite/0.1.0-info.xml b/lib/.xmlregistry/packages/pear.unl.edu/UNL_Cache_Lite/0.1.0-info.xml
deleted file mode 100644
index a0fd9417fa39625754378e57092db98879ceee19..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/packages/pear.unl.edu/UNL_Cache_Lite/0.1.0-info.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0     http://pear.php.net/dtd/tasks-1.0.xsd     http://pear.php.net/dtd/package-2.0     http://pear.php.net/dtd/package-2.0.xsd">
- <name>UNL_Cache_Lite</name>
- <channel>pear.unl.edu</channel>
- <summary>Basic caching library</summary>
- <description>This is a port of the Cache_Lite package from PEAR, with support for PHP 5 and
-exceptions.
-This package is a little cache system optimized for file containers. It is fast
-and safe (because it uses file locking and/or anti-corruption tests).</description>
- <lead>
-  <name>Brett Bieber</name>
-  <user>saltybeagle</user>
-  <email>brett.bieber@gmail.com</email>
-  <active>yes</active>
- </lead>
- <date>2011-03-10</date>
- <time>14:06:49</time>
- <version>
-  <release>0.1.0</release>
-  <api>0.1.0</api>
- </version>
- <stability>
-  <release>beta</release>
-  <api>beta</api>
- </stability>
- <license uri="http://www.gnu.org/licenses/lgpl-3.0.txt">LGPL</license>
- <notes>
-Port of cache lite, remove PEAR dependency, use exceptions instead of PEAR_Error.
- </notes>
- <contents>
-  <dir name="/">
-   <file baseinstalldir="/" md5sum="ea88bd9816a106e30ac2939a28679fc7" name="UNL/Cache/Lite/Output.php" role="php"/>
-   <file baseinstalldir="/" md5sum="537413f3d9e949be31a1dd9f42c1dd5c" name="UNL/Cache/Lite/NestedOutput.php" role="php"/>
-   <file baseinstalldir="/" md5sum="95bccdc3a6ec0d54ab4adf3ce03d4b55" name="UNL/Cache/Lite/Function.php" role="php"/>
-   <file baseinstalldir="/" md5sum="33a3fc682d63cef8f5cf126637001662" name="UNL/Cache/Lite/File.php" role="php"/>
-   <file baseinstalldir="/" md5sum="7f02fa5030fe224535a8849aa0d98741" name="UNL/Cache/Lite.php" role="php"/>
-   <file baseinstalldir="/" md5sum="4c638b951a7c8a4dcb94f10abf1d818b" name="TODO" role="data"/>
-   <file baseinstalldir="/" md5sum="085e7fb76fb3fa8ba9e9ed0ce95a43f9" name="LICENSE" role="data"/>
-   <file baseinstalldir="/" md5sum="934071f21c17611811e01396ca604c79" name="docs/technical" role="doc"/>
-   <file baseinstalldir="/" md5sum="516beafae66ea4b9fd7d29ab9c90845d" name="docs/examples" role="doc"/>
-  </dir>
- </contents>
- <dependencies>
-  <required>
-   <php>
-    <min>5.1.2</min>
-   </php>
-   <pearinstaller>
-    <min>1.5.4</min>
-   </pearinstaller>
-  </required>
- </dependencies>
- <phprelease>
-  <changelog>
-   <release>
-    <version>
-     <release>0.1.0</release>
-     <api>0.1.0</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2009-10-20</date>
-    <license uri="http://www.gnu.org/licenses/lgpl-3.0.txt">LGPL</license>
-    <notes>
-Port of cache lite, remove PEAR dependency, use exceptions instead of PEAR_Error.
-   </notes>
-   </release>
-  </changelog>
- </phprelease>
-</package>
diff --git a/lib/.xmlregistry/packages/pear.unl.edu/UNL_DWT/0.9.0-info.xml b/lib/.xmlregistry/packages/pear.unl.edu/UNL_DWT/0.9.0-info.xml
deleted file mode 100644
index 5f33c0c70795ee002dcc7db4e848e5573b0904e6..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/packages/pear.unl.edu/UNL_DWT/0.9.0-info.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.1" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0     http://pear.php.net/dtd/tasks-1.0.xsd     http://pear.php.net/dtd/package-2.1     http://pear.php.net/dtd/package-2.1.xsd" packagerversion="2.0.0">
- <name>UNL_DWT</name>
- <channel>pear.unl.edu</channel>
- <summary>This package generates php class files (objects) from Dreamweaver template files.
-</summary>
- <description>
-This package generates php class files (objects) from Dreamweaver template files.
-</description>
- <lead>
-  <name>Brett Bieber</name>
-  <user>saltybeagle</user>
-  <email>brett.bieber@gmail.com</email>
-  <active>yes</active>
- </lead>
- <date>2014-04-14</date>
- <time>09:00:33</time>
- <version>
-  <release>0.9.0</release>
-  <api>0.7.1</api>
- </version>
- <stability>
-  <release>beta</release>
-  <api>beta</api>
- </stability>
- <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD</license>
- <notes>Feature Release
-* Add support for immedaitely rendering a scanned DWT [saltybeagle]
-
-Bug Fixes
- * Prevent greedy matching of template regions [spam38]
-</notes>
- <contents>
-  <dir name="/">
-   <file role="php" name="php/UNL/DWT/Scanner.php" md5sum="276e82e5db587c9c18a100e1e877082e"/>
-   <file role="php" name="php/UNL/DWT/Region.php" md5sum="858136d43bf29868dca876783e51d196"/>
-   <file role="php" name="php/UNL/DWT/Generator.php" md5sum="a3b933a0d7f8d81f72836bb2c5fb6914"/>
-   <file role="php" name="php/UNL/DWT/Exception.php" md5sum="5b99b44fbfde7349c6b9e6d9be78e9dc"/>
-   <file role="php" name="php/UNL/DWT/createTemplates.php" md5sum="9089565d275b52e0cd65c52edd50ef18"/>
-   <file role="php" name="php/UNL/DWT.php" md5sum="ca9d707c266ad9150e39d1a9a60c5643"/>
-   <file role="doc" name="doc/pear.unl.edu/UNL_DWT/examples/scanner_example.php" md5sum="2d16f0e62c4227aa28108bf78d74156a"/>
-   <file role="doc" name="doc/pear.unl.edu/UNL_DWT/examples/basic/Template_style1.tpl" md5sum="b524ef4684be7dba47ed8c245577347a"/>
-   <file role="doc" name="doc/pear.unl.edu/UNL_DWT/examples/basic/Template_style1.php" md5sum="096998b112a1e27bddc6c171380d590e"/>
-   <file role="doc" name="doc/pear.unl.edu/UNL_DWT/examples/basic/template_style1.dwt" md5sum="0d5a4f5ca86e9c2a3c0050f39acbb034"/>
-   <file role="doc" name="doc/pear.unl.edu/UNL_DWT/examples/basic/example_style1.php" md5sum="d3f43ac017b9bdf1819cf05a4c4a33a2"/>
-   <file role="doc" name="doc/pear.unl.edu/UNL_DWT/examples/basic/example.test.ini" md5sum="28a080af44b5db3f28c73fa91cdabe99"/>
-   <file role="doc" name="doc/pear.unl.edu/UNL_DWT/examples/basic/example.ini" md5sum="d5f99a1b621d226611d2fe93761db93d"/>
-  </dir>
- </contents>
- <dependencies>
-  <required>
-   <php>
-    <min>5.0.0</min>
-   </php>
-   <pearinstaller>
-    <min>2.0.0a1</min>
-   </pearinstaller>
-   <package>
-    <name>UNL_Templates</name>
-    <channel>pear.unl.edu</channel>
-    <max>0.5.2</max>
-    <conflicts/>
-   </package>
-  </required>
- </dependencies>
- <phprelease>
-  <changelog>
-   <release>
-    <version>
-     <release>0.1.0</release>
-     <api>0.1.0</api>
-    </version>
-    <stability>
-     <release>alpha</release>
-     <api>alpha</api>
-    </stability>
-    <date>2006-01-26</date>
-    <license>PHP License</license>
-    <notes>
-First release, only basic functionality.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>0.1.1</release>
-     <api>0.1.0</api>
-    </version>
-    <stability>
-     <release>alpha</release>
-     <api>alpha</api>
-    </stability>
-    <date>2006-02-06</date>
-    <license>PHP License</license>
-    <notes>
-Added generator options generator_include/eclude_regex and extends and extends_location.
-Create dwt_location and tpl_location if it does not exist yet.
-Remove editable region tags for locked regions.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>0.1.2</release>
-     <api>0.1.0</api>
-    </version>
-    <stability>
-     <release>alpha</release>
-     <api>alpha</api>
-    </stability>
-    <date>2006-02-24</date>
-    <license>PHP License</license>
-    <notes>
-* Added missing setOption function. Initially only debug option is available.
-* Renamed internally used function between to UNL_DWT_between
-* created externally callable replaceRegions function.
-* debug function for outputting messages levels 0-5.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>0.5.0</release>
-     <api>0.1.0</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2006-08-15</date>
-    <license uri="http://www.php.net/license">PHP License</license>
-    <notes>
-* Fix Bug #16: Locked regions aren't detected correctly.
-				 * Fix Bug #1: Include path modified incorrectly.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>0.5.1</release>
-     <api>0.1.0</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2008-02-07</date>
-    <license uri="http://www.php.net/license">PHP License</license>
-    <notes>
-* Switch to using static properties, PHP 5, add docheader.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>0.6.0</release>
-     <api>0.2.0</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2008-03-26</date>
-    <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD</license>
-    <notes>
-Move code around. DWT.php is now in UNL/DWT.php instead of UNL/DWT/DWT.php = not compatible with old versions of UNL_Templates!
-* Switch to using static properties
-* Upgrade a lot of code to PHP 5
-* Add phpdoc headers and coding standards fixes
-* Switch to BSD license.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>0.6.1</release>
-     <api>0.2.0</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2008-04-08</date>
-    <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD</license>
-    <notes>
-Change is_a() to instanceof to fix warning.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>0.7.0</release>
-     <api>0.7.0</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2008-06-30</date>
-    <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD</license>
-    <notes>
-Move region class into separate file.
-Add scanner for simply scanning a dwt for regions, this does not replace the
-generator, but supplements it.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>0.7.1</release>
-     <api>0.7.1</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2009-07-01</date>
-    <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD</license>
-    <notes>
-Declare debug method correctly as static.
-   </notes>
-   </release>
-  </changelog>
- </phprelease>
-</package>
diff --git a/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.4.0RC3-info.xml b/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.4.0RC3-info.xml
deleted file mode 100644
index 32d68255e8bfc0481669089faf95283dc0a1c385..0000000000000000000000000000000000000000
--- a/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.4.0RC3-info.xml
+++ /dev/null
@@ -1,718 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.1" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.1" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0     http://pear.php.net/dtd/tasks-1.0.xsd     http://pear.php.net/dtd/package-2.1     http://pear.php.net/dtd/package-2.1.xsd" packagerversion="2.0.0">
- <name>UNL_Templates</name>
- <channel>pear.unl.edu</channel>
- <summary>The UNL HTML Templates as a PEAR Package.
-</summary>
- <description>
-This package allows you to render UNL Template styled pages using PHP Objects.
-</description>
- <lead>
-  <name>Brett Bieber</name>
-  <user>saltybeagle</user>
-  <email>brett.bieber@gmail.com</email>
-  <active>yes</active>
- </lead>
- <lead>
-  <name>Ned Hummel</name>
-  <user>nhummel2</user>
-  <email>nhummel2@math.unl.edu</email>
-  <active>yes</active>
- </lead>
- <date>2014-04-14</date>
- <time>09:00:33</time>
- <version>
-  <release>1.4.0RC3</release>
-  <api>1.0.0</api>
- </version>
- <stability>
-  <release>beta</release>
-  <api>stable</api>
- </stability>
- <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
- <notes>Finalize support for version 4.0 of the templates
-
-Templates Supported:
-* Fixed
-* Debug
-* Unlaffiliate
-* Unlaffiliate_debug
-* Unlaffiliate_local
-
-Fixed in this RC:
-* Use local .tpl files instead of always pulling remotely
-* Make HTML and DEP replacements when local files do not exist
-</notes>
- <contents>
-  <dir name="/">
-   <file role="test" name="test/pear.unl.edu/UNL_Templates/UNL_TemplatesTest.php" md5sum="12aa5989d1255dccc299a3dcdd6c6ba8"/>
-   <file role="php" name="php/UNL/Templates/Version4/Unlaffiliate_local.php" md5sum="29aa6297ac4e0232b24ae1a8fe9f308b"/>
-   <file role="php" name="php/UNL/Templates/Version4/Unlaffiliate_debug.php" md5sum="6ea82eb59a907fd102be43ead8cbbaed"/>
-   <file role="php" name="php/UNL/Templates/Version4/Unlaffiliate.php" md5sum="484425e481e37630fa7751f9e11e094a"/>
-   <file role="php" name="php/UNL/Templates/Version4/Local.php" md5sum="3849a40fda6f284fa07b47984c77235f"/>
-   <file role="php" name="php/UNL/Templates/Version4/Fixed.php" md5sum="42734ab8643a005e1551a7613729177d"/>
-   <file role="php" name="php/UNL/Templates/Version4/Debug.php" md5sum="dd25adcf52c589bd099322231ca572e6"/>
-   <file role="php" name="php/UNL/Templates/Version4.php" md5sum="5b57e3495a1e6d946c5177d23c6565f1"/>
-   <file role="php" name="php/UNL/Templates/Version3x1/Unlaffiliate_local.php" md5sum="e3f4b2b27e5cbbd81f3a434fdcd949d4"/>
-   <file role="php" name="php/UNL/Templates/Version3x1/Unlaffiliate_debug.php" md5sum="0e7a53d410d00748c53cb9036d43a178"/>
-   <file role="php" name="php/UNL/Templates/Version3x1/Unlaffiliate.php" md5sum="c9e2423f1508286947525968dddd56cb"/>
-   <file role="php" name="php/UNL/Templates/Version3x1/Local.php" md5sum="b18901fcb9b7d59f0de947f649e0cba7"/>
-   <file role="php" name="php/UNL/Templates/Version3x1/Fixed.php" md5sum="1cdda4bc708879eaeb6052aa50980820"/>
-   <file role="php" name="php/UNL/Templates/Version3x1/Debug.php" md5sum="880a7ec565da26995e7fa4b21163e1d3"/>
-   <file role="php" name="php/UNL/Templates/Version3x1.php" md5sum="2b905fceee314ba84447bbaefdd86073"/>
-   <file role="php" name="php/UNL/Templates/Version3/Unlaffiliate.php" md5sum="40eeca840e02c9e5b2b2b7846bd73397"/>
-   <file role="php" name="php/UNL/Templates/Version3/Shared_column_right.php" md5sum="f9b3c237b7a6b8500ef0d18f4e1c9595"/>
-   <file role="php" name="php/UNL/Templates/Version3/Shared_column_left.php" md5sum="c8e40b9ff760f0d6da578f6f52e85ab2"/>
-   <file role="php" name="php/UNL/Templates/Version3/Secure.php" md5sum="7586ee8d6db673dbef56fe491a0ac517"/>
-   <file role="php" name="php/UNL/Templates/Version3/Popup.php" md5sum="1d63a45e6f7e86585182a09ff8e33962"/>
-   <file role="php" name="php/UNL/Templates/Version3/Mobile.php" md5sum="88ed3fab2afd3f989c53db231ea99715"/>
-   <file role="php" name="php/UNL/Templates/Version3/Liquid.php" md5sum="5ae65bf4c045a5b9b65b726b52d6cd26"/>
-   <file role="php" name="php/UNL/Templates/Version3/Fixed_html5.php" md5sum="183165807ee292fa17a03314c5455a6b"/>
-   <file role="php" name="php/UNL/Templates/Version3/Fixed.php" md5sum="041aae52a187c4986e495a8643b43ae4"/>
-   <file role="php" name="php/UNL/Templates/Version3/Document.php" md5sum="01035abd6b488663747399e74d0065bc"/>
-   <file role="php" name="php/UNL/Templates/Version3/Debug.php" md5sum="05eb7e3f0639e79aeb2e4f5061a356f1"/>
-   <file role="php" name="php/UNL/Templates/Version3/Absolute.php" md5sum="315f0d6be4459208f7733e6e29f99c91"/>
-   <file role="php" name="php/UNL/Templates/Version3.php" md5sum="7edb40844a43918f467f6cf881424aaf"/>
-   <file role="php" name="php/UNL/Templates/Version2/Unlstandardtemplate.php" md5sum="48a0fd1e66226418db0c7c5202343881"/>
-   <file role="php" name="php/UNL/Templates/Version2/Unlframework.php" md5sum="e902fc42cdcb7633fbe07f4d509a1b97"/>
-   <file role="php" name="php/UNL/Templates/Version2/Unlaffiliate.php" md5sum="bdac0dc69918a491efcee2450d99738f"/>
-   <file role="php" name="php/UNL/Templates/Version2/Secure.php" md5sum="f43c4b5320cf2def6d90c71f3e22c1fb"/>
-   <file role="php" name="php/UNL/Templates/Version2/Popup.php" md5sum="0a1b634408248289e89649a49bd7759c"/>
-   <file role="php" name="php/UNL/Templates/Version2/Liquid.php" md5sum="55c715aa91f18226f5be4c3f427b2dea"/>
-   <file role="php" name="php/UNL/Templates/Version2/Fixed.php" md5sum="3fbccc1b6e7a0287577972b4c25a0d19"/>
-   <file role="php" name="php/UNL/Templates/Version2/Document.php" md5sum="ef2068426bb8f73ac706b18a472df967"/>
-   <file role="php" name="php/UNL/Templates/Version2.php" md5sum="d8f5200292c4216e423fc7c5da502e44"/>
-   <file role="php" name="php/UNL/Templates/Version.php" md5sum="c7df0501ec102431d7be6a6cfd133b5b"/>
-   <file role="php" name="php/UNL/Templates/Scanner.php" md5sum="82740c1fadfd1160bb9c67006947ab3b"/>
-   <file role="php" name="php/UNL/Templates/CachingService/UNLCacheLite.php" md5sum="4fa04418d0aa08834b4795caeae5b8c8"/>
-   <file role="php" name="php/UNL/Templates/CachingService/Null.php" md5sum="47991f0e5cffed6d138725a3294f4e6a"/>
-   <file role="php" name="php/UNL/Templates/CachingService/CacheLite.php" md5sum="5b09b184e7d59a2520e99c0b5c66428a"/>
-   <file role="php" name="php/UNL/Templates/CachingService.php" md5sum="07884c3a9bf75657e54782423a088eb4"/>
-   <file role="php" name="php/UNL/Templates.php" md5sum="6f844645177ff75a899210f3a29bfd04"/>
-   <file role="doc" name="doc/pear.unl.edu/UNL_Templates/examples/scanner.php" md5sum="2b116cf09b8d73c439718217d83a32c2"/>
-   <file role="doc" name="doc/pear.unl.edu/UNL_Templates/examples/example1.php" md5sum="a55812397a3979fdc939fc1942b8c23c"/>
-   <file role="doc" name="doc/pear.unl.edu/UNL_Templates/examples/customization/customization_example.php" md5sum="e9769bdf0cf9ec36430b3f70ec687037"/>
-   <file role="doc" name="doc/pear.unl.edu/UNL_Templates/examples/customization/customization_example.html" md5sum="26c8d867af8ffd4d8d60e348573f9c3d"/>
-   <file role="doc" name="doc/pear.unl.edu/UNL_Templates/examples/customization/CustomClass.php" md5sum="43bc783b2215f9668800ce2e80ad457b"/>
-   <file role="doc" name="doc/pear.unl.edu/UNL_Templates/examples/convert.php" md5sum="a7114a3868d0ba54d4ff76b370ea3201"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Unlaffiliate_local.tpl" md5sum="c39c8c2553dd541cade23ed8f0031017"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Unlaffiliate_debug.tpl" md5sum="5013bd2410d9a9d962eec536fee0e855"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Unlaffiliate.tpl" md5sum="91d4b14e957142ceea9dd47e50924813"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Local.tpl" md5sum="90bd85043d58ecfd0d5a87f370aeea45"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Fixed.tpl" md5sum="2b2cc7f7d80c681700c434b5cbf55d2f"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Debug.tpl" md5sum="2e8f964c461d4c321b199c75b4a71f59"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate_local.tpl" md5sum="0802ccd854dfe1d6a3f0a22ad7ff09c4"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate_debug.tpl" md5sum="241be8cc9780847dece60b54358de9a3"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate.tpl" md5sum="5b30670bdbd48ecf9eaa9d6f505693f2"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Local.tpl" md5sum="4eef418e9e527224b9347e635e95dfba"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Fixed.tpl" md5sum="a2151b63d3861496e785f4b10f3b44be"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Debug.tpl" md5sum="037f834d2e9cd17856d83a6fbd0465dc"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Unlaffiliate.tpl" md5sum="6644923a681f49bfd425f5768d01e4a3"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Shared_column_right.tpl" md5sum="84cc265b12115d9c2733a6d03f5a4d85"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Shared_column_left.tpl" md5sum="6003b105b79241b8e001d0f375265747"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Secure.tpl" md5sum="6a5f82b61c2c2191494af9fe1384bdca"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Popup.tpl" md5sum="1f3b340e18024423748839343369443d"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Mobile.tpl" md5sum="aa53260716fc4f1d2fc31d149416b7e0"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Liquid.tpl" md5sum="4b576a99e001b22d3c77b01f72789546"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Fixed_html5.tpl" md5sum="9cedaa7c695c654e0f16fa534e35ec32"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Fixed.tpl" md5sum="783216b7dc343283a21ba3f8a8e5396b"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Document.tpl" md5sum="8a7ecbc31b2a4d85bad056f7c0d06039"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Debug.tpl" md5sum="fe52677e48d48d798d70e9cad4b5c0ed"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Absolute.tpl" md5sum="b3cf17273448a34ac869d4369663e819"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlstandardtemplate.tpl" md5sum="2082f29e6219b9fdad0faffb2bf9a427"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlframework.tpl" md5sum="465cb4e7eef89560faf0c63065d8a9d3"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlaffiliate.tpl" md5sum="9f4650a475623a3cf293998c0e5b3233"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Secure.tpl" md5sum="962fecd9908d504e4749f7eb79dc4736"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Popup.tpl" md5sum="a70442037d218c0dc948638bca8e5e08"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Liquid.tpl" md5sum="1a936fdcd4d17383490bd5aef1219ce8"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Fixed.tpl" md5sum="df5ce334e93b844794699f3cc62d20b9"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Document.tpl" md5sum="61cc4ae92fac84a7d38131769c2298ba"/>
-   <file role="data" name="data/pear.unl.edu/UNL_Templates/cssUNLTemplates.ini" md5sum="e2360f35ff791e3566351d8baa955d5b"/>
-  </dir>
- </contents>
- <dependencies>
-  <required>
-   <php>
-    <min>5.0.0</min>
-   </php>
-   <pearinstaller>
-    <min>2.0.0a1</min>
-   </pearinstaller>
-   <package>
-    <name>UNL_DWT</name>
-    <channel>pear.unl.edu</channel>
-    <min>0.8.0</min>
-   </package>
-  </required>
-  <optional>
-   <package>
-    <name>Cache_Lite</name>
-    <channel>pear.php.net</channel>
-    <min>1.0</min>
-   </package>
-   <package>
-    <name>UNL_Cache_Lite</name>
-    <channel>pear.unl.edu</channel>
-    <min>0.1.0</min>
-   </package>
-  </optional>
- </dependencies>
- <phprelease>
-  <changelog>
-   <release>
-    <version>
-     <release>0.1.0</release>
-     <api>0.1.0</api>
-    </version>
-    <stability>
-     <release>alpha</release>
-     <api>alpha</api>
-    </stability>
-    <date>2006-03-02</date>
-    <license>PHP License</license>
-    <notes>
-First release, only basic functionality, we assume you have /unlpub/templatedependents/ set up on your server already.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>0.5.0</release>
-     <api>0.5.0</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2006-08-14</date>
-    <license uri="http://www.php.net/license">PHP License</license>
-    <notes>
-Updates the package to use the new 2006-08 UNL Templates. Template dependents /ucomm/templatedependents/ are still required outside of this package. Added new replacement functions to handle the template dependent replacements.
-		Removed evalPHPFile function... not needed anymore.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>0.5.1</release>
-     <api>0.5.0</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2007-01-05</date>
-    <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD License</license>
-    <notes>
-Change license to BSD, update tpl_cache to UNL Templates created on 2007-01-05. No other changes.
-	All users with previous versions do not need to upgrade because the server will automatically serve out new tpl files.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>0.5.2</release>
-     <api>0.5.0</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2007-11-29</date>
-    <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD License</license>
-    <notes>
-Add check that file can actually be opened.
-No other changes.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>1.0.0RC1</release>
-     <api>1.0.0</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2008-03-26</date>
-    <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
-    <notes>
-Feature Release!
-New methods:
-* addHeadLink($href, $relation, $relType = 'rel', array $attributes = array())
-* addScript($url, $type = 'text/javascript')
-* addScriptDeclaration($content, $type = 'text/javascript')
-* addStyleDeclaration($content, $type = 'text/css')
-* addStyleSheet($url, $type = 'text/css', $media = null)
-* __toString()  Now you can just use echo $page;
-
-Auto loading of files - now supporting:
-* optionalfooter=&gt;optionalFooter.html
-* collegenavigationlist=&gt;unitNavigation.html
-
-Other fixes:
-* Use static vars instead of PEAR::getStaticProperty() - fixes E_STRICT warnings
-
-Add example of a custom class with auto-breadcrumb generation and body content loading.
-
-Thanks to Ned Hummel for picking up this baby.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>1.0.0RC2</release>
-     <api>1.0.0</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2008-06-30</date>
-    <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
-    <notes>
-Feature Release!
-New methods:
-* addHeadLink($href, $relation, $relType = 'rel', array $attributes = array())
-* addScript($url, $type = 'text/javascript')
-* addScriptDeclaration($content, $type = 'text/javascript')
-* addStyleDeclaration($content, $type = 'text/css')
-* addStyleSheet($url, $media = 'all')
-* __toString()  Now you can just use echo $page;
-
-Auto loading of files - now supporting:
-* optionalfooter=&gt;optionalFooter.html
-* collegenavigationlist=&gt;unitNavigation.html
-
-Other fixes:
-* Use static vars instead of PEAR::getStaticProperty() - fixes E_STRICT warnings
-* Remove debug code causing cache to never be used.
-* Fix debugging.
-* Merge UNL_DWT::$options with options from ini file instead of overwriting.
-* Set default timezone to use before we use date functions.
-
-Add example of a custom class with auto-breadcrumb generation and body content loading.
-
-Thanks to Ned Hummel for picking up this baby.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>1.0.0RC3</release>
-     <api>1.0.0</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2008-06-30</date>
-    <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
-    <notes>
-Feature Release!
-New methods:
-* addHeadLink($href, $relation, $relType = 'rel', array $attributes = array())
-* addScript($url, $type = 'text/javascript')
-* addScriptDeclaration($content, $type = 'text/javascript')
-* addStyleDeclaration($content, $type = 'text/css')
-* addStyleSheet($url, $media = 'all')
-* __toString()  Now you can just use echo $page;
-
-Auto loading of files - now supporting:
-* optionalfooter=&gt;optionalFooter.html
-* collegenavigationlist=&gt;unitNavigation.html
-
-New Remote Template Scanner UNL_Templates_Scanner
-* Scans a rendered UNL Template page for the editable content areas.
-
-Other fixes:
-* Use static vars instead of PEAR::getStaticProperty() - fixes E_STRICT warnings
-* Remove debug code causing cache to never be used.
-* Fix debugging.
-* Merge UNL_DWT::$options with options from ini file instead of overwriting.
-* Set default timezone to use before we use date functions.
-
-Add example of a custom class with auto-breadcrumb generation and body content loading.
-
-Thanks to Ned Hummel for picking up this baby.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>1.0.0RC4</release>
-     <api>1.0.0</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2008-11-06</date>
-    <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
-    <notes>
-Feature Release!
-New methods:
-* addHeadLink($href, $relation, $relType = 'rel', array $attributes = array())
-* addScript($url, $type = 'text/javascript')
-* addScriptDeclaration($content, $type = 'text/javascript')
-* addStyleDeclaration($content, $type = 'text/css')
-* addStyleSheet($url, $media = 'all')
-* __toString()  Now you can just use echo $page;
-
-Auto loading of files - now supporting:
-* optionalfooter=&gt;optionalFooter.html
-* collegenavigationlist=&gt;unitNavigation.html
-
-New Remote Template Scanner UNL_Templates_Scanner
-* Scans a rendered UNL Template page for the editable content areas.
-
-Other fixes:
-* Use static vars instead of PEAR::getStaticProperty() - fixes E_STRICT warnings
-* Remove debug code causing cache to never be used.
-* Fix debugging.
-* Merge UNL_DWT::$options with options from ini file instead of overwriting.
-* Set default timezone to use before we use date functions.
-* Add newlines after header additions.
-
-Add example of a custom class with auto-breadcrumb generation and body content loading.
-
-Thanks to Ned Hummel for picking up this baby.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>1.0.0RC5</release>
-     <api>1.0.0</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2009-07-01</date>
-    <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
-    <notes>
-Feature Release!
-Added support for specifying the template version, 2 or 3.
-* UNL_Templates::$options['version'] = 3; to use the new templates.
-
-Additional work to prevent broken pages.
-* If local files are not present for the &lt;!--#include statements, it will grab them remotely.
-* If wdn/templates_3.0 does not exist locally it will use a template with absolute references to prevent broken pages.
-
-New methods:
-* addHeadLink($href, $relation, $relType = 'rel', array $attributes = array())
-* addScript($url, $type = 'text/javascript')
-* addScriptDeclaration($content, $type = 'text/javascript')
-* addStyleDeclaration($content, $type = 'text/css')
-* addStyleSheet($url, $media = 'all')
-* __toString()  Now you can just use echo $page;
-
-Auto loading of files - now supporting:
-* optionalfooter=&gt;optionalFooter.html
-* collegenavigationlist=&gt;unitNavigation.html
-
-New Remote Template Scanner UNL_Templates_Scanner
-* Scans a rendered UNL Template page for the editable content areas.
-
-Other fixes:
-* Use static vars instead of PEAR::getStaticProperty() - fixes E_STRICT warnings
-* Remove debug code causing cache to never be used.
-* Fix debugging.
-* Merge UNL_DWT::$options with options from ini file instead of overwriting.
-* Set default timezone to use before we use date functions.
-* Add newlines after header additions.
-
-Add example of a custom class with auto-breadcrumb generation and body content loading.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>1.0.0RC6</release>
-     <api>1.0.0</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2009-07-13</date>
-    <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
-    <notes>
-Feature Release!
-Added support for specifying the template version, 2 or 3.
-* UNL_Templates::$options['version'] = 3; to use the new templates.
-
-Additional work to prevent broken pages.
-* If local files are not present for the &lt;!--#include statements, it will grab them remotely.
-* If wdn/templates_3.0 does not exist locally it will use a template with absolute references to prevent broken pages.
-
-New methods:
-* addHeadLink($href, $relation, $relType = 'rel', array $attributes = array())
-* addScript($url, $type = 'text/javascript')
-* addScriptDeclaration($content, $type = 'text/javascript')
-* addStyleDeclaration($content, $type = 'text/css')
-* addStyleSheet($url, $media = 'all')
-* __toString()  Now you can just use echo $page;
-
-Auto loading of files - now supporting:
-* optionalfooter=&gt;optionalFooter.html
-* collegenavigationlist=&gt;unitNavigation.html
-
-New Remote Template Scanner UNL_Templates_Scanner
-* Scans a rendered UNL Template page for the editable content areas.
-
-Other fixes:
-* Use static vars instead of PEAR::getStaticProperty() - fixes E_STRICT warnings
-* Remove debug code causing cache to never be used.
-* Fix debugging.
-* Merge UNL_DWT::$options with options from ini file instead of overwriting.
-* Set default timezone to use before we use date functions.
-* Add newlines after header additions.
-* Fix addScriptDeclaration method to comment out CDATA to prevent syntax errors.
-
-Add example of a custom class with auto-breadcrumb generation and body content loading.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>1.0.0RC7</release>
-     <api>1.0.0</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2009-07-29</date>
-    <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
-    <notes>
-Feature Release!
-Added support for specifying the template version, 2 or 3.
-* UNL_Templates::$options['version'] = 3; to use the new templates.
-* Added the secure template.
-* Updated Version 3 templates to reflect footer changes.
-
-Additional work to prevent broken pages.
-* If local files are not present for the &lt;!--#include statements, it will grab them remotely.
-* If wdn/templates_3.0 does not exist locally it will use a template with absolute references to prevent broken pages.
-
-New methods:
-* addHeadLink($href, $relation, $relType = 'rel', array $attributes = array())
-* addScript($url, $type = 'text/javascript')
-* addScriptDeclaration($content, $type = 'text/javascript')
-* addStyleDeclaration($content, $type = 'text/css')
-* addStyleSheet($url, $media = 'all')
-* __toString()  Now you can just use echo $page;
-
-Auto loading of files - now supporting:
-* optionalfooter=&gt;optionalFooter.html
-* collegenavigationlist=&gt;unitNavigation.html
-
-New Remote Template Scanner UNL_Templates_Scanner
-* Scans a rendered UNL Template page for the editable content areas.
-
-Other fixes:
-* Use static vars instead of PEAR::getStaticProperty() - fixes E_STRICT warnings
-* Remove debug code causing cache to never be used.
-* Fix debugging.
-* Merge UNL_DWT::$options with options from ini file instead of overwriting.
-* Set default timezone to use before we use date functions.
-* Add newlines after header additions.
-* Fix addScriptDeclaration method to comment out CDATA to prevent syntax errors.
-
-Add example of a custom class with auto-breadcrumb generation and body content loading.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>1.0.0RC8</release>
-     <api>1.0.0</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2009-08-12</date>
-    <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
-    <notes>
-Feature Release!
-Added support for specifying the template version, 2 or 3.
-* UNL_Templates::$options['version'] = 3; to use the new templates.
-* Added the secure template.
-* Updated Version 3 templates to reflect footer changes.
-
-Additional work to prevent broken pages.
-* If local files are not present for the &lt;!--#include statements, it will grab them remotely.
-* If wdn/templates_3.0 does not exist locally it will use a template with absolute references to prevent broken pages.
-
-New methods:
-* addHeadLink($href, $relation, $relType = 'rel', array $attributes = array())
-* addScript($url, $type = 'text/javascript')
-* addScriptDeclaration($content, $type = 'text/javascript')
-* addStyleDeclaration($content, $type = 'text/css')
-* addStyleSheet($url, $media = 'all')
-* __toString()  Now you can just use echo $page;
-
-Auto loading of files - now supporting:
-* optionalfooter=&gt;optionalFooter.html
-* collegenavigationlist=&gt;unitNavigation.html
-* contactinfo=&gt;footerContactInfo.html
-
-New Remote Template Scanner UNL_Templates_Scanner
-* Scans a rendered UNL Template page for the editable content areas.
-
-Other fixes:
-* Use static vars instead of PEAR::getStaticProperty() - fixes E_STRICT warnings
-* Remove debug code causing cache to never be used.
-* Fix debugging.
-* Merge UNL_DWT::$options with options from ini file instead of overwriting.
-* Set default timezone to use before we use date functions.
-* Add newlines after header additions.
-* Fix addScriptDeclaration method to comment out CDATA to prevent syntax errors.
-
-Add example of a custom class with auto-breadcrumb generation and body content loading.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>1.0.0RC9</release>
-     <api>1.0.0</api>
-    </version>
-    <stability>
-     <release>beta</release>
-     <api>beta</api>
-    </stability>
-    <date>2009-09-10</date>
-    <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
-    <notes>
-Feature Release!
-Added support for specifying the template version, 2 or 3.
-* UNL_Templates::$options['version'] = 3; to use the new templates.
-* Added the secure template.
-* Add debug template.
-* Updated Version 3 templates to reflect footer changes.
-
-Additional work to prevent broken pages.
-* If local files are not present for the &lt;!--#include statements, it will grab them remotely.
-* If wdn/templates_3.0 does not exist locally it will use a template with absolute references to prevent broken pages.
-
-New methods:
-* addHeadLink($href, $relation, $relType = 'rel', array $attributes = array())
-* addScript($url, $type = 'text/javascript')
-* addScriptDeclaration($content, $type = 'text/javascript')
-* addStyleDeclaration($content, $type = 'text/css')
-* addStyleSheet($url, $media = 'all')
-* __toString()  Now you can just use echo $page;
-
-Auto loading of files - now supporting:
-* optionalfooter=&gt;optionalFooter.html
-* collegenavigationlist=&gt;unitNavigation.html
-* contactinfo=&gt;footerContactInfo.html
-
-New Remote Template Scanner UNL_Templates_Scanner
-* Scans a rendered UNL Template page for the editable content areas.
-
-Other fixes:
-* Use static vars instead of PEAR::getStaticProperty() - fixes E_STRICT warnings
-* Remove debug code causing cache to never be used.
-* Fix debugging.
-* Merge UNL_DWT::$options with options from ini file instead of overwriting.
-* Set default timezone to use before we use date functions.
-* Add newlines after header additions.
-* Fix addScriptDeclaration method to comment out CDATA to prevent syntax errors.
-
-Add example of a custom class with auto-breadcrumb generation and body content loading.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>1.0.0</release>
-     <api>1.0.0</api>
-    </version>
-    <stability>
-     <release>stable</release>
-     <api>stable</api>
-    </stability>
-    <date>2010-03-26</date>
-    <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
-    <notes>
-Feature Release!
-Added support for specifying the template version, 2 or 3.
-* UNL_Templates::$options['version'] = 3; to use the new templates.
-* Added the secure template.
-* Add debug template.
-* Updated Version 3 templates to reflect footer changes.
-* Multiple template caching backends are 
-
-Additional work to prevent broken pages.
-* If local files are not present for the &lt;!--#include statements, it will grab them remotely.
-* If wdn/templates_3.0 does not exist locally it will use a template with absolute references to prevent broken pages.
-
-New methods:
-* addHeadLink($href, $relation, $relType = 'rel', array $attributes = array())
-* addScript($url, $type = 'text/javascript')
-* addScriptDeclaration($content, $type = 'text/javascript')
-* addStyleDeclaration($content, $type = 'text/css')
-* addStyleSheet($url, $media = 'all')
-* __toString()  Now you can just use echo $page;
-
-Auto loading of files - now supporting:
-* optionalfooter=&gt;optionalFooter.html
-* collegenavigationlist=&gt;unitNavigation.html
-* contactinfo=&gt;footerContactInfo.html
-
-New Remote Template Scanner UNL_Templates_Scanner
-* Scans a rendered UNL Template page for the editable content areas.
-
-Other fixes:
-* Use static vars instead of PEAR::getStaticProperty() - fixes E_STRICT warnings
-* Remove debug code causing cache to never be used.
-* Fix debugging.
-* Merge UNL_DWT::$options with options from ini file instead of overwriting.
-* Set default timezone to use before we use date functions.
-* Add newlines after header additions.
-* Fix addScriptDeclaration method to comment out CDATA to prevent syntax errors.
-
-Add example of a custom class with auto-breadcrumb generation and body content loading.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>1.1.0</release>
-     <api>1.0.0</api>
-    </version>
-    <stability>
-     <release>stable</release>
-     <api>stable</api>
-    </stability>
-    <date>2010-09-09</date>
-    <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
-    <notes>
-Feature Release!
-* Added the mobile template.
-* Fix support for version 2 templates.
-* Only set templatedependentspath if it has not been set.
-   </notes>
-   </release>
-   <release>
-    <version>
-     <release>1.2.0</release>
-     <api>1.0.0</api>
-    </version>
-    <stability>
-     <release>stable</release>
-     <api>stable</api>
-    </stability>
-    <date>2011-08-17</date>
-    <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
-    <notes>
-Update .tpl cache so template files are in sync with latest wdntemplates.
-Allow underscores within Version3 template include files.
-
-New templates!
-
- * Fixed_html5
- * Unlaffiliate
-
-Template updates:
-
- * Meta lang fixes
- * Remove IDM region from the secure template
- * Mobile template now supports navigation and move to HTML5
-   </notes>
-   </release>
-  </changelog>
- </phprelease>
-</package>
diff --git a/lib/data/UNL_Cache_Lite/LICENSE b/lib/data/UNL_Cache_Lite/LICENSE
deleted file mode 100644
index 27950e8d20578abb2b348618feb28f0426638820..0000000000000000000000000000000000000000
--- a/lib/data/UNL_Cache_Lite/LICENSE
+++ /dev/null
@@ -1,458 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
diff --git a/lib/data/UNL_Cache_Lite/TODO b/lib/data/UNL_Cache_Lite/TODO
deleted file mode 100644
index e51a0481dda36e288525616092414aecefb11fc4..0000000000000000000000000000000000000000
--- a/lib/data/UNL_Cache_Lite/TODO
+++ /dev/null
@@ -1,46 +0,0 @@
-
-Patrick O'Lone suggests the following idea which sounds interesting to
-add as an optional mode of Cache_Lite class. 
-(still not tested in the Cache_Lite context)
-
--------------------------------------------------------------------------
-If you use the flags:
-
-ignore_user_abort(true);
-
-$fd = dio_open($szFilename, O_CREATE | O_EXCL | O_TRUNC | O_WRONLY,
-0644);
-if (is_resource($fd)) {
-
-   dio_fcntl($fd, F_SETLKW, array('type' => F_WRLCK));
-   dio_write($fd, $szBuffer);
-   dio_fcntl($fd, F_SETLK, array('type' => F_UNLCK));
-   dio_close($fd);
-
-}
-
-ignore_user_abort(false);
-
-Only the first process will attempt to create a file. Additional
-processes will see that a file already exists (at the system level), and
-will fail. Another thing to note is that the file descriptor must be
-opened using dio_open(), and certain features, like fgets() won't work
-with it. If your just doing a raw write, dio_write() should be just
-fine. The dio_read() function should be used like:
-
-$fd = dio_open($szFilename, O_RDONLY|O_NONBLOCK, 0644);
-if (is_resource($fd)) {
-
-   dio_fcntl($fd, F_SETLKW, array('type' => F_RDLCK));
-   $szBuffer = dio_read($fd, filesize($szFilename));
-   dio_fcntl($fd, F_SETLK, array('type' => F_UNLCK));
-   dio_close($fd);
-
-}
-
-You still use locking to ensure that a write process can finish before
-another attempts to read the file. We also set non-blocking mode in read
-mode so that multiple readers can access the same resource at the same
-time. NOTE: Direct I/O support must be compiled into PHP for these
-features to work (--enable-dio).
--------------------------------------------------------------------------
diff --git a/lib/data/pear.unl.edu/UNL_Templates/cssUNLTemplates.ini b/lib/data/pear.unl.edu/UNL_Templates/cssUNLTemplates.ini
deleted file mode 100644
index 17d132cdffd23d1d92d8c832642f43be346b93aa..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/cssUNLTemplates.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-;php -d include_path=`pwd`/../vendor/php ../vendor/php/UNL/DWT/createTemplates.php cssUNLTemplates.ini
-[UNL_DWT]
-dwt_location    = /Users/bbieber/Documents/workspace/wdntemplates/Templates/
-class_location  = /Users/bbieber/Documents/workspace/UNL_Templates/src/UNL/Templates/Version4
-tpl_location    = /Users/bbieber/Documents/workspace/UNL_Templates/data/tpl_cache/Version4
-class_prefix    = UNL_Templates_Version4_
-generator_exclude_regex = "/^(asp|php)/i"
-extends         = UNL_Templates
-extends_location	= "UNL/Templates.php"
\ No newline at end of file
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Document.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Document.tpl
deleted file mode 100644
index caccfd6889e95717b4a3e85f9cbe58141c86e3ff..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Document.tpl
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" ><!-- InstanceBegin template="/Templates/document.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL | Document Template</title>
-<!-- InstanceEndEditable -->
-<!-- Codebase:UNLFramework 20070105 -->
-<link rel="stylesheet" type="text/css" media="screen" href="/ucomm/templatedependents/templatecss/layouts/main.css" />
-<link rel="stylesheet" type="text/css" media="print" href="/ucomm/templatedependents/templatecss/layouts/print.css"/>
-<script type="text/javascript" src="/ucomm/templatedependents/templatesharedcode/scripts/all_compressed.js"></script>
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/browsersniffers/ie.html" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/comments/developersnote.html" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/metanfavico/metanfavico.html" -->
-
-<!-- InstanceBeginEditable name="head" -->
-<script type="text/javascript">
-var navl2Links = 0; //Default navline2 links to display (zero based counting)
-</script>
-<!-- InstanceEndEditable -->
-
-</head>
-<body id="doc">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/siteheader/siteheader.shtml" -->
-
-<div id="red-header">
-	<div class="clear">
-		<h1>University of Nebraska&ndash;Lincoln</h1>
-		<div id="breadcrumbs"> 
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-<!-- InstanceEndEditable -->
- </div>
-	</div>
-</div>
-<!-- close red-header -->
-
-<div id="container">
-	<div class="clear">
-		<div id="title"> 
-<!-- InstanceBeginEditable name="collegenavigationlist" -->
- 
-<!-- InstanceEndEditable -->
-			<div id="titlegraphic">
-				<!-- WDN: see glossary item 'title graphics' -->
-				
-<!-- InstanceBeginEditable name="titlegraphic" -->
-				<h1>Department</h1>
-				<h2>Taglines - We Do The Heavy Lifting</h2>
-				
-<!-- InstanceEndEditable -->
-</div>
-			<!-- maintitle -->
-		</div>
-		<!-- close title -->
-		
-		<div id="navigation">
-			<h4 id="sec_nav">Navigation</h4>
-			
-
-			<div id="nav_end"></div>
-			
-			<!-- WDN: see glossary item 'sidebar links' -->
-			<div id="leftcollinks"> 
-				<!-- WDN: see glossary item 'sidebar links' -->
-				
- </div>
-		</div>
-		<!-- close navigation -->
-		
-		<div id="main_right" class="mainwrapper">
-			<!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-			
-			<div id="maincontent"> 
-
-				<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/browsersniffers/noscript.html" -->
-				<!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-				
-<!-- InstanceBeginEditable name="maincontentarea" -->
-				<p style="margin:20px; border:3px solid #CC0000;padding:10px; text-align:center"> <strong>Delete this box and place your content here.</strong><br />
-					Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://www.unl.edu/webdevnet/">Web Developer Network</a>. <br />
-					<a href="http://validator.unl.edu/check/referer">Click here to check Validation</a> </p>
-				
-<!-- InstanceEndEditable -->
-				<!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-				
- </div>
-			 </div>
-		<!-- close main right -->
-	</div>
-</div>
-<!-- close container -->
-<div id="footer">
-	<div id="footer_floater"> 
-<!-- InstanceBeginEditable name="optionalfooter" -->
- 
-<!-- InstanceEndEditable -->
-		<div id="copyright"> 
-<!-- InstanceBeginEditable name="footercontent" -->
-			<!--#include virtual="../sharedcode/footer.html" -->
-			
-<!-- InstanceEndEditable -->
- <span><a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a> <a href="http://validator.unl.edu/check/referer">W3C</a> <a href="http://www1.unl.edu/feeds/">RSS</a> </span><a href="http://www.unl.edu/" title="UNL Home"><img src="/ucomm/templatedependents/templatecss/images/wordmark.png" alt="UNL's wordmark" id="wordmark" /></a></div>
-	</div>
-</div>
-<!-- close footer -->
-<!-- sifr -->
-<script type="text/javascript" src="/ucomm/templatedependents/templatesharedcode/scripts/sifr_replacements.js"></script>
-</body>
-<!-- InstanceEnd --></html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Fixed.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Fixed.tpl
deleted file mode 100644
index 44626d93af9f1c53c95d37cb602f685708b08c41..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Fixed.tpl
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" ><!-- InstanceBegin template="/Templates/fixed.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL | Department | New Page</title>
-<!-- InstanceEndEditable -->
-<!-- Codebase:UNLFramework 20070105 -->
-<link rel="stylesheet" type="text/css" media="screen" href="/ucomm/templatedependents/templatecss/layouts/main.css" />
-<link rel="stylesheet" type="text/css" media="print" href="/ucomm/templatedependents/templatecss/layouts/print.css"/>
-<script type="text/javascript" src="/ucomm/templatedependents/templatesharedcode/scripts/all_compressed.js"></script>
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/browsersniffers/ie.html" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/comments/developersnote.html" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/metanfavico/metanfavico.html" -->
-
-<!-- InstanceBeginEditable name="head" -->
-<script type="text/javascript">
-var navl2Links = 0; //Default navline2 links to display (zero based counting)
-</script>
-<!-- InstanceEndEditable -->
-
-</head>
-<body id="fixed">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/siteheader/siteheader.shtml" -->
-
-<div id="red-header">
-	<div class="clear">
-		<h1>University of Nebraska&ndash;Lincoln</h1>
-		<div id="breadcrumbs"> 
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-			<!-- WDN: see glossary item 'breadcrumbs' -->
-			<ul>
-				<li class="first"><a href="http://www.unl.edu/">UNL</a></li>
-				<li><a href="http://www.unl.edu/">Department</a></li>
-				<li>New Page</li>
-			</ul>
-			
-<!-- InstanceEndEditable -->
- </div>
-	</div>
-</div>
-<!-- close red-header -->
-
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/shelf/shelf.shtml" -->
-
-<div id="container">
-	<div class="clear">
-		<div id="title"> 
-<!-- InstanceBeginEditable name="collegenavigationlist" -->
- 
-<!-- InstanceEndEditable -->
-			<div id="titlegraphic">
-				<!-- WDN: see glossary item 'title graphics' -->
-				
-<!-- InstanceBeginEditable name="titlegraphic" -->
-				<h1>Department</h1>
-				<h2>Taglines - We Do The Heavy Lifting</h2>
-				
-<!-- InstanceEndEditable -->
-</div>
-			<!-- maintitle -->
-		</div>
-		<!-- close title -->
-		
-		<div id="navigation">
-			<h4 id="sec_nav">Navigation</h4>
-			
-
-			<div id="navlinks"> 
-<!-- InstanceBeginEditable name="navlinks" -->
-				<!--#include virtual="../sharedcode/navigation.html" -->
-				
-<!-- InstanceEndEditable -->
-</div>
-			
-
-			<div id="nav_end"></div>
-			
-<!-- InstanceBeginEditable name="leftRandomPromo" -->
-			<div class="image_small_short" id="leftRandomPromo"> <a href="#" id="leftRandomPromoAnchor"><img id="leftRandomPromoImage" alt="" src="/ucomm/templatedependents/templatecss/images/transpixel.gif" /></a>
-				<script type="text/javascript" src="../sharedcode/leftRandomPromo.js"></script>
-			</div>
-			
-<!-- InstanceEndEditable -->
-			<!-- WDN: see glossary item 'sidebar links' -->
-			<div id="leftcollinks"> 
-<!-- InstanceBeginEditable name="leftcollinks" -->
-				<!-- WDN: see glossary item 'sidebar links' -->
-				<!--#include virtual="../sharedcode/relatedLinks.html" -->
-				
-<!-- InstanceEndEditable -->
- </div>
-		</div>
-		<!-- close navigation -->
-		
-		<div id="main_right" class="mainwrapper">
-			<!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-			
-			<div id="maincontent"> 
-
-				<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/browsersniffers/noscript.html" -->
-				<!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-				
-<!-- InstanceBeginEditable name="maincontentarea" -->
-				<p style="margin:20px; border:3px solid #CC0000;padding:10px; text-align:center"> <strong>Delete this box and place your content here.</strong><br />
-					Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://www.unl.edu/webdevnet/">Web Developer Network</a>. <br />
-					<a href="http://validator.unl.edu/check/referer">Click here to check Validation</a> </p>
-				
-<!-- InstanceEndEditable -->
-				<!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-				
- </div>
-			 </div>
-		<!-- close main right -->
-	</div>
-</div>
-<!-- close container -->
-<div id="footer">
-	<div id="footer_floater"> 
-<!-- InstanceBeginEditable name="optionalfooter" -->
- 
-<!-- InstanceEndEditable -->
-		<div id="copyright"> 
-<!-- InstanceBeginEditable name="footercontent" -->
-			<!--#include virtual="../sharedcode/footer.html" -->
-			
-<!-- InstanceEndEditable -->
- <span><a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a> <a href="http://validator.unl.edu/check/referer">W3C</a> <a href="http://www1.unl.edu/feeds/">RSS</a> </span><a href="http://www.unl.edu/" title="UNL Home"><img src="/ucomm/templatedependents/templatecss/images/wordmark.png" alt="UNL's wordmark" id="wordmark" /></a></div>
-	</div>
-</div>
-<!-- close footer -->
-<!-- sifr -->
-<script type="text/javascript" src="/ucomm/templatedependents/templatesharedcode/scripts/sifr_replacements.js"></script>
-</body>
-<!-- InstanceEnd --></html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Liquid.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Liquid.tpl
deleted file mode 100644
index bcbe8718485706ce70b4b570379fb366d1fc454c..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Liquid.tpl
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" ><!-- InstanceBegin template="/Templates/liquid.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL | Department | New Page</title>
-<!-- InstanceEndEditable -->
-<!-- Codebase:UNLFramework 20070105 -->
-<link rel="stylesheet" type="text/css" media="screen" href="/ucomm/templatedependents/templatecss/layouts/main.css" />
-<link rel="stylesheet" type="text/css" media="print" href="/ucomm/templatedependents/templatecss/layouts/print.css"/>
-<script type="text/javascript" src="/ucomm/templatedependents/templatesharedcode/scripts/all_compressed.js"></script>
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/browsersniffers/ie.html" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/comments/developersnote.html" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/metanfavico/metanfavico.html" -->
-
-<!-- InstanceBeginEditable name="head" -->
-<script type="text/javascript">
-var navl2Links = 0; //Default navline2 links to display (zero based counting)
-</script>
-<!-- InstanceEndEditable -->
-
-</head>
-<body id="liquid">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/siteheader/siteheader.shtml" -->
-
-<div id="red-header">
-	<div class="clear">
-		<h1>University of Nebraska&ndash;Lincoln</h1>
-		<div id="breadcrumbs"> 
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-			<!-- WDN: see glossary item 'breadcrumbs' -->
-			<ul>
-				<li class="first"><a href="http://www.unl.edu/">UNL</a></li>
-				<li><a href="http://www.unl.edu/">Department</a></li>
-				<li>New Page</li>
-			</ul>
-			
-<!-- InstanceEndEditable -->
- </div>
-	</div>
-</div>
-<!-- close red-header -->
-
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/shelf/shelf.shtml" -->
-
-<div id="container">
-	<div class="clear">
-		<div id="title"> 
-<!-- InstanceBeginEditable name="collegenavigationlist" -->
- 
-<!-- InstanceEndEditable -->
-			<div id="titlegraphic">
-				<!-- WDN: see glossary item 'title graphics' -->
-				
-<!-- InstanceBeginEditable name="titlegraphic" -->
-				<h1>Department</h1>
-				<h2>Taglines - We Do The Heavy Lifting</h2>
-				
-<!-- InstanceEndEditable -->
-</div>
-			<!-- maintitle -->
-		</div>
-		<!-- close title -->
-		
-		<div id="navigation">
-			<h4 id="sec_nav">Navigation</h4>
-			
-
-			<div id="navlinks"> 
-<!-- InstanceBeginEditable name="navlinks" -->
-				<!--#include virtual="../sharedcode/navigation.html" -->
-				
-<!-- InstanceEndEditable -->
-</div>
-			
-
-			<div id="nav_end"></div>
-			
-<!-- InstanceBeginEditable name="leftRandomPromo" -->
-			<div class="image_small_short" id="leftRandomPromo"> <a href="#" id="leftRandomPromoAnchor"><img id="leftRandomPromoImage" alt="" src="/ucomm/templatedependents/templatecss/images/transpixel.gif" /></a>
-				<script type="text/javascript" src="../sharedcode/leftRandomPromo.js"></script>
-			</div>
-			
-<!-- InstanceEndEditable -->
-			<!-- WDN: see glossary item 'sidebar links' -->
-			<div id="leftcollinks"> 
-<!-- InstanceBeginEditable name="leftcollinks" -->
-				<!-- WDN: see glossary item 'sidebar links' -->
-				<!--#include virtual="../sharedcode/relatedLinks.html" -->
-				
-<!-- InstanceEndEditable -->
- </div>
-		</div>
-		<!-- close navigation -->
-		
-		<div id="main_right" class="mainwrapper">
-			<!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-			
-			<div id="maincontent"> 
-
-				<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/browsersniffers/noscript.html" -->
-				<!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-				
-<!-- InstanceBeginEditable name="maincontentarea" -->
-				<p style="margin:20px; border:3px solid #CC0000;padding:10px; text-align:center"> <strong>Delete this box and place your content here.</strong><br />
-					Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://www.unl.edu/webdevnet/">Web Developer Network</a>. <br />
-					<a href="http://validator.unl.edu/check/referer">Click here to check Validation</a> </p>
-				
-<!-- InstanceEndEditable -->
-				<!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-				
- </div>
-			 </div>
-		<!-- close main right -->
-	</div>
-</div>
-<!-- close container -->
-<div id="footer">
-	<div id="footer_floater"> 
-<!-- InstanceBeginEditable name="optionalfooter" -->
- 
-<!-- InstanceEndEditable -->
-		<div id="copyright"> 
-<!-- InstanceBeginEditable name="footercontent" -->
-			<!--#include virtual="../sharedcode/footer.html" -->
-			
-<!-- InstanceEndEditable -->
- <span><a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a> <a href="http://validator.unl.edu/check/referer">W3C</a> <a href="http://www1.unl.edu/feeds/">RSS</a> </span><a href="http://www.unl.edu/" title="UNL Home"><img src="/ucomm/templatedependents/templatecss/images/wordmark.png" alt="UNL's wordmark" id="wordmark" /></a></div>
-	</div>
-</div>
-<!-- close footer -->
-<!-- sifr -->
-<script type="text/javascript" src="/ucomm/templatedependents/templatesharedcode/scripts/sifr_replacements.js"></script>
-</body>
-<!-- InstanceEnd --></html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Popup.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Popup.tpl
deleted file mode 100644
index cc3bcb33aa00c73412638da3d416e3b443b31263..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Popup.tpl
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" ><!-- InstanceBegin template="/Templates/popup.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL | Department | New Page</title>
-<!-- InstanceEndEditable -->
-<!-- Codebase:UNLFramework 20070105 -->
-<link rel="stylesheet" type="text/css" media="screen" href="/ucomm/templatedependents/templatecss/layouts/main.css" />
-<link rel="stylesheet" type="text/css" media="print" href="/ucomm/templatedependents/templatecss/layouts/print.css"/>
-<script type="text/javascript" src="/ucomm/templatedependents/templatesharedcode/scripts/all_compressed.js"></script>
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/browsersniffers/ie.html" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/comments/developersnote.html" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/metanfavico/metanfavico.html" -->
-
-<!-- InstanceBeginEditable name="head" -->
-<script type="text/javascript">
-var navl2Links = 0; //Default navline2 links to display (zero based counting)
-</script>
-<!-- InstanceEndEditable -->
-
-</head>
-<body id="popup">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/siteheader/siteheader.shtml" -->
-
-<div id="red-header">
-	<div class="clear">
-		<h1>University of Nebraska&ndash;Lincoln</h1>
-		<div id="breadcrumbs"> 
-
- </div>
-	</div>
-</div>
-<!-- close red-header -->
-
-<div id="container">
-	<div class="clear">
-		<div id="title"> 
-<!-- InstanceBeginEditable name="collegenavigationlist" -->
- 
-<!-- InstanceEndEditable -->
-			<div id="titlegraphic">
-				<!-- WDN: see glossary item 'title graphics' -->
-				
-<!-- InstanceBeginEditable name="titlegraphic" -->
-				<h1>Department</h1>
-				<h2>Taglines - We Do The Heavy Lifting</h2>
-				
-<!-- InstanceEndEditable -->
-</div>
-			<!-- maintitle -->
-		</div>
-		<!-- close title -->
-		
-		<div id="navigation">
-			<h4 id="sec_nav">Navigation</h4>
-			
-
-			<div id="nav_end"></div>
-			
-			<!-- WDN: see glossary item 'sidebar links' -->
-			<div id="leftcollinks"> 
-
- </div>
-		</div>
-		<!-- close navigation -->
-		
-		<div id="main_right" class="mainwrapper">
-			<!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-			
-			<div id="maincontent"> 
-
-				<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/browsersniffers/noscript.html" -->
-				<!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-				
-<!-- InstanceBeginEditable name="maincontentarea" -->
-				<p style="margin:20px; border:3px solid #CC0000;padding:10px; text-align:center"> <strong>Delete this box and place your content here.</strong><br />
-					Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://www.unl.edu/webdevnet/">Web Developer Network</a>. <br />
-					<a href="http://validator.unl.edu/check/referer">Click here to check Validation</a> </p>
-				
-<!-- InstanceEndEditable -->
-				<!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-				
- </div>
-			 </div>
-		<!-- close main right -->
-	</div>
-</div>
-<!-- close container -->
-<div id="footer">
-	<div id="footer_floater"> 
-<!-- InstanceBeginEditable name="optionalfooter" -->
- 
-<!-- InstanceEndEditable -->
-		<div id="copyright"> 
-<!-- InstanceBeginEditable name="footercontent" -->
-			<!--#include virtual="../sharedcode/footer.html" -->
-			
-<!-- InstanceEndEditable -->
- <span><a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a> <a href="http://validator.unl.edu/check/referer">W3C</a> <a href="http://www1.unl.edu/feeds/">RSS</a> </span><a href="http://www.unl.edu/" title="UNL Home"><img src="/ucomm/templatedependents/templatecss/images/wordmark.png" alt="UNL's wordmark" id="wordmark" /></a></div>
-	</div>
-</div>
-<!-- close footer -->
-<!-- sifr -->
-<script type="text/javascript" src="/ucomm/templatedependents/templatesharedcode/scripts/sifr_replacements.js"></script>
-</body>
-<!-- InstanceEnd --></html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Secure.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Secure.tpl
deleted file mode 100644
index 53bb949fe3a4bee0549b403a9438650afb19c894..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Secure.tpl
+++ /dev/null
@@ -1,131 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" ><!-- InstanceBegin template="/Templates/secure.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL | Department | New Page</title>
-<!-- InstanceEndEditable -->
-<!-- Codebase:UNLFramework 20070105 -->
-<link rel="stylesheet" type="text/css" media="screen" href="/ucomm/templatedependents/templatecss/layouts/main.css" />
-<link rel="stylesheet" type="text/css" media="print" href="/ucomm/templatedependents/templatecss/layouts/print.css"/>
-<script type="text/javascript" src="/ucomm/templatedependents/templatesharedcode/scripts/all_compressed.js"></script>
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/browsersniffers/ie.html" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/comments/developersnote.html" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/metanfavico/metanfavico.html" -->
-
-<link rel="stylesheet" type="text/css" media="screen" href="/ucomm/templatedependents/templatecss/layouts/secure.css"/>
-<!-- InstanceBeginEditable name="head" -->
-<script type="text/javascript">
-var navl2Links = 0; //Default navline2 links to display (zero based counting)
-</script>
-<!-- InstanceEndEditable -->
-
-</head>
-<body id="secure">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/siteheader/siteheader_secure.shtml" -->
-
-<div id="red-header">
-	<div class="clear">
-		<h1>University of Nebraska&ndash;Lincoln</h1>
-		<div id="breadcrumbs"> 
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-			<!-- WDN: see glossary item 'breadcrumbs' -->
-			<ul>
-				<li class="first"><a href="http://www.unl.edu/">UNL</a></li>
-				<li><a href="http://www.unl.edu/">Department</a></li>
-				<li>New Page</li>
-			</ul>
-			<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/badges/secure.html" -->
-			
-<!-- InstanceEndEditable -->
- </div>
-	</div>
-</div>
-<!-- close red-header -->
-
-<div id="container">
-	<div class="clear">
-		<div id="title"> 
-<!-- InstanceBeginEditable name="collegenavigationlist" -->
- 
-<!-- InstanceEndEditable -->
-			<div id="titlegraphic">
-				<!-- WDN: see glossary item 'title graphics' -->
-				
-<!-- InstanceBeginEditable name="titlegraphic" -->
-				<h1>Department</h1>
-				<h2>Taglines - We Do The Heavy Lifting</h2>
-				
-<!-- InstanceEndEditable -->
-</div>
-			<!-- maintitle -->
-		</div>
-		<!-- close title -->
-		
-		<div id="navigation">
-			<h4 id="sec_nav">Navigation</h4>
-			
-
-			<div id="navlinks"> 
-<!-- InstanceBeginEditable name="navlinks" -->
-				<!--#include virtual="../sharedcode/navigation.html" -->
-				
-<!-- InstanceEndEditable -->
-</div>
-			
-
-			<div id="nav_end"></div>
-			
-			<!-- WDN: see glossary item 'sidebar links' -->
-			<div id="leftcollinks"> 
-<!-- InstanceBeginEditable name="leftcollinks" -->
-				<!-- WDN: see glossary item 'sidebar links' -->
-				<!--#include virtual="../sharedcode/relatedLinks.html" -->
-				
-<!-- InstanceEndEditable -->
- </div>
-		</div>
-		<!-- close navigation -->
-		
-		<div id="main_right" class="mainwrapper">
-			<!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-			
-			<div id="maincontent"> 
-
-				<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/browsersniffers/noscript.html" -->
-				<!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-				
-<!-- InstanceBeginEditable name="maincontentarea" -->
-				<p style="margin:20px; border:3px solid #CC0000;padding:10px; text-align:center"> <strong>Delete this box and place your content here.</strong><br />
-					Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://www.unl.edu/webdevnet/">Web Developer Network</a>. <br />
-					<a href="http://validator.unl.edu/check/referer">Click here to check Validation</a> </p>
-				
-<!-- InstanceEndEditable -->
-				<!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-				
- </div>
-			 </div>
-		<!-- close main right -->
-	</div>
-</div>
-<!-- close container -->
-<div id="footer">
-	<div id="footer_floater"> 
-<!-- InstanceBeginEditable name="optionalfooter" -->
- 
-<!-- InstanceEndEditable -->
-		<div id="copyright"> 
-<!-- InstanceBeginEditable name="footercontent" -->
-			<!--#include virtual="../sharedcode/footer.html" -->
-			
-<!-- InstanceEndEditable -->
- <span><a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a> <a href="http://validator.unl.edu/check/referer">W3C</a> <a href="http://www1.unl.edu/feeds/">RSS</a> </span><a href="http://www.unl.edu/" title="UNL Home"><img src="/ucomm/templatedependents/templatecss/images/wordmark.png" alt="UNL's wordmark" id="wordmark" /></a></div>
-	</div>
-</div>
-<!-- close footer -->
-<!-- sifr -->
-<script type="text/javascript" src="/ucomm/templatedependents/templatesharedcode/scripts/sifr_replacements.js"></script>
-</body>
-<!-- InstanceEnd --></html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlaffiliate.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlaffiliate.tpl
deleted file mode 100644
index dfa57e846e6949c53dd9c75da45a65b032f63553..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlaffiliate.tpl
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" ><!-- InstanceBegin template="/Templates/unlaffiliate.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL Redesign</title>
-<!-- InstanceEndEditable -->
-<!-- Codebase:UNLFramework 20061013 -->
-<link rel="stylesheet" type="text/css" media="screen" href="/ucomm/templatedependents/templatecss/layouts/main.css" />
-<link rel="stylesheet" type="text/css" media="print" href="/ucomm/templatedependents/templatecss/layouts/print.css"/>
-<script type="text/javascript" src="/ucomm/templatedependents/templatesharedcode/scripts/all_compressed.js"></script>
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/browsersniffers/ie.html" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/comments/developersnote.html" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/metanfavico/metanfavico.html" -->
-<!-- InstanceBeginEditable name="head" -->
-<link rel="stylesheet" type="text/css" media="all" href="/ucomm/templatedependents/templatecss/layouts/affiliate.css" />
-<!-- InstanceEndEditable -->
-<!-- TemplateParam name="leftRandomPromo" type="boolean" value="true" -->
-</head>
-<body id="affiliate">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-<!-- InstanceBeginEditable name="siteheader" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/siteheader/affiliate.shtml" -->
-<!-- InstanceEndEditable -->
-<div id="red-header">
-	<div class="clear"><!-- InstanceBeginEditable name="affiliate_name" -->
-		<h1>Affiliated Organization Name</h1>
-		
-<!-- InstanceEndEditable -->
-		<div id="breadcrumbs"> 
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-			<!-- WDN: see glossary item 'breadcrumbs' -->
-			<ul>
-				<li class="first"><a href="http://www.unl.edu/">UNL</a></li>
-				<li>UNL Framework</li>
-			</ul>
-			
-<!-- InstanceEndEditable -->
- </div>
-	</div>
-</div>
-<!-- close red-header -->
-<!-- InstanceBeginEditable name="shelf" -->
-
-<!-- InstanceEndEditable -->
-<div id="container">
-	<div class="clear">
-		<div id="title">
-			<div id="titlegraphic">
-				<!-- WDN: see glossary item 'title graphics' -->
-				
-<!-- InstanceBeginEditable name="titlegraphic" -->
-				<h1>Affiliate</h1>
-				<h2>Taglines - We Do The Heavy Lifting</h2>
-				
-<!-- InstanceEndEditable -->
-</div>
-			<!-- maintitle -->
-		</div>
-		<!-- close title -->
-		<div id="navigation">
-			<h4 id="sec_nav">Navigation</h4>
-			<div id="navlinks"> 
-<!-- InstanceBeginEditable name="navlinks" -->
-				<!--#include virtual="../sharedcode/navigation.html" -->
-				
-<!-- InstanceEndEditable -->
-</div>
-			<div id="nav_end"></div>
-			<!-- TemplateBeginIf cond="_document['leftRandomPromo']" -->
-<!-- InstanceBeginEditable name="leftRandomPromo" -->
-			<div class="image_small_short" id="leftRandomPromo"> <a href="#" id="leftRandomPromoAnchor"><img id="leftRandomPromoImage" alt="" src="/ucomm/templatedependents/templatecss/images/transpixel.gif" /></a>
-				<script type="text/javascript" src="../sharedcode/leftRandomPromo.js"></script>
-			</div>
-			
-<!-- InstanceEndEditable -->
-<!-- TemplateEndIf -->
-			<!-- WDN: see glossary item 'sidebar links' -->
-			<div id="leftcollinks"> 
-<!-- InstanceBeginEditable name="leftcollinks" -->
-				<!--#include virtual="../sharedcode/relatedLinks.html" -->
-				
-<!-- InstanceEndEditable -->
- </div>
-		</div>
-		<!-- close navigation -->
-		<div id="main_right" class="mainwrapper">
-			<!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-			
-			<div id="maincontent">
-			<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/browsersniffers/noscript.html" -->
-			<!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-			
-<!-- InstanceBeginEditable name="maincontentarea" -->
-			<h2 class="sec_main">This template is only for affiliates of UNL, or units that have been granted a marketing exemption from the university. Confirm your use of this template before using it!</h2>
-			<p style="margin:20px; border:3px solid #CC0000;padding:10px; text-align:center"> <strong>Delete this box and place your content here.</strong><br />
-				Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://www.unl.edu/webdevnet/">Web Developer Network</a>. <br />
-				<a href="http://validator.unl.edu/check/referer">Click here to check Validation</a> </p>
-			<!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-			
-<!-- InstanceEndEditable -->
-			</div>
-		</div>
-		<!-- close main right -->
-	</div>
-</div>
-<!-- close container -->
-<div id="footer">
-	<div id="footer_floater"> 
-<!-- InstanceBeginEditable name="optionalfooter" -->
- 
-<!-- InstanceEndEditable -->
-		<div id="copyright"> 
-<!-- InstanceBeginEditable name="footercontent" -->
-			<!--#include virtual="../sharedcode/footer.html" -->
-			
-<!-- InstanceEndEditable -->
- <span><a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a> <a href="http://validator.unl.edu/check/referer">W3C</a> <a href="http://www1.unl.edu/feeds/">RSS</a> </span><a href="http://www.unl.edu/" title="UNL Home"><img src="/ucomm/templatedependents/templatecss/images/wordmark.png" alt="UNL's wordmark" id="wordmark" /></a></div>
-	</div>
-</div>
-<!-- close footer -->
-<!-- sifr -->
-<script type="text/javascript" src="/ucomm/templatedependents/templatesharedcode/scripts/sifr_replacements.js"></script>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlframework.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlframework.tpl
deleted file mode 100644
index bfd6a5ac32fa3b6b6c60c16e7975d902b93f556c..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlframework.tpl
+++ /dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" ><!-- InstanceBegin template="/Templates/unlframework.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL Redesign</title>
-<!-- InstanceEndEditable -->
-<!-- Codebase:UNLFramework 20070105 -->
-<link rel="stylesheet" type="text/css" media="screen" href="/ucomm/templatedependents/templatecss/layouts/main.css" />
-<link rel="stylesheet" type="text/css" media="print" href="/ucomm/templatedependents/templatecss/layouts/print.css"/>
-<script type="text/javascript" src="/ucomm/templatedependents/templatesharedcode/scripts/all_compressed.js"></script>
-<!-- InstanceBeginEditable name="head" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/browsersniffers/ie.html" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/comments/developersnote.html" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/metanfavico/metanfavico.html" -->
-<!-- InstanceEndEditable -->
-<!-- TemplateParam name="collegenavigation" type="boolean" value="true" --><!-- TemplateParam name="bodyid" type="text" value="" -->
-</head>
-<body id="@@(bodyid)@@">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-<!-- InstanceBeginEditable name="siteheader" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/siteheader/siteheader.shtml" -->
-<!-- InstanceEndEditable -->
-<div id="red-header">
-	<div class="clear">
-		<h1>University of Nebraska&ndash;Lincoln</h1>
-		<div id="breadcrumbs"> 
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-			<!-- WDN: see glossary item 'breadcrumbs' -->
-			<ul>
-				<li class="first"><a href="http://www.unl.edu/">UNL</a></li>
-				<li>UNL Framework</li>
-			</ul>
-			
-<!-- InstanceEndEditable -->
- </div>
-	</div>
-</div>
-<!-- close red-header -->
-<!-- InstanceBeginEditable name="shelf" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/shelf/shelf.shtml" -->
-<!-- InstanceEndEditable -->
-<div id="container">
-	<div class="clear">
-		<div id="title"> <!-- TemplateBeginIf cond="collegenavigation" -->
-<!-- InstanceBeginEditable name="collegenavigationlist" -->
- 
-<!-- InstanceEndEditable -->
-<!-- TemplateEndIf -->
-			<div id="titlegraphic">
-				<!-- WDN: see glossary item 'title graphics' -->
-				
-<!-- InstanceBeginEditable name="titlegraphic" -->
-				<h1>Department</h1>
-				<h2>Taglines - We Do The Heavy Lifting</h2>
-				
-<!-- InstanceEndEditable -->
-</div>
-			<!-- maintitle -->
-		</div>
-		<!-- close title -->
-		
-<!-- InstanceBeginEditable name="leftcolcontent" -->
-		<div id="navigation">
-			<h4 id="sec_nav">Navigation</h4>
-			<div id="navlinks">
-				<!--#include virtual="../sharedcode/navigation.html" -->
-			</div>
-			<div id="nav_end"></div>
-			<div class="image_small_short" id="leftRandomPromo"> <a href="#" id="leftRandomPromoAnchor"><img id="leftRandomPromoImage" alt="" src="/ucomm/templatedependents/templatecss/images/transpixel.gif" /></a>
-				<script type="text/javascript" src="../sharedcode/leftRandomPromo.js"></script>
-			</div>
-			<!-- WDN: see glossary item 'sidebar links' -->
-			<div id="leftcollinks">
-				<!--#include virtual="../sharedcode/relatedLinks.html" -->
-			</div>
-		</div>
-		<!-- close navigation -->
-		
-<!-- InstanceEndEditable -->
-		<div id="main_right" class="mainwrapper">
-			<!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-			
-<!-- InstanceBeginEditable name="maincolcontent" -->
-			<!-- optional main big content image -->
-			<div id="maincontent">
-				<p style="margin:20px; border:3px solid #CC0000;padding:10px; text-align:center"> <strong>Delete this box and place your content here.</strong><br />
-					Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://www.unl.edu/webdevnet/">Web Developer Network</a>. <br />
-					<a href="http://validator.unl.edu/check/referer">Click here to check Validation</a> </p>
-			</div>
-			<!-- close right-area -->
-			
-<!-- InstanceEndEditable -->
- </div>
-		<!-- close main right -->
-	</div>
-</div>
-<!-- close container -->
-<!-- InstanceBeginEditable name="bigfooter" -->
-<div id="footer">
-	<div id="footer_floater">
-		<div id="copyright">
-			<!--#include virtual="../sharedcode/footer.html" -->
-			<span><a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a> <a href="http://validator.unl.edu/check/referer">W3C</a> <a href="http://www1.unl.edu/feeds/">RSS</a> </span><a href="http://www.unl.edu/" title="UNL Home"><img src="/ucomm/templatedependents/templatecss/images/wordmark.png" alt="UNL's wordmark" id="wordmark" /></a></div>
-	</div>
-</div>
-<!-- InstanceEndEditable -->
-<!-- close footer -->
-<!-- sifr -->
-<script type="text/javascript" src="/ucomm/templatedependents/templatesharedcode/scripts/sifr_replacements.js"></script>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlstandardtemplate.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlstandardtemplate.tpl
deleted file mode 100644
index bff353a14b810d69b7f0cb54ed809f8f6cf56507..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version2/Unlstandardtemplate.tpl
+++ /dev/null
@@ -1,131 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" ><!-- InstanceBegin template="/Templates/unlstandardtemplate.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL Redesign</title>
-<!-- InstanceEndEditable -->
-<!-- Codebase:UNLFramework 20070105 -->
-<link rel="stylesheet" type="text/css" media="screen" href="/ucomm/templatedependents/templatecss/layouts/main.css" />
-<link rel="stylesheet" type="text/css" media="print" href="/ucomm/templatedependents/templatecss/layouts/print.css"/>
-<script type="text/javascript" src="/ucomm/templatedependents/templatesharedcode/scripts/all_compressed.js"></script>
-
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/browsersniffers/ie.html" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/comments/developersnote.html" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/metanfavico/metanfavico.html" -->
-<!-- InstanceBeginEditable name="head" -->
-<!-- InstanceEndEditable -->
-<!-- TemplateParam name="leftRandomPromo" type="boolean" value="true" -->
-<!-- InstanceParam name="bodyid" type="text" value="" passthrough="true" -->
-</head>
-<body id="@@@(bodyid)@@@">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-<!-- InstanceBeginEditable name="siteheader" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/siteheader/siteheader.shtml" -->
-<!-- InstanceEndEditable -->
-<div id="red-header">
-	<div class="clear">
-		<h1>University of Nebraska&ndash;Lincoln</h1>
-		<div id="breadcrumbs"> 
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-			<ul>
-				<li class="first"><a href="http://www.unl.edu/">UNL</a></li>
-				<li>UNL Standard Template</li>
-			</ul>
-			
-<!-- InstanceEndEditable -->
- </div>
-	</div>
-</div>
-<!-- close red-header -->
-<!-- InstanceBeginEditable name="shelf" -->
-<!--#include virtual="/ucomm/templatedependents/templatesharedcode/includes/shelf/shelf.shtml" -->
-<!-- InstanceEndEditable -->
-<div id="container">
-	<div class="clear">
-		<div id="title"> 
-<!-- InstanceBeginEditable name="collegenavigationlist" -->
- 
-<!-- InstanceEndEditable -->
-			<div id="titlegraphic">
-				<!-- WDN: see glossary item 'title graphics' -->
-				
-<!-- InstanceBeginEditable name="titlegraphic" -->
-				<h1>Department</h1>
-				<h2>Taglines - We Do The Heavy Lifting</h2>
-				
-<!-- InstanceEndEditable -->
-</div>
-			<!-- maintitle -->
-		</div>
-		<!-- close title -->
-		
-
-		<div id="navigation">
-			<h4 id="sec_nav">Navigation</h4>
-			
-<!-- InstanceBeginEditable name="navcontent" -->
-			<div id="navlinks">
-				<!--#include virtual="../sharedcode/navigation.html" -->
-			</div>
-			
-<!-- InstanceEndEditable -->
-			<div id="nav_end"></div>
-			<!-- TemplateBeginIf cond="_document['leftRandomPromo']" -->
-<!-- InstanceBeginEditable name="leftRandomPromo" -->
-			<div class="image_small_short" id="leftRandomPromo"> <a href="#" id="leftRandomPromoAnchor"><img id="leftRandomPromoImage" alt="" src="/ucomm/templatedependents/templatecss/images/transpixel.gif" /></a>
-				<script type="text/javascript" src="../sharedcode/leftRandomPromo.js"></script>
-			</div>
-			
-<!-- InstanceEndEditable -->
-<!-- TemplateEndIf -->
-			<!-- WDN: see glossary item 'sidebar links' -->
-			<div id="leftcollinks"> 
-<!-- InstanceBeginEditable name="leftcollinks" -->
-				<h3>Related Links</h3>
-				<!--#include virtual="../sharedcode/relatedLinks.html" -->
-				
-<!-- InstanceEndEditable -->
- </div>
-		</div>
-		<!-- close navigation -->
-		
-
-		<div id="main_right" class="mainwrapper">
-			<!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-			
-
-			<div id="maincontent"> 
-<!-- InstanceBeginEditable name="maincontent" -->
-				<p style="margin:20px; border:3px solid #CC0000;padding:10px; text-align:center"> <strong>Delete this box and place your content here.</strong><br />
-					Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://www.unl.edu/webdevnet/">Web Developer Network</a>. <br />
-					<a href="http://validator.unl.edu/check/referer">Click here to check Validation</a> </p>
-				
-<!-- InstanceEndEditable -->
- </div>
-			
- </div>
-		<!-- close main right -->
-	</div>
-</div>
-<!-- close container -->
-
-<div id="footer">
-	<div id="footer_floater"> 
-<!-- InstanceBeginEditable name="optionalfooter" -->
- 
-<!-- InstanceEndEditable -->
-		<div id="copyright"> 
-<!-- InstanceBeginEditable name="footercontent" -->
-			<!--#include virtual="../sharedcode/footer.html" -->
-			
-<!-- InstanceEndEditable -->
- <span><a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a> <a href="http://validator.unl.edu/check/referer">W3C</a> <a href="http://www1.unl.edu/feeds/">RSS</a> </span><a href="http://www.unl.edu/" title="UNL Home"><img src="/ucomm/templatedependents/templatecss/images/wordmark.png" alt="UNL's wordmark" id="wordmark" /></a></div>
-	</div>
-</div>
-
-<!-- close footer -->
-<!-- sifr -->
-<script type="text/javascript" src="/ucomm/templatedependents/templatesharedcode/scripts/sifr_replacements.js"></script>
-</body>
-<!-- InstanceEnd --></html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Absolute.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Absolute.tpl
deleted file mode 100644
index cd8ac123bc8a06cba0c40c92fde17b1862a01911..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Absolute.tpl
+++ /dev/null
@@ -1,119 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/absolute.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: absolute.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
--->
-<link rel="stylesheet" type="text/css" media="screen" href="http://www.unl.edu/wdn/templates_3.0/css/all.css" />
-<link rel="stylesheet" type="text/css" media="print" href="http://www.unl.edu/wdn/templates_3.0/css/print.css" />
-<script type="text/javascript" src="http://www.unl.edu/wdn/templates_3.0/scripts/all.js"></script>
-<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics.html" -->
-<!--#include virtual="/wdn/templates_3.0/includes/metanfavico.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL | Department | New Page</title>
-<!-- InstanceEndEditable -->
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<!-- InstanceEndEditable -->
-</head>
-<body class="fixed">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-<div id="wdn_wrapper">
-    <div id="header"> <a href="http://www.unl.edu/" title="UNL website"><img src="http://www.unl.edu/wdn/templates_3.0/images/logo.png" alt="UNL graphic identifier" id="logo" /></a>
-        <h1>University of Nebraska&ndash;Lincoln</h1>
-        <!--#include virtual="/wdn/templates_3.0/includes/wdnTools.html" -->
-    </div>
-    <div id="wdn_navigation_bar">
-        <div id="breadcrumbs">
-            <!-- WDN: see glossary item 'breadcrumbs' -->
-            
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-            <ul>
-                <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
-                <li>Department</li>
-            </ul>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="wdn_navigation_wrapper">
-            <div id="navigation">
-<!-- InstanceBeginEditable name="navlinks" -->
-                <!--#include virtual="../sharedcode/navigation.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-        </div>
-    </div>
-    <div id="wdn_content_wrapper">
-        <div id="titlegraphic">
-<!-- InstanceBeginEditable name="titlegraphic" -->
-            <h1>Department</h1>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="pagetitle">
-<!-- InstanceBeginEditable name="pagetitle" -->
- 
-<!-- InstanceEndEditable -->
-</div>
-        <div id="maincontent">
-            <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-            
-<!-- InstanceBeginEditable name="maincontentarea" -->
-            <p>Place your content here.<br />
-                Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://wdn.unl.edu//">Web Developer Network</a>. <br />
-                <a href="http://validator.unl.edu/check/referer">Check this page</a> </p>
-            
-<!-- InstanceEndEditable -->
-            <div class="clear"></div>
-            <!--#include virtual="/wdn/templates_3.0/includes/noscript.html" -->
-            <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-        </div>
-        <div id="footer">
-            <div id="footer_floater"></div>
-            <div class="footer_col">
-                <!--#include virtual="/wdn/templates_3.0/includes/feedback.html" -->
-            </div>
-            <div class="footer_col">
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col">
-<!-- InstanceBeginEditable name="contactinfo" -->
-                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col">
-                <!--#include virtual="/wdn/templates_3.0/includes/socialmediashare.html" -->
-            </div>
-            
-<!-- InstanceBeginEditable name="optionalfooter" -->
- 
-<!-- InstanceEndEditable -->
-            <div id="wdn_copyright">
-<!-- InstanceBeginEditable name="footercontent" -->
-                <!--#include virtual="../sharedcode/footer.html" -->
-                
-<!-- InstanceEndEditable -->
-                <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
-                | <a href="http://validator.unl.edu/check/referer">W3C</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a> <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="http://www.unl.edu/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
-        </div>
-    </div>
-    <div id="wdn_wrapper_footer"> </div>
-</div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Debug.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Debug.tpl
deleted file mode 100644
index d7d4bf586ef2537891c31f55e51740beb45ea296..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Debug.tpl
+++ /dev/null
@@ -1,119 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/debug.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: debug.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
--->
-<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/debug.css" />
-<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
-<script type="text/javascript" src="/wdn/templates_3.0/scripts/debug.js"></script>
-<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics.html" -->
-<!--#include virtual="/wdn/templates_3.0/includes/metanfavico.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL | Department | New Page</title>
-<!-- InstanceEndEditable -->
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<!-- InstanceEndEditable -->
-</head>
-<body class="fixed debug">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-<div id="wdn_wrapper">
-    <div id="header"> <a href="http://www.unl.edu/" title="UNL website"><img src="/wdn/templates_3.0/images/logo.png" alt="UNL graphic identifier" id="logo" /></a>
-        <h1>University of Nebraska&ndash;Lincoln</h1>
-        <!--#include virtual="/wdn/templates_3.0/includes/wdnTools.html" -->
-    </div>
-    <div id="wdn_navigation_bar">
-        <div id="breadcrumbs">
-            <!-- WDN: see glossary item 'breadcrumbs' -->
-            
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-            <ul>
-                <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
-                <li>Department</li>
-            </ul>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="wdn_navigation_wrapper">
-            <div id="navigation">
-<!-- InstanceBeginEditable name="navlinks" -->
-                <!--#include virtual="../sharedcode/navigation.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-        </div>
-    </div>
-    <div id="wdn_content_wrapper">
-        <div id="titlegraphic">
-<!-- InstanceBeginEditable name="titlegraphic" -->
-            <h1>Department</h1>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="pagetitle">
-<!-- InstanceBeginEditable name="pagetitle" -->
- 
-<!-- InstanceEndEditable -->
-</div>
-        <div id="maincontent">
-            <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-            
-<!-- InstanceBeginEditable name="maincontentarea" -->
-            <p>Place your content here.<br />
-                Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://wdn.unl.edu//">Web Developer Network</a>. <br />
-                <a href="http://validator.unl.edu/check/referer">Check this page</a> </p>
-            
-<!-- InstanceEndEditable -->
-            <div class="clear"></div>
-            <!--#include virtual="/wdn/templates_3.0/includes/noscript.html" -->
-            <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-        </div>
-        <div id="footer">
-            <div id="footer_floater"></div>
-            <div class="footer_col">
-                <!--#include virtual="/wdn/templates_3.0/includes/feedback.html" -->
-            </div>
-            <div class="footer_col">
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col">
-<!-- InstanceBeginEditable name="contactinfo" -->
-                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col">
-                <!--#include virtual="/wdn/templates_3.0/includes/socialmediashare.html" -->
-            </div>
-            
-<!-- InstanceBeginEditable name="optionalfooter" -->
- 
-<!-- InstanceEndEditable -->
-            <div id="wdn_copyright">
-<!-- InstanceBeginEditable name="footercontent" -->
-                <!--#include virtual="../sharedcode/footer.html" -->
-                
-<!-- InstanceEndEditable -->
-                <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
-                | <a href="http://validator.unl.edu/check/referer">W3C</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a> <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
-        </div>
-    </div>
-    <div id="wdn_wrapper_footer"> </div>
-</div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Document.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Document.tpl
deleted file mode 100644
index ddddea7f83c591b0334c3b26350ec8e29a7a2734..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Document.tpl
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/document.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: document.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
--->
-<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
-<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
-<script type="text/javascript" src="/wdn/templates_3.0/scripts/all.js"></script>
-<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics.html" -->
-<!--#include virtual="/wdn/templates_3.0/includes/metanfavico.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL | Department | New Page</title>
-<!-- InstanceEndEditable -->
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<!-- InstanceEndEditable -->
-</head>
-<body class="document">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-<div id="wdn_wrapper">
-    <div id="header"> <a href="http://www.unl.edu/" title="UNL website"><img src="/wdn/templates_3.0/images/logo.png" alt="UNL graphic identifier" id="logo" /></a>
-        <h1>University of Nebraska&ndash;Lincoln</h1>
-    </div>
-    <div id="wdn_navigation_bar">
-        <div id="breadcrumbs">
-            <!-- WDN: see glossary item 'breadcrumbs' -->
-            
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-            <ul>
-                <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
-                <li>Department</li>
-            </ul>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="wdn_navigation_wrapper">
-            <div id="navigation"></div>
-        </div>
-    </div>
-    <div id="wdn_content_wrapper">
-        <div id="titlegraphic">
-<!-- InstanceBeginEditable name="titlegraphic" -->
-            <h1>Department</h1>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="pagetitle">
-<!-- InstanceBeginEditable name="pagetitle" -->
- 
-<!-- InstanceEndEditable -->
-</div>
-        <div id="maincontent">
-            <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-            
-<!-- InstanceBeginEditable name="maincontentarea" -->
-            <p>Place your content here.<br />
-                Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://wdn.unl.edu//">Web Developer Network</a>. <br />
-                <a href="http://validator.unl.edu/check/referer">Check this page</a> </p>
-            
-<!-- InstanceEndEditable -->
-            <div class="clear"></div>
-            <!--#include virtual="/wdn/templates_3.0/includes/noscript.html" -->
-            <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-        </div>
-        <div id="footer">
-            <div id="footer_floater"></div>
-            <div id="wdn_copyright">
-<!-- InstanceBeginEditable name="footercontent" -->
-                <!--#include virtual="../sharedcode/footer.html" -->
-                
-<!-- InstanceEndEditable -->
-                <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
-                | <a href="http://validator.unl.edu/check/referer">W3C</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a> <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
-        </div>
-    </div>
-    <div id="wdn_wrapper_footer"> </div>
-</div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Fixed.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Fixed.tpl
deleted file mode 100644
index 6b2aff63fe372c0862e4767d20145f4b432447ba..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Fixed.tpl
+++ /dev/null
@@ -1,119 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/fixed.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: fixed.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
--->
-<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
-<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
-<script type="text/javascript" src="/wdn/templates_3.0/scripts/all.js"></script>
-<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics.html" -->
-<!--#include virtual="/wdn/templates_3.0/includes/metanfavico.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL | Department | New Page</title>
-<!-- InstanceEndEditable -->
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<!-- InstanceEndEditable -->
-</head>
-<body class="fixed">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-<div id="wdn_wrapper">
-    <div id="header"> <a href="http://www.unl.edu/" title="UNL website"><img src="/wdn/templates_3.0/images/logo.png" alt="UNL graphic identifier" id="logo" /></a>
-        <h1>University of Nebraska&ndash;Lincoln</h1>
-        <!--#include virtual="/wdn/templates_3.0/includes/wdnTools.html" -->
-    </div>
-    <div id="wdn_navigation_bar">
-        <div id="breadcrumbs">
-            <!-- WDN: see glossary item 'breadcrumbs' -->
-            
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-            <ul>
-                <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
-                <li>Department</li>
-            </ul>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="wdn_navigation_wrapper">
-            <div id="navigation">
-<!-- InstanceBeginEditable name="navlinks" -->
-                <!--#include virtual="../sharedcode/navigation.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-        </div>
-    </div>
-    <div id="wdn_content_wrapper">
-        <div id="titlegraphic">
-<!-- InstanceBeginEditable name="titlegraphic" -->
-            <h1>Department</h1>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="pagetitle">
-<!-- InstanceBeginEditable name="pagetitle" -->
- 
-<!-- InstanceEndEditable -->
-</div>
-        <div id="maincontent">
-            <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-            
-<!-- InstanceBeginEditable name="maincontentarea" -->
-            <p>Place your content here.<br />
-                Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://wdn.unl.edu//">Web Developer Network</a>. <br />
-                <a href="http://validator.unl.edu/check/referer">Check this page</a> </p>
-            
-<!-- InstanceEndEditable -->
-            <div class="clear"></div>
-            <!--#include virtual="/wdn/templates_3.0/includes/noscript.html" -->
-            <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-        </div>
-        <div id="footer">
-            <div id="footer_floater"></div>
-            <div class="footer_col">
-                <!--#include virtual="/wdn/templates_3.0/includes/feedback.html" -->
-            </div>
-            <div class="footer_col">
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col">
-<!-- InstanceBeginEditable name="contactinfo" -->
-                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col">
-                <!--#include virtual="/wdn/templates_3.0/includes/socialmediashare.html" -->
-            </div>
-            
-<!-- InstanceBeginEditable name="optionalfooter" -->
- 
-<!-- InstanceEndEditable -->
-            <div id="wdn_copyright">
-<!-- InstanceBeginEditable name="footercontent" -->
-                <!--#include virtual="../sharedcode/footer.html" -->
-                
-<!-- InstanceEndEditable -->
-                <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
-                | <a href="http://validator.unl.edu/check/referer">W3C</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a> <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
-        </div>
-    </div>
-    <div id="wdn_wrapper_footer"> </div>
-</div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Fixed_html5.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Fixed_html5.tpl
deleted file mode 100644
index fd316a6e4f1f77bd3085fa440794820e381766d7..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Fixed_html5.tpl
+++ /dev/null
@@ -1,119 +0,0 @@
-<!DOCTYPE html>
-<html lang="en"><!-- InstanceBegin template="/Templates/fixed_html5.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<!--#include virtual="/wdn/templates_3.0/includes/metanfavico_html5.html" -->
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: fixed_html5.dwt 1918 2011-07-07 15:59:13Z bbieber2 $
--->
-<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
-<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
-<script type="text/javascript" src="/wdn/templates_3.0/scripts/all.js"></script>
-<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics_html5.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL | Department | New Page</title>
-<!-- InstanceEndEditable -->
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<!-- InstanceEndEditable -->
-</head>
-<body class="html5 fixed">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-<div id="wdn_wrapper">
-    <div id="header"> <a href="http://www.unl.edu/" title="UNL website"><img src="/wdn/templates_3.0/images/logo.png" alt="UNL graphic identifier" id="logo" /></a>
-        <h1>University of Nebraska&ndash;Lincoln</h1>
-        <!--#include virtual="/wdn/templates_3.0/includes/wdnTools.html" -->
-    </div>
-    <div id="wdn_navigation_bar">
-        <div id="breadcrumbs">
-            <!-- WDN: see glossary item 'breadcrumbs' -->
-            
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-            <ul>
-                <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
-                <li>Department</li>
-            </ul>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="wdn_navigation_wrapper">
-            <div id="navigation">
-<!-- InstanceBeginEditable name="navlinks" -->
-                <!--#include virtual="../sharedcode/navigation.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-        </div>
-    </div>
-    <div id="wdn_content_wrapper">
-        <div id="titlegraphic">
-<!-- InstanceBeginEditable name="titlegraphic" -->
-            <h1>Department</h1>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="pagetitle">
-<!-- InstanceBeginEditable name="pagetitle" -->
- 
-<!-- InstanceEndEditable -->
-</div>
-        <div id="maincontent">
-            <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-            
-<!-- InstanceBeginEditable name="maincontentarea" -->
-            <p>Place your content here.<br />
-                Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://wdn.unl.edu//">Web Developer Network</a>. <br />
-                <a href="http://validator.unl.edu/check/referer">Check this page</a> </p>
-            
-<!-- InstanceEndEditable -->
-            <div class="clear"></div>
-            <!--#include virtual="/wdn/templates_3.0/includes/noscript.html" -->
-            <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-        </div>
-        <div id="footer">
-            <div id="footer_floater"></div>
-            <div class="footer_col">
-                <!--#include virtual="/wdn/templates_3.0/includes/feedback.html" -->
-            </div>
-            <div class="footer_col">
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col">
-<!-- InstanceBeginEditable name="contactinfo" -->
-                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col">
-                <!--#include virtual="/wdn/templates_3.0/includes/socialmediashare.html" -->
-            </div>
-            
-<!-- InstanceBeginEditable name="optionalfooter" -->
- 
-<!-- InstanceEndEditable -->
-            <div id="wdn_copyright">
-<!-- InstanceBeginEditable name="footercontent" -->
-                <!--#include virtual="../sharedcode/footer.html" -->
-                
-<!-- InstanceEndEditable -->
-                <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
-                | <a href="http://validator.unl.edu/check/referer">W3C</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a> <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
-        </div>
-    </div>
-    <div id="wdn_wrapper_footer"> </div>
-</div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Liquid.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Liquid.tpl
deleted file mode 100644
index 903f7678d86317bb2718459896d20f9552b0c429..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Liquid.tpl
+++ /dev/null
@@ -1,119 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/liquid.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: liquid.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
--->
-<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
-<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
-<script type="text/javascript" src="/wdn/templates_3.0/scripts/all.js"></script>
-<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics.html" -->
-<!--#include virtual="/wdn/templates_3.0/includes/metanfavico.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL | Department | New Page</title>
-<!-- InstanceEndEditable -->
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<!-- InstanceEndEditable -->
-</head>
-<body class="liquid">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-<div id="wdn_wrapper">
-    <div id="header"> <a href="http://www.unl.edu/" title="UNL website"><img src="/wdn/templates_3.0/images/logo.png" alt="UNL graphic identifier" id="logo" /></a>
-        <h1>University of Nebraska&ndash;Lincoln</h1>
-        <!--#include virtual="/wdn/templates_3.0/includes/wdnTools.html" -->
-    </div>
-    <div id="wdn_navigation_bar">
-        <div id="breadcrumbs">
-            <!-- WDN: see glossary item 'breadcrumbs' -->
-            
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-            <ul>
-                <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
-                <li>Department</li>
-            </ul>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="wdn_navigation_wrapper">
-            <div id="navigation">
-<!-- InstanceBeginEditable name="navlinks" -->
-                <!--#include virtual="../sharedcode/navigation.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-        </div>
-    </div>
-    <div id="wdn_content_wrapper">
-        <div id="titlegraphic">
-<!-- InstanceBeginEditable name="titlegraphic" -->
-            <h1>Department</h1>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="pagetitle">
-<!-- InstanceBeginEditable name="pagetitle" -->
- 
-<!-- InstanceEndEditable -->
-</div>
-        <div id="maincontent">
-            <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-            
-<!-- InstanceBeginEditable name="maincontentarea" -->
-            <p>Place your content here.<br />
-                Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://wdn.unl.edu//">Web Developer Network</a>. <br />
-                <a href="http://validator.unl.edu/check/referer">Check this page</a> </p>
-            
-<!-- InstanceEndEditable -->
-            <div class="clear"></div>
-            <!--#include virtual="/wdn/templates_3.0/includes/noscript.html" -->
-            <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-        </div>
-        <div id="footer">
-            <div id="footer_floater"></div>
-            <div class="footer_col">
-                <!--#include virtual="/wdn/templates_3.0/includes/feedback.html" -->
-            </div>
-            <div class="footer_col">
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col">
-<!-- InstanceBeginEditable name="contactinfo" -->
-                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col">
-                <!--#include virtual="/wdn/templates_3.0/includes/socialmediashare.html" -->
-            </div>
-            
-<!-- InstanceBeginEditable name="optionalfooter" -->
- 
-<!-- InstanceEndEditable -->
-            <div id="wdn_copyright">
-<!-- InstanceBeginEditable name="footercontent" -->
-                <!--#include virtual="../sharedcode/footer.html" -->
-                
-<!-- InstanceEndEditable -->
-                <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
-                | <a href="http://validator.unl.edu/check/referer">W3C</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a> <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
-        </div>
-    </div>
-    <div id="wdn_wrapper_footer"> </div>
-</div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Mobile.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Mobile.tpl
deleted file mode 100644
index 38c61a852be894ab7da21d4a66884d4798cce439..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Mobile.tpl
+++ /dev/null
@@ -1,119 +0,0 @@
-<!DOCTYPE html>
-<html lang="en"><!-- InstanceBegin template="/Templates/mobile.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<!--#include virtual="/wdn/templates_3.0/includes/metanfavico_html5.html" -->
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: mobile.dwt 756 2009-09-15 02:31:02Z bbieber2 $
--->
-<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width" />
-<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/mobile.css" />
-<script type="text/javascript" src="/wdn/templates_3.0/scripts/mobile.js"></script>
-<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics_html5.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL | Department | New Page</title>
-<!-- InstanceEndEditable -->
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<!-- InstanceEndEditable -->
-</head>
-<body class="html5 mobile">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-<div id="wdn_wrapper">
-    <div id="header"> <a href="http://m.unl.edu/" title="UNL website"><img src="/wdn/templates_3.0/images/logo.png" alt="UNL graphic identifier" id="logo" /></a>
-        <h1>University of Nebraska&ndash;Lincoln</h1>
-        <!--#include virtual="/wdn/templates_3.0/includes/wdnTools_html5.html" -->
-    </div>
-    <div id="wdn_navigation_bar">
-        <div id="breadcrumbs">
-            <!-- WDN: see glossary item 'breadcrumbs' -->
-            
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-            <ul>
-                <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
-                <li>Department</li>
-            </ul>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="wdn_navigation_wrapper">
-            <div id="navigation">
-<!-- InstanceBeginEditable name="navlinks" -->
-                <!--#include virtual="../sharedcode/navigation.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-        </div>
-    </div>
-    <div id="wdn_content_wrapper">
-        <div id="titlegraphic">
-<!-- InstanceBeginEditable name="titlegraphic" -->
-            <h1>Department</h1>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="pagetitle">
-<!-- InstanceBeginEditable name="pagetitle" -->
- 
-<!-- InstanceEndEditable -->
-</div>
-        <div id="maincontent">
-            <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-            
-<!-- InstanceBeginEditable name="maincontentarea" -->
-            <p>Place your content here.<br />
-                Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://wdn.unl.edu//">Web Developer Network</a>. <br />
-                <a href="http://validator.unl.edu/check/referer">Check this page</a> </p>
-            
-<!-- InstanceEndEditable -->
-            <div class="clear"></div>
-            <!--#include virtual="/wdn/templates_3.0/includes/noscript.html" -->
-            <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-        </div>
-        <div id="footer">
-            <div id="footer_floater"></div>
-            <div class="footer_col">
-                <!--#include virtual="/wdn/templates_3.0/includes/feedback.html" -->
-            </div>
-            <div class="footer_col">
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col">
-<!-- InstanceBeginEditable name="contactinfo" -->
-                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col">
-                <!--#include virtual="/wdn/templates_3.0/includes/socialmediashare.html" -->
-            </div>
-            
-<!-- InstanceBeginEditable name="optionalfooter" -->
- 
-<!-- InstanceEndEditable -->
-            <div id="wdn_copyright">
-<!-- InstanceBeginEditable name="footercontent" -->
-                <!--#include virtual="../sharedcode/footer.html" -->
-                
-<!-- InstanceEndEditable -->
-                <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
-                | <a href="http://validator.unl.edu/check/referer">W3C</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a> <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
-        </div>
-    </div>
-    <div id="wdn_wrapper_footer"> </div>
-</div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Popup.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Popup.tpl
deleted file mode 100644
index c1ce640ae2ef55c47ea29a7d31102da1928ced8b..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Popup.tpl
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/popup.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: popup.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
--->
-<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
-<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
-<script type="text/javascript" src="/wdn/templates_3.0/scripts/all.js"></script>
-<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics.html" -->
-<!--#include virtual="/wdn/templates_3.0/includes/metanfavico.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL | Department | New Page</title>
-<!-- InstanceEndEditable -->
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<!-- InstanceEndEditable -->
-</head>
-<body class="popup">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-<div id="wdn_wrapper">
-    <div id="header"> <a href="http://www.unl.edu/" title="UNL website"><img src="/wdn/templates_3.0/images/logo.png" alt="UNL graphic identifier" id="logo" /></a>
-        <h1>University of Nebraska&ndash;Lincoln</h1>
-    </div>
-    <div id="wdn_content_wrapper">
-        <div id="titlegraphic">
-<!-- InstanceBeginEditable name="titlegraphic" -->
-            <h1>Department</h1>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="pagetitle">
-<!-- InstanceBeginEditable name="pagetitle" -->
- 
-<!-- InstanceEndEditable -->
-</div>
-        <div id="maincontent">
-            <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-            
-<!-- InstanceBeginEditable name="maincontentarea" -->
-            <p>Place your content here.<br />
-                Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://wdn.unl.edu//">Web Developer Network</a>. <br />
-                <a href="http://validator.unl.edu/check/referer">Check this page</a> </p>
-            
-<!-- InstanceEndEditable -->
-            <div class="clear"></div>
-            <!--#include virtual="/wdn/templates_3.0/includes/noscript.html" -->
-            <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-        </div>
-        <div id="footer">
-            <div id="footer_floater"></div>
-            <div id="wdn_copyright">
-<!-- InstanceBeginEditable name="footercontent" -->
-                <!--#include virtual="../sharedcode/footer.html" -->
-                
-<!-- InstanceEndEditable -->
-                <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
-                | <a href="http://validator.unl.edu/check/referer">W3C</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a> <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
-        </div>
-    </div>
-    <div id="wdn_wrapper_footer"> </div>
-</div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Secure.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Secure.tpl
deleted file mode 100644
index 7d30b122432d272988eddc5e399df842bcb157fa..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Secure.tpl
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/secure.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: secure.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
--->
-<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/debug.css" />
-<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
-<script type="text/javascript" src="/wdn/templates_3.0/scripts/all.js"></script>
-<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics.html" -->
-<!--#include virtual="/wdn/templates_3.0/includes/metanfavico.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL | Department | New Page</title>
-<!-- InstanceEndEditable -->
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<!-- InstanceEndEditable -->
-</head>
-<body class="secure fixed">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-<div id="wdn_wrapper">
-    <div id="header"> <a href="http://www.unl.edu/" title="UNL website"><img src="/wdn/templates_3.0/images/logo.png" alt="UNL graphic identifier" id="logo" /></a>
-        <h1>University of Nebraska&ndash;Lincoln</h1>
-    </div>
-    <div id="wdn_navigation_bar">
-        <div id="breadcrumbs">
-            <!-- WDN: see glossary item 'breadcrumbs' -->
-            
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-            <ul>
-                <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
-                <li>Department</li>
-            </ul>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="wdn_navigation_wrapper">
-            <div id="navigation">
-<!-- InstanceBeginEditable name="navlinks" -->
-                <!--#include virtual="../sharedcode/navigation.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-        </div>
-    </div>
-    <div id="wdn_content_wrapper">
-        <div id="titlegraphic">
-<!-- InstanceBeginEditable name="titlegraphic" -->
-            <h1>Department</h1>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="pagetitle">
-<!-- InstanceBeginEditable name="pagetitle" -->
- 
-<!-- InstanceEndEditable -->
-</div>
-        <div id="maincontent">
-            <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-            
-<!-- InstanceBeginEditable name="maincontentarea" -->
-            <p>Place your content here.<br />
-                Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://wdn.unl.edu//">Web Developer Network</a>. <br />
-                <a href="http://validator.unl.edu/check/referer">Check this page</a> </p>
-            
-<!-- InstanceEndEditable -->
-            <div class="clear"></div>
-            <!--#include virtual="/wdn/templates_3.0/includes/noscript.html" -->
-            <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-        </div>
-        <div id="footer">
-            <div id="footer_floater"></div>
-            <div id="wdn_copyright">
-<!-- InstanceBeginEditable name="footercontent" -->
-                <!--#include virtual="../sharedcode/footer.html" -->
-                
-<!-- InstanceEndEditable -->
-                <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
-                | <a href="http://validator.unl.edu/check/referer">W3C</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a> <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
-        </div>
-    </div>
-    <div id="wdn_wrapper_footer"> </div>
-</div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Shared_column_left.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Shared_column_left.tpl
deleted file mode 100644
index c87ba9f1bac6ba746bc0506ed0402d5557838865..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Shared_column_left.tpl
+++ /dev/null
@@ -1,131 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/shared_column_left.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: shared_column_left.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
--->
-<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
-<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
-<script type="text/javascript" src="/wdn/templates_3.0/scripts/all.js"></script>
-<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics.html" -->
-<!--#include virtual="/wdn/templates_3.0/includes/metanfavico.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL | Department | New Page</title>
-<!-- InstanceEndEditable -->
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<!-- InstanceEndEditable -->
-</head>
-<body class="fixed">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-<div id="wdn_wrapper">
-    <div id="header"> <a href="http://www.unl.edu/" title="UNL website"><img src="/wdn/templates_3.0/images/logo.png" alt="UNL graphic identifier" id="logo" /></a>
-        <h1>University of Nebraska&ndash;Lincoln</h1>
-        <!--#include virtual="/wdn/templates_3.0/includes/wdnTools.html" -->
-    </div>
-    <div id="wdn_navigation_bar">
-        <div id="breadcrumbs">
-            <!-- WDN: see glossary item 'breadcrumbs' -->
-            
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-            <ul>
-                <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
-                <li>Department</li>
-            </ul>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="wdn_navigation_wrapper">
-            <div id="navigation">
-<!-- InstanceBeginEditable name="navlinks" -->
-                <!--#include virtual="../sharedcode/navigation.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-        </div>
-    </div>
-    <div id="wdn_content_wrapper">
-        <div id="titlegraphic">
-<!-- InstanceBeginEditable name="titlegraphic" -->
-            <h1>Department</h1>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="pagetitle">
-<!-- InstanceBeginEditable name="pagetitle" -->
- 
-<!-- InstanceEndEditable -->
-</div>
-        <div id="maincontent">
-            <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-            
-<!-- InstanceBeginEditable name="sharedcolumn" -->
-            <div class="col left">
-                <!--#include virtual="../sharedcode/sharedColumn.html" -->
-            </div>
-            
-<!-- InstanceEndEditable -->
-            <div class="three_col right"> 
-<!-- InstanceBeginEditable name="maincontentarea" -->
-                <p>Place your content here.<br />
-                    Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://wdn.unl.edu//">Web Developer Network</a>. <br />
-                    <a href="http://validator.unl.edu/check/referer">Check this page</a> </p>
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="clear"></div>
-            <!--#include virtual="/wdn/templates_3.0/includes/noscript.html" -->
-            <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-        </div>
-        <div id="footer">
-            <div id="footer_floater"></div>
-            <div class="footer_col">
-                <!--#include virtual="/wdn/templates_3.0/includes/feedback.html" -->
-            </div>
-            <div class="footer_col">
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col">
-<!-- InstanceBeginEditable name="contactinfo" -->
-                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col">
-                <!--#include virtual="/wdn/templates_3.0/includes/socialmediashare.html" -->
-            </div>
-            
-<!-- InstanceBeginEditable name="optionalfooter" -->
- 
-<!-- InstanceEndEditable -->
-            <div id="wdn_copyright">
-<!-- InstanceBeginEditable name="footercontent" -->
-                <!--#include virtual="../sharedcode/footer.html" -->
-                
-<!-- InstanceEndEditable -->
-                <ul>
-                    <li><a href="http://validator.unl.edu/check/referer">W3C</a></li>
-                    <li><a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a></li>
-                </ul>
-                <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
-                <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
-        </div>
-    </div>
-    <div id="wdn_wrapper_footer"> </div>
-</div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Shared_column_right.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Shared_column_right.tpl
deleted file mode 100644
index ed15b31f80eea62c3e70d0ba91147340221b4e72..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Shared_column_right.tpl
+++ /dev/null
@@ -1,131 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/shared_column_right.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: shared_column_right.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
--->
-<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
-<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
-<script type="text/javascript" src="/wdn/templates_3.0/scripts/all.js"></script>
-<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics.html" -->
-<!--#include virtual="/wdn/templates_3.0/includes/metanfavico.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL | Department | New Page</title>
-<!-- InstanceEndEditable -->
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<!-- InstanceEndEditable -->
-</head>
-<body class="fixed">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-<div id="wdn_wrapper">
-    <div id="header"> <a href="http://www.unl.edu/" title="UNL website"><img src="/wdn/templates_3.0/images/logo.png" alt="UNL graphic identifier" id="logo" /></a>
-        <h1>University of Nebraska&ndash;Lincoln</h1>
-        <!--#include virtual="/wdn/templates_3.0/includes/wdnTools.html" -->
-    </div>
-    <div id="wdn_navigation_bar">
-        <div id="breadcrumbs">
-            <!-- WDN: see glossary item 'breadcrumbs' -->
-            
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-            <ul>
-                <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
-                <li>Department</li>
-            </ul>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="wdn_navigation_wrapper">
-            <div id="navigation">
-<!-- InstanceBeginEditable name="navlinks" -->
-                <!--#include virtual="../sharedcode/navigation.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-        </div>
-    </div>
-    <div id="wdn_content_wrapper">
-        <div id="titlegraphic">
-<!-- InstanceBeginEditable name="titlegraphic" -->
-            <h1>Department</h1>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="pagetitle">
-<!-- InstanceBeginEditable name="pagetitle" -->
- 
-<!-- InstanceEndEditable -->
-</div>
-        <div id="maincontent">
-            <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-            <div class="three_col left"> 
-<!-- InstanceBeginEditable name="maincontentarea" -->
-                <p>Place your content here.<br />
-                    Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://wdn.unl.edu//">Web Developer Network</a>. <br />
-                    <a href="http://validator.unl.edu/check/referer">Check this page</a> </p>
-                
-<!-- InstanceEndEditable -->
-</div>
-            
-<!-- InstanceBeginEditable name="sharedcolumn" -->
-            <div class="col right">
-                <!--#include virtual="../sharedcode/sharedColumn.html" -->
-            </div>
-            
-<!-- InstanceEndEditable -->
-            <div class="clear"></div>
-            <!--#include virtual="/wdn/templates_3.0/includes/noscript.html" -->
-            <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-        </div>
-        <div id="footer">
-            <div id="footer_floater"></div>
-            <div class="footer_col">
-                <!--#include virtual="/wdn/templates_3.0/includes/feedback.html" -->
-            </div>
-            <div class="footer_col">
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col">
-<!-- InstanceBeginEditable name="contactinfo" -->
-                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col">
-                <!--#include virtual="/wdn/templates_3.0/includes/socialmediashare.html" -->
-            </div>
-            
-<!-- InstanceBeginEditable name="optionalfooter" -->
- 
-<!-- InstanceEndEditable -->
-            <div id="wdn_copyright">
-<!-- InstanceBeginEditable name="footercontent" -->
-                <!--#include virtual="../sharedcode/footer.html" -->
-                
-<!-- InstanceEndEditable -->
-                <ul>
-                    <li><a href="http://validator.unl.edu/check/referer">W3C</a></li>
-                    <li><a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a></li>
-                </ul>
-                <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
-                <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
-        </div>
-    </div>
-    <div id="wdn_wrapper_footer"> </div>
-</div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Unlaffiliate.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Unlaffiliate.tpl
deleted file mode 100644
index dd91819adbceb4f1ce75d6980cd858a9d21d982e..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3/Unlaffiliate.tpl
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: unlaffiliate.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
--->
-<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
-<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
-<link rel="stylesheet" type="text/css" media="screen" href="../sharedcode/affiliate.css" />
-<script type="text/javascript" src="/wdn/templates_3.0/scripts/all.js"></script>
-<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics.html" -->
-<!--#include virtual="/wdn/templates_3.0/includes/metanfavico.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>UNL | Department | New Page</title>
-<!-- InstanceEndEditable -->
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<!-- InstanceEndEditable -->
-</head>
-<body class="fixed">
-<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
-<div id="wdn_wrapper">
-    <div id="header"> 	
-		
-<!-- InstanceBeginEditable name="sitebranding" -->
-		<div id="affiliate_note"><a href="http://www.unl.edu" title="University of Nebraska&ndash;Lincoln">An affiliate of the University of Nebraska&ndash;Lincoln</a></div>
-		<a href="/" title="Through the Eyes of the Child Initiative"><img src="../sharedcode/affiliate_imgs/affiliate_logo.png" alt="Through the Eyes of the Child Initiative" id="logo" /></a>
-    	<h1>Through the Eyes of the Child Initiative</h1>
-		<div id='tag_line'>A Nebraska Supreme Court Initiative</div>
-		
-<!-- InstanceEndEditable -->
-		<!--#include virtual="/wdn/templates_3.0/includes/wdnTools.html" -->
-    </div>
-    <div id="wdn_navigation_bar">
-        <div id="breadcrumbs">
-            <!-- WDN: see glossary item 'breadcrumbs' -->
-            
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-            <ul>
-                <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
-                <li>Department</li>
-            </ul>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="wdn_navigation_wrapper">
-            <div id="navigation">
-<!-- InstanceBeginEditable name="navlinks" -->
-                <!--#include virtual="../sharedcode/navigation.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-        </div>
-    </div>
-    <div id="wdn_content_wrapper">
-        <div id="titlegraphic">
-<!-- InstanceBeginEditable name="titlegraphic" -->
-            <h1>Department</h1>
-            
-<!-- InstanceEndEditable -->
-</div>
-        <div id="pagetitle">
-<!-- InstanceBeginEditable name="pagetitle" -->
- 
-<!-- InstanceEndEditable -->
-</div>
-        <div id="maincontent">
-            <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-            
-<!-- InstanceBeginEditable name="maincontentarea" -->
-            <p>Place your content here.<br />
-                Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://wdn.unl.edu//">Web Developer Network</a>. <br />
-                <a href="http://validator.unl.edu/check/referer">Check this page</a> </p>
-            
-<!-- InstanceEndEditable -->
-            <div class="clear"></div>
-            <!--#include virtual="/wdn/templates_3.0/includes/noscript.html" -->
-            <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-        </div>
-        <div id="footer">
-            <div id="footer_floater"></div>
-            <div class="footer_col">
-                <!--#include virtual="/wdn/templates_3.0/includes/feedback.html" -->
-            </div>
-            <div class="footer_col">
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col">
-<!-- InstanceBeginEditable name="contactinfo" -->
-                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col">
-                <!--#include virtual="/wdn/templates_3.0/includes/socialmediashare.html" -->
-            </div>
-            
-<!-- InstanceBeginEditable name="optionalfooter" -->
- 
-<!-- InstanceEndEditable -->
-            <div id="wdn_copyright">
-<!-- InstanceBeginEditable name="footercontent" -->
-                <!--#include virtual="../sharedcode/footer.html" -->
-                
-<!-- InstanceEndEditable -->
-                <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
-                | <a href="http://validator.unl.edu/check/referer">W3C</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a> <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
-        </div>
-    </div>
-    <div id="wdn_wrapper_footer"> </div>
-</div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Debug.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Debug.tpl
deleted file mode 100644
index ca90ca65ffd630c6c6a683b300dd97490b61668c..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Debug.tpl
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><![endif]-->
-<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/debug.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
-<head>
-<!--#include virtual="/wdn/templates_3.1/includes/metanfavico.html" -->
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: debug.dwt | ea2608181e2b6604db76106fd982b39218ddcb8b | Fri Mar 9 12:20:43 2012 -0600 | Kevin Abel  $
--->
-<!--#include virtual="/wdn/templates_3.1/includes/scriptsandstyles_debug.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>Use a descriptive page title | Optional Site Title (use for context) | University of Nebraska&ndash;Lincoln</title>
-<!-- InstanceEndEditable -->
-
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-
-<!-- InstanceEndEditable -->
-<!-- InstanceParam name="class" type="text" value="fixed debug" -->
-</head>
-<body class="@@(_document['class'])@@" data-version="3.1">
-    <nav class="skipnav">
-        <a class="skipnav" href="#maincontent">Skip Navigation</a>
-    </nav>
-    <div id="wdn_wrapper">
-        <header id="header" role="banner">
-            <a id="logo" href="http://www.unl.edu/" title="UNL website">UNL</a>
-            <span id="wdn_institution_title">University of Nebraska&ndash;Lincoln</span>
-            <span id="wdn_site_title">
-<!-- InstanceBeginEditable name="titlegraphic" -->
-The Title of My Site
-<!-- InstanceEndEditable -->
-</span>
-            <!--#include virtual="/wdn/templates_3.1/includes/idm.html" -->
-            <!--#include virtual="/wdn/templates_3.1/includes/wdnTools.html" -->
-        </header>
-        <div id="wdn_navigation_bar">
-            <nav id="breadcrumbs">
-                <!-- WDN: see glossary item 'breadcrumbs' -->
-                <h3 class="wdn_list_descriptor hidden">Breadcrumbs</h3>
-                
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-                <ul>
-                    <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
-                    <li class="selected"><a href="#" title="Site Title">Site Title</a></li>
-                    <li>Page Title</li>
-                </ul>
-                
-<!-- InstanceEndEditable -->
-            </nav>
-            <div id="wdn_navigation_wrapper">
-                <nav id="navigation" role="navigation">
-                    <h3 class="wdn_list_descriptor hidden">Navigation</h3>
-                    
-<!-- InstanceBeginEditable name="navlinks" -->
-                    <!--#include virtual="../sharedcode/navigation.html" -->
-                    
-<!-- InstanceEndEditable -->
-                </nav>
-            </div>
-        </div>
-        <div id="wdn_content_wrapper">
-            <div id="pagetitle">
-                
-<!-- InstanceBeginEditable name="pagetitle" -->
-                <h1>This is your page title. It's now an &lt;h1&gt;, baby!</h1>
-                
-<!-- InstanceEndEditable -->
-            </div>
-            <div id="maincontent" role="main">
-                <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-                
-<!-- InstanceBeginEditable name="maincontentarea" -->
-                <h2>This is a blank page</h2>
-                <p>Impress your audience with awesome content!</p> 
-                
-<!-- InstanceEndEditable -->
-                <div class="clear"></div>
-                <!--#include virtual="/wdn/templates_3.1/includes/noscript.html" -->
-                <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-            </div>
-        </div>
-        <footer id="footer">
-            <div id="footer_floater"></div>
-            <div class="footer_col" id="wdn_footer_feedback">
-                <!--#include virtual="/wdn/templates_3.1/includes/feedback.html" -->
-            </div>
-            <div class="footer_col" id="wdn_footer_related">
-                
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col" id="wdn_footer_contact">
-                
-<!-- InstanceBeginEditable name="contactinfo" -->
-                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col" id="wdn_footer_share">
-                <!--#include virtual="/wdn/templates_3.1/includes/socialmediashare.html" -->
-            </div>
-            
-<!-- InstanceBeginEditable name="optionalfooter" -->
-            
-<!-- InstanceEndEditable -->
-            <div id="wdn_copyright">
-                <div>
-                    
-<!-- InstanceBeginEditable name="footercontent" -->
-                    <!--#include virtual="../sharedcode/footer.html" -->
-                    
-<!-- InstanceEndEditable -->
-                    <!--#include virtual="/wdn/templates_3.1/includes/wdn.html" -->
-                </div>
-                <!--#include virtual="/wdn/templates_3.1/includes/logos.html" -->
-            </div>
-        </footer>
-    </div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Fixed.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Fixed.tpl
deleted file mode 100644
index 5c1a3daf5b20c6dc9a4dfa8a0920362b370a7eb6..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Fixed.tpl
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><![endif]-->
-<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/fixed.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
-<head>
-<!--#include virtual="/wdn/templates_3.1/includes/metanfavico.html" -->
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: fixed.dwt | ea2608181e2b6604db76106fd982b39218ddcb8b | Fri Mar 9 12:20:43 2012 -0600 | Kevin Abel  $
--->
-<!--#include virtual="/wdn/templates_3.1/includes/scriptsandstyles.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>Use a descriptive page title | Optional Site Title (use for context) | University of Nebraska&ndash;Lincoln</title>
-<!-- InstanceEndEditable -->
-
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-
-<!-- InstanceEndEditable -->
-<!-- InstanceParam name="class" type="text" value="fixed" -->
-</head>
-<body class="@@(_document['class'])@@" data-version="3.1">
-    <nav class="skipnav">
-        <a class="skipnav" href="#maincontent">Skip Navigation</a>
-    </nav>
-    <div id="wdn_wrapper">
-        <header id="header" role="banner">
-            <a id="logo" href="http://www.unl.edu/" title="UNL website">UNL</a>
-            <span id="wdn_institution_title">University of Nebraska&ndash;Lincoln</span>
-            <span id="wdn_site_title">
-<!-- InstanceBeginEditable name="titlegraphic" -->
-The Title of My Site
-<!-- InstanceEndEditable -->
-</span>
-            <!--#include virtual="/wdn/templates_3.1/includes/idm.html" -->
-            <!--#include virtual="/wdn/templates_3.1/includes/wdnTools.html" -->
-        </header>
-        <div id="wdn_navigation_bar">
-            <nav id="breadcrumbs">
-                <!-- WDN: see glossary item 'breadcrumbs' -->
-                <h3 class="wdn_list_descriptor hidden">Breadcrumbs</h3>
-                
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-                <ul>
-                    <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
-                    <li class="selected"><a href="#" title="Site Title">Site Title</a></li>
-                    <li>Page Title</li>
-                </ul>
-                
-<!-- InstanceEndEditable -->
-            </nav>
-            <div id="wdn_navigation_wrapper">
-                <nav id="navigation" role="navigation">
-                    <h3 class="wdn_list_descriptor hidden">Navigation</h3>
-                    
-<!-- InstanceBeginEditable name="navlinks" -->
-                    <!--#include virtual="../sharedcode/navigation.html" -->
-                    
-<!-- InstanceEndEditable -->
-                </nav>
-            </div>
-        </div>
-        <div id="wdn_content_wrapper">
-            <div id="pagetitle">
-                
-<!-- InstanceBeginEditable name="pagetitle" -->
-                <h1>This is your page title. It's now an &lt;h1&gt;, baby!</h1>
-                
-<!-- InstanceEndEditable -->
-            </div>
-            <div id="maincontent" role="main">
-                <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-                
-<!-- InstanceBeginEditable name="maincontentarea" -->
-                <h2>This is a blank page</h2>
-                <p>Impress your audience with awesome content!</p> 
-                
-<!-- InstanceEndEditable -->
-                <div class="clear"></div>
-                <!--#include virtual="/wdn/templates_3.1/includes/noscript.html" -->
-                <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-            </div>
-        </div>
-        <footer id="footer">
-            <div id="footer_floater"></div>
-            <div class="footer_col" id="wdn_footer_feedback">
-                <!--#include virtual="/wdn/templates_3.1/includes/feedback.html" -->
-            </div>
-            <div class="footer_col" id="wdn_footer_related">
-                
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col" id="wdn_footer_contact">
-                
-<!-- InstanceBeginEditable name="contactinfo" -->
-                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col" id="wdn_footer_share">
-                <!--#include virtual="/wdn/templates_3.1/includes/socialmediashare.html" -->
-            </div>
-            
-<!-- InstanceBeginEditable name="optionalfooter" -->
-            
-<!-- InstanceEndEditable -->
-            <div id="wdn_copyright">
-                <div>
-                    
-<!-- InstanceBeginEditable name="footercontent" -->
-                    <!--#include virtual="../sharedcode/footer.html" -->
-                    
-<!-- InstanceEndEditable -->
-                    <!--#include virtual="/wdn/templates_3.1/includes/wdn.html" -->
-                </div>
-                <!--#include virtual="/wdn/templates_3.1/includes/logos.html" -->
-            </div>
-        </footer>
-    </div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Local.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Local.tpl
deleted file mode 100644
index 22fd3f28df7eaada632ea1c7bed6c53662347144..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Local.tpl
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><![endif]-->
-<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/local.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
-<head>
-<!--#include virtual="/wdn/templates_3.1/includes/metanfavico.html" -->
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: local.dwt | d3b0e517ecafe3e1f81c45ddafa7a316adcc45dd | Fri Mar 9 11:41:56 2012 -0600 | Kevin Abel  $
--->
-<!--#include virtual="/wdn/templates_3.1/includes/scriptsandstyles_local.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>Use a descriptive page title | Optional Site Title (use for context) | University of Nebraska&ndash;Lincoln</title>
-<!-- InstanceEndEditable -->
-
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-
-<!-- InstanceEndEditable -->
-<!-- InstanceParam name="class" type="text" value="fixed" -->
-</head>
-<body class="@@(_document['class'])@@" data-version="3.1">
-    <nav class="skipnav">
-        <a class="skipnav" href="#maincontent">Skip Navigation</a>
-    </nav>
-    <div id="wdn_wrapper">
-        <header id="header" role="banner">
-            <a id="logo" href="http://www.unl.edu/" title="UNL website">UNL</a>
-            <span id="wdn_institution_title">University of Nebraska&ndash;Lincoln</span>
-            <span id="wdn_site_title">
-<!-- InstanceBeginEditable name="titlegraphic" -->
-The Title of My Site
-<!-- InstanceEndEditable -->
-</span>
-            <!--#include virtual="/wdn/templates_3.1/includes/idm.html" -->
-            <!--#include virtual="/wdn/templates_3.1/includes/wdnTools.html" -->
-        </header>
-        <div id="wdn_navigation_bar">
-            <nav id="breadcrumbs">
-                <!-- WDN: see glossary item 'breadcrumbs' -->
-                <h3 class="wdn_list_descriptor hidden">Breadcrumbs</h3>
-                
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-                <ul>
-                    <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
-                    <li class="selected"><a href="#" title="Site Title">Site Title</a></li>
-                    <li>Page Title</li>
-                </ul>
-                
-<!-- InstanceEndEditable -->
-            </nav>
-            <div id="wdn_navigation_wrapper">
-                <nav id="navigation" role="navigation">
-                    <h3 class="wdn_list_descriptor hidden">Navigation</h3>
-                    
-<!-- InstanceBeginEditable name="navlinks" -->
-                    <!--#include virtual="../sharedcode/navigation.html" -->
-                    
-<!-- InstanceEndEditable -->
-                </nav>
-            </div>
-        </div>
-        <div id="wdn_content_wrapper">
-            <div id="pagetitle">
-                
-<!-- InstanceBeginEditable name="pagetitle" -->
-                <h1>This is your page title. It's now an &lt;h1&gt;, baby!</h1>
-                
-<!-- InstanceEndEditable -->
-            </div>
-            <div id="maincontent" role="main">
-                <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-                
-<!-- InstanceBeginEditable name="maincontentarea" -->
-                <h2>This is a blank page</h2>
-                <p>Impress your audience with awesome content!</p> 
-                
-<!-- InstanceEndEditable -->
-                <div class="clear"></div>
-                <!--#include virtual="/wdn/templates_3.1/includes/noscript.html" -->
-                <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-            </div>
-        </div>
-        <footer id="footer">
-            <div id="footer_floater"></div>
-            <div class="footer_col" id="wdn_footer_feedback">
-                <!--#include virtual="/wdn/templates_3.1/includes/feedback.html" -->
-            </div>
-            <div class="footer_col" id="wdn_footer_related">
-                
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col" id="wdn_footer_contact">
-                
-<!-- InstanceBeginEditable name="contactinfo" -->
-                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col" id="wdn_footer_share">
-                <!--#include virtual="/wdn/templates_3.1/includes/socialmediashare.html" -->
-            </div>
-            
-<!-- InstanceBeginEditable name="optionalfooter" -->
-            
-<!-- InstanceEndEditable -->
-            <div id="wdn_copyright">
-                <div>
-                    
-<!-- InstanceBeginEditable name="footercontent" -->
-                    <!--#include virtual="../sharedcode/footer.html" -->
-                    
-<!-- InstanceEndEditable -->
-                    <!--#include virtual="/wdn/templates_3.1/includes/wdn.html" -->
-                </div>
-                <!--#include virtual="/wdn/templates_3.1/includes/logos.html" -->
-            </div>
-        </footer>
-    </div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate.tpl
deleted file mode 100644
index ed7156d81c2d5cbe5174c867ff1a234f02bf8a62..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate.tpl
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><![endif]-->
-<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
-<head>
-<!--#include virtual="/wdn/templates_3.1/includes/metanfavico.html" -->
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: unlaffiliate.dwt | ea2608181e2b6604db76106fd982b39218ddcb8b | Fri Mar 9 12:20:43 2012 -0600 | Kevin Abel  $
--->
-<!--#include virtual="/wdn/templates_3.1/includes/scriptsandstyles.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>Use a descriptive page title | Optional Site Title (use for context) | UNL Affiliate</title>
-<!-- InstanceEndEditable -->
-
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<link rel="stylesheet" type="text/css" media="screen" href="../sharedcode/affiliate.css" />
-<link href="../sharedcode/affiliate_imgs/favicon.ico" rel="shortcut icon" />
-<!-- InstanceEndEditable -->
-<!-- InstanceParam name="class" type="text" value="fixed" -->
-</head>
-<body class="@@(_document['class'])@@" data-version="3.1">
-    <nav class="skipnav">
-        <a class="skipnav" href="#maincontent">Skip Navigation</a>
-    </nav>
-    <div id="wdn_wrapper">
-        <header id="header" role="banner">
-            <!-- InstanceBeginEditable name="sitebranding_logo" -->
-            <a id="logo" href="http://www.throughtheeyes.org/" title="Through the Eyes of the Child Initiative">Through the Eyes of the Child Initiative</a>
-            
-<!-- InstanceEndEditable -->
-            <span id="wdn_institution_title"><!-- InstanceBeginEditable name="sitebranding_affiliate" --><a href="http://www.unl.edu" title="University of Nebraska&ndash;Lincoln">An affiliate of the University of Nebraska&ndash;Lincoln</a>
-<!-- InstanceEndEditable -->
-</span>            
-    		<span id="wdn_site_title">
-<!-- InstanceBeginEditable name="titlegraphic" -->
-Throught the Eyes of a Child Initiative<span>A Nebraska Supreme Court Initiative</span>
-<!-- InstanceEndEditable -->
-</span>
-    		<!--#include virtual="/wdn/templates_3.1/includes/idm.html" -->
-            <!--#include virtual="/wdn/templates_3.1/includes/wdnTools.html" -->
-        </header>
-        <div id="wdn_navigation_bar">
-            <nav id="breadcrumbs">
-                <!-- WDN: see glossary item 'breadcrumbs' -->
-                <h3 class="wdn_list_descriptor hidden">Breadcrumbs</h3>
-                
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-                <ul>
-                    <li><a href="http://www.throughtheeyes.org/" title="Through the Eyes of the Child Initiative">Home</a></li>
-                </ul>
-                
-<!-- InstanceEndEditable -->
-            </nav>
-            <div id="wdn_navigation_wrapper">
-                <nav id="navigation" role="navigation">
-                    <h3 class="wdn_list_descriptor hidden">Navigation</h3>
-                    
-<!-- InstanceBeginEditable name="navlinks" -->
-                    <!--#include virtual="../sharedcode/navigation.html" -->
-                    
-<!-- InstanceEndEditable -->
-                </nav>
-            </div>
-        </div>
-        <div id="wdn_content_wrapper">
-            <div id="pagetitle">
-                
-<!-- InstanceBeginEditable name="pagetitle" -->
-                <h1>This is your page title. It's now an &lt;h1&gt;, baby!</h1>
-                
-<!-- InstanceEndEditable -->
-            </div>
-            <div id="maincontent" role="main">
-                <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-                
-<!-- InstanceBeginEditable name="maincontentarea" -->
-                <h2>This is a blank page</h2>
-                <p>Impress your audience with awesome content!</p> 
-                
-<!-- InstanceEndEditable -->
-                <div class="clear"></div>
-                <!--#include virtual="/wdn/templates_3.1/includes/noscript.html" -->
-                <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-            </div>
-        </div>
-        <footer id="footer">
-            <div id="footer_floater"></div>
-            <div class="footer_col" id="wdn_footer_feedback">
-                <!--#include virtual="/wdn/templates_3.1/includes/feedback.html" -->
-            </div>
-            <div class="footer_col" id="wdn_footer_related">
-                
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col" id="wdn_footer_contact">
-                
-<!-- InstanceBeginEditable name="contactinfo" -->
-                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col" id="wdn_footer_share">
-                <!--#include virtual="/wdn/templates_3.1/includes/socialmediashare.html" -->
-            </div>
-            
-<!-- InstanceBeginEditable name="optionalfooter" -->
-            
-<!-- InstanceEndEditable -->
-            <div id="wdn_copyright">
-                <div>
-                    
-<!-- InstanceBeginEditable name="footercontent" -->
-                    <!--#include virtual="../sharedcode/footer.html" -->
-                    
-<!-- InstanceEndEditable -->
-                    <!--#include virtual="/wdn/templates_3.1/includes/wdn.html" -->
-                </div>
-                <!--#include virtual="/wdn/templates_3.1/includes/logos.html" -->
-            </div>
-        </footer>
-    </div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate_debug.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate_debug.tpl
deleted file mode 100644
index 112032443e093c022962c69544ac457cafc6b4fe..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate_debug.tpl
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><![endif]-->
-<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate_debug.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
-<head>
-<!--#include virtual="/wdn/templates_3.1/includes/metanfavico.html" -->
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: unlaffiliate_debug.dwt | ea2608181e2b6604db76106fd982b39218ddcb8b | Fri Mar 9 12:20:43 2012 -0600 | Kevin Abel  $
--->
-<!--#include virtual="/wdn/templates_3.1/includes/scriptsandstyles_debug.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>Use a descriptive page title | Optional Site Title (use for context) | UNL Affiliate</title>
-<!-- InstanceEndEditable -->
-
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<link rel="stylesheet" type="text/css" media="screen" href="../sharedcode/affiliate.css" />
-<link href="../sharedcode/affiliate_imgs/favicon.ico" rel="shortcut icon" />
-<!-- InstanceEndEditable -->
-<!-- InstanceParam name="class" type="text" value="fixed debug" -->
-</head>
-<body class="@@(_document['class'])@@" data-version="3.1">
-    <nav class="skipnav">
-        <a class="skipnav" href="#maincontent">Skip Navigation</a>
-    </nav>
-    <div id="wdn_wrapper">
-        <header id="header" role="banner">
-            <!-- InstanceBeginEditable name="sitebranding_logo" -->
-            <a id="logo" href="http://www.throughtheeyes.org/" title="Through the Eyes of the Child Initiative">Through the Eyes of the Child Initiative</a>
-            
-<!-- InstanceEndEditable -->
-            <span id="wdn_institution_title"><!-- InstanceBeginEditable name="sitebranding_affiliate" --><a href="http://www.unl.edu" title="University of Nebraska&ndash;Lincoln">An affiliate of the University of Nebraska&ndash;Lincoln</a>
-<!-- InstanceEndEditable -->
-</span>            
-    		<span id="wdn_site_title">
-<!-- InstanceBeginEditable name="titlegraphic" -->
-Throught the Eyes of a Child Initiative<span>A Nebraska Supreme Court Initiative</span>
-<!-- InstanceEndEditable -->
-</span>
-    		<!--#include virtual="/wdn/templates_3.1/includes/idm.html" -->
-            <!--#include virtual="/wdn/templates_3.1/includes/wdnTools.html" -->
-        </header>
-        <div id="wdn_navigation_bar">
-            <nav id="breadcrumbs">
-                <!-- WDN: see glossary item 'breadcrumbs' -->
-                <h3 class="wdn_list_descriptor hidden">Breadcrumbs</h3>
-                
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-                <ul>
-                    <li><a href="http://www.throughtheeyes.org/" title="Through the Eyes of the Child Initiative">Home</a></li>
-                </ul>
-                
-<!-- InstanceEndEditable -->
-            </nav>
-            <div id="wdn_navigation_wrapper">
-                <nav id="navigation" role="navigation">
-                    <h3 class="wdn_list_descriptor hidden">Navigation</h3>
-                    
-<!-- InstanceBeginEditable name="navlinks" -->
-                    <!--#include virtual="../sharedcode/navigation.html" -->
-                    
-<!-- InstanceEndEditable -->
-                </nav>
-            </div>
-        </div>
-        <div id="wdn_content_wrapper">
-            <div id="pagetitle">
-                
-<!-- InstanceBeginEditable name="pagetitle" -->
-                <h1>This is your page title. It's now an &lt;h1&gt;, baby!</h1>
-                
-<!-- InstanceEndEditable -->
-            </div>
-            <div id="maincontent" role="main">
-                <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-                
-<!-- InstanceBeginEditable name="maincontentarea" -->
-                <h2>This is a blank page</h2>
-                <p>Impress your audience with awesome content!</p> 
-                
-<!-- InstanceEndEditable -->
-                <div class="clear"></div>
-                <!--#include virtual="/wdn/templates_3.1/includes/noscript.html" -->
-                <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-            </div>
-        </div>
-        <footer id="footer">
-            <div id="footer_floater"></div>
-            <div class="footer_col" id="wdn_footer_feedback">
-                <!--#include virtual="/wdn/templates_3.1/includes/feedback.html" -->
-            </div>
-            <div class="footer_col" id="wdn_footer_related">
-                
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col" id="wdn_footer_contact">
-                
-<!-- InstanceBeginEditable name="contactinfo" -->
-                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col" id="wdn_footer_share">
-                <!--#include virtual="/wdn/templates_3.1/includes/socialmediashare.html" -->
-            </div>
-            
-<!-- InstanceBeginEditable name="optionalfooter" -->
-            
-<!-- InstanceEndEditable -->
-            <div id="wdn_copyright">
-                <div>
-                    
-<!-- InstanceBeginEditable name="footercontent" -->
-                    <!--#include virtual="../sharedcode/footer.html" -->
-                    
-<!-- InstanceEndEditable -->
-                    <!--#include virtual="/wdn/templates_3.1/includes/wdn.html" -->
-                </div>
-                <!--#include virtual="/wdn/templates_3.1/includes/logos.html" -->
-            </div>
-        </footer>
-    </div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate_local.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate_local.tpl
deleted file mode 100644
index 09e83982249ffd96b9dc83474babaa3a0c567e72..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version3x1/Unlaffiliate_local.tpl
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><![endif]-->
-<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate_local.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
-<head>
-<!--#include virtual="/wdn/templates_3.1/includes/metanfavico.html" -->
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: unlaffiliate_local.dwt | d3b0e517ecafe3e1f81c45ddafa7a316adcc45dd | Fri Mar 9 11:41:56 2012 -0600 | Kevin Abel  $
--->
-<!--#include virtual="/wdn/templates_3.1/includes/scriptsandstyles_local.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>Use a descriptive page title | Optional Site Title (use for context) | UNL Affiliate</title>
-<!-- InstanceEndEditable -->
-
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<link rel="stylesheet" type="text/css" media="screen" href="../sharedcode/affiliate.css" />
-<link href="../sharedcode/affiliate_imgs/favicon.ico" rel="shortcut icon" />
-<!-- InstanceEndEditable -->
-<!-- InstanceParam name="class" type="text" value="fixed" -->
-</head>
-<body class="@@(_document['class'])@@" data-version="3.1">
-    <nav class="skipnav">
-        <a class="skipnav" href="#maincontent">Skip Navigation</a>
-    </nav>
-    <div id="wdn_wrapper">
-        <header id="header" role="banner">
-            <!-- InstanceBeginEditable name="sitebranding_logo" -->
-            <a id="logo" href="http://www.throughtheeyes.org/" title="Through the Eyes of the Child Initiative">Through the Eyes of the Child Initiative</a>
-            
-<!-- InstanceEndEditable -->
-            <span id="wdn_institution_title"><!-- InstanceBeginEditable name="sitebranding_affiliate" --><a href="http://www.unl.edu" title="University of Nebraska&ndash;Lincoln">An affiliate of the University of Nebraska&ndash;Lincoln</a>
-<!-- InstanceEndEditable -->
-</span>            
-    		<span id="wdn_site_title">
-<!-- InstanceBeginEditable name="titlegraphic" -->
-Throught the Eyes of a Child Initiative<span>A Nebraska Supreme Court Initiative</span>
-<!-- InstanceEndEditable -->
-</span>
-    		<!--#include virtual="/wdn/templates_3.1/includes/idm.html" -->
-            <!--#include virtual="/wdn/templates_3.1/includes/wdnTools.html" -->
-        </header>
-        <div id="wdn_navigation_bar">
-            <nav id="breadcrumbs">
-                <!-- WDN: see glossary item 'breadcrumbs' -->
-                <h3 class="wdn_list_descriptor hidden">Breadcrumbs</h3>
-                
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-                <ul>
-                    <li><a href="http://www.throughtheeyes.org/" title="Through the Eyes of the Child Initiative">Home</a></li>
-                </ul>
-                
-<!-- InstanceEndEditable -->
-            </nav>
-            <div id="wdn_navigation_wrapper">
-                <nav id="navigation" role="navigation">
-                    <h3 class="wdn_list_descriptor hidden">Navigation</h3>
-                    
-<!-- InstanceBeginEditable name="navlinks" -->
-                    <!--#include virtual="../sharedcode/navigation.html" -->
-                    
-<!-- InstanceEndEditable -->
-                </nav>
-            </div>
-        </div>
-        <div id="wdn_content_wrapper">
-            <div id="pagetitle">
-                
-<!-- InstanceBeginEditable name="pagetitle" -->
-                <h1>This is your page title. It's now an &lt;h1&gt;, baby!</h1>
-                
-<!-- InstanceEndEditable -->
-            </div>
-            <div id="maincontent" role="main">
-                <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-                
-<!-- InstanceBeginEditable name="maincontentarea" -->
-                <h2>This is a blank page</h2>
-                <p>Impress your audience with awesome content!</p> 
-                
-<!-- InstanceEndEditable -->
-                <div class="clear"></div>
-                <!--#include virtual="/wdn/templates_3.1/includes/noscript.html" -->
-                <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-            </div>
-        </div>
-        <footer id="footer">
-            <div id="footer_floater"></div>
-            <div class="footer_col" id="wdn_footer_feedback">
-                <!--#include virtual="/wdn/templates_3.1/includes/feedback.html" -->
-            </div>
-            <div class="footer_col" id="wdn_footer_related">
-                
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col" id="wdn_footer_contact">
-                
-<!-- InstanceBeginEditable name="contactinfo" -->
-                <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                
-<!-- InstanceEndEditable -->
-</div>
-            <div class="footer_col" id="wdn_footer_share">
-                <!--#include virtual="/wdn/templates_3.1/includes/socialmediashare.html" -->
-            </div>
-            
-<!-- InstanceBeginEditable name="optionalfooter" -->
-            
-<!-- InstanceEndEditable -->
-            <div id="wdn_copyright">
-                <div>
-                    
-<!-- InstanceBeginEditable name="footercontent" -->
-                    <!--#include virtual="../sharedcode/footer.html" -->
-                    
-<!-- InstanceEndEditable -->
-                    <!--#include virtual="/wdn/templates_3.1/includes/wdn.html" -->
-                </div>
-                <!--#include virtual="/wdn/templates_3.1/includes/logos.html" -->
-            </div>
-        </footer>
-    </div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Debug.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Debug.tpl
deleted file mode 100644
index da4455710d6d033be2441569fee84a6a0388e3bf..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Debug.tpl
+++ /dev/null
@@ -1,166 +0,0 @@
-<!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><![endif]-->
-<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/debug.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
-<head>
-<!--#include virtual="/wdn/templates_4.0/includes/metanfavico.html" -->
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: debug.dwt | 1453c8fc0eafda458699fd5676379805da2368cc | Fri Oct 12 13:23:32 2012 -0500 | Seth Meranda  $
--->
-<!--#include virtual="/wdn/templates_4.0/includes/scriptsandstyles_debug.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>Use a descriptive page title | Optional Site Title (use for context) | University of Nebraska&ndash;Lincoln</title>
-<!-- InstanceEndEditable -->
-
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-
-<!-- InstanceEndEditable -->
-<!-- InstanceParam name="class" type="text" value="debug" -->
-</head>
-<body class="@@(_document['class'])@@" data-version="4.0">
-    <!--#include virtual="/wdn/templates_4.0/includes/skipnav.html" -->
-    <div id="wdn_wrapper">
-        <input type="checkbox" id="wdn_menu_toggle" value="Show navigation menu" class="wdn-content-slide wdn-input-driver" />
-        <!--#include virtual="/wdn/templates_4.0/includes/noscript-padding.html" -->
-        <header id="header" role="banner" class="wdn-content-slide wdn-band">
-            <!--#include virtual="/wdn/templates_4.0/includes/wdnResources.html" -->
-            <div class="wdn-inner-wrapper">
-                <!--#include virtual="/wdn/templates_4.0/includes/logo.html" -->
-                <div id="wdn_resources">
-                    <!--#include virtual="/wdn/templates_4.0/includes/idm.html" -->
-                    <!--#include virtual="/wdn/templates_4.0/includes/wdnTools.html" -->
-                </div>
-                <span id="wdn_institution_title">University of Nebraska&ndash;Lincoln</span>
-            </div>
-            <!--#include virtual="/wdn/templates_4.0/includes/apps.html" -->
-            <div class="wdn-inner-wrapper">
-                <div id="wdn_site_title">
-                    <span>
-<!-- InstanceBeginEditable name="titlegraphic" -->
-The Title of My Site
-<!-- InstanceEndEditable -->
-</span>
-                </div>
-            </div>
-        </header>
-        <div id="wdn_navigation_bar" role="navigation" class="wdn-band">
-            <nav id="breadcrumbs" class="wdn-inner-wrapper">
-                <!-- WDN: see glossary item 'breadcrumbs' -->
-                <h3 class="wdn_list_descriptor wdn-text-hidden">Breadcrumbs</h3>
-                
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-                <ul>
-                    <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln" class="wdn-icon-home">UNL</a></li>
-                    <li><a href="#" title="Site Title">Site Title</a></li>
-                    <li>Home</li>
-                </ul>
-                
-<!-- InstanceEndEditable -->
-            </nav>
-            <div id="wdn_navigation_wrapper">
-                <nav id="navigation" role="navigation" class="wdn-band">
-                    <h3 class="wdn_list_descriptor wdn-text-hidden">Navigation</h3>
-                    
-<!-- InstanceBeginEditable name="navlinks" -->
-                    <!--#include virtual="../sharedcode/navigation.html" -->
-                    
-<!-- InstanceEndEditable -->
-                    <label for="wdn_menu_toggle" class="wdn-icon-menu">Menu</label>
-                </nav>
-            </div>
-        </div>
-        <!-- Navigation Trigger -->
-        <div class="wdn-menu-trigger wdn-content-slide">
-            <label for="wdn_menu_toggle" class="wdn-icon-menu">Menu</label>
-        </div>
-        <!-- End navigation trigger -->
-        <div id="wdn_content_wrapper" role="main" class="wdn-content-slide">
-            <div class="wdn-band">
-                <div class="wdn-inner-wrapper">
-                    <div id="pagetitle">
-                        
-<!-- InstanceBeginEditable name="pagetitle" -->
-                        <h1>Please Title Your Page Here</h1>
-                        
-<!-- InstanceEndEditable -->
-                    </div>
-                </div>
-            </div>
-            <div id="maincontent" class="wdn-main">
-                <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-                
-<!-- InstanceBeginEditable name="maincontentarea" -->
-                <div class="wdn-band">
-                    <div class="wdn-inner-wrapper">
-                        <p>Impress your audience with awesome content!</p>
-                    </div>
-                </div>
-                
-<!-- InstanceEndEditable -->
-                <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-            </div>
-        </div>
-        <div class="wdn-band wdn-content-slide" id="wdn_optional_footer">
-            <div class="wdn-inner-wrapper">
-                
-<!-- InstanceBeginEditable name="optionalfooter" -->
-                
-<!-- InstanceEndEditable -->
-            </div>
-        </div>
-        <footer id="footer" role="contentinfo" class="wdn-content-slide">
-            <div class="wdn-band" id="wdn_footer_related">
-                <div class="wdn-inner-wrapper">
-                    
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                    <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                    
-<!-- InstanceEndEditable -->
-                </div>
-            </div>
-            <div class="wdn-band">
-                <div class="wdn-inner-wrapper">
-                    <div class="footer_col" id="wdn_footer_contact">
-                        <h3>Contact Us</h3>
-                        <div class="wdn-contact-wrapper">
-                            
-<!-- InstanceBeginEditable name="contactinfo" -->
-                            <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                            
-<!-- InstanceEndEditable -->
-                        </div>
-                    </div>
-                    <div id="wdn_copyright">
-                        <div class="wdn-footer-text">
-                            
-<!-- InstanceBeginEditable name="footercontent" -->
-                            <!--#include virtual="../sharedcode/footer.html" -->
-                            
-<!-- InstanceEndEditable -->
-                            <!--#include virtual="/wdn/templates_4.0/includes/wdn.html" -->
-                        </div>
-                    <!--#include virtual="/wdn/templates_4.0/includes/logos.html" -->
-                    </div>
-                </div>
-            </div>
-            <!--#include virtual="/wdn/templates_4.0/includes/footer_floater.html" -->
-        </footer>
-        <!--#include virtual="/wdn/templates_4.0/includes/noscript.html" -->
-    </div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Fixed.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Fixed.tpl
deleted file mode 100644
index 5179f462554cdbb80086f6ed61ff0391b49c33e1..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Fixed.tpl
+++ /dev/null
@@ -1,166 +0,0 @@
-<!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><![endif]-->
-<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/fixed.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
-<head>
-<!--#include virtual="/wdn/templates_4.0/includes/metanfavico.html" -->
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: fixed.dwt | 1453c8fc0eafda458699fd5676379805da2368cc | Fri Oct 12 13:23:32 2012 -0500 | Seth Meranda  $
--->
-<!--#include virtual="/wdn/templates_4.0/includes/scriptsandstyles.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>Use a descriptive page title | Optional Site Title (use for context) | University of Nebraska&ndash;Lincoln</title>
-<!-- InstanceEndEditable -->
-
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-
-<!-- InstanceEndEditable -->
-<!-- InstanceParam name="class" type="text" value="" -->
-</head>
-<body class="@@(_document['class'])@@" data-version="4.0">
-    <!--#include virtual="/wdn/templates_4.0/includes/skipnav.html" -->
-    <div id="wdn_wrapper">
-        <input type="checkbox" id="wdn_menu_toggle" value="Show navigation menu" class="wdn-content-slide wdn-input-driver" />
-        <!--#include virtual="/wdn/templates_4.0/includes/noscript-padding.html" -->
-        <header id="header" role="banner" class="wdn-content-slide wdn-band">
-            <!--#include virtual="/wdn/templates_4.0/includes/wdnResources.html" -->
-            <div class="wdn-inner-wrapper">
-                <!--#include virtual="/wdn/templates_4.0/includes/logo.html" -->
-                <div id="wdn_resources">
-                    <!--#include virtual="/wdn/templates_4.0/includes/idm.html" -->
-                    <!--#include virtual="/wdn/templates_4.0/includes/wdnTools.html" -->
-                </div>
-                <span id="wdn_institution_title">University of Nebraska&ndash;Lincoln</span>
-            </div>
-            <!--#include virtual="/wdn/templates_4.0/includes/apps.html" -->
-            <div class="wdn-inner-wrapper">
-                <div id="wdn_site_title">
-                    <span>
-<!-- InstanceBeginEditable name="titlegraphic" -->
-The Title of My Site
-<!-- InstanceEndEditable -->
-</span>
-                </div>
-            </div>
-        </header>
-        <div id="wdn_navigation_bar" role="navigation" class="wdn-band">
-            <nav id="breadcrumbs" class="wdn-inner-wrapper">
-                <!-- WDN: see glossary item 'breadcrumbs' -->
-                <h3 class="wdn_list_descriptor wdn-text-hidden">Breadcrumbs</h3>
-                
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-                <ul>
-                    <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln" class="wdn-icon-home">UNL</a></li>
-                    <li><a href="#" title="Site Title">Site Title</a></li>
-                    <li>Home</li>
-                </ul>
-                
-<!-- InstanceEndEditable -->
-            </nav>
-            <div id="wdn_navigation_wrapper">
-                <nav id="navigation" role="navigation" class="wdn-band">
-                    <h3 class="wdn_list_descriptor wdn-text-hidden">Navigation</h3>
-                    
-<!-- InstanceBeginEditable name="navlinks" -->
-                    <!--#include virtual="../sharedcode/navigation.html" -->
-                    
-<!-- InstanceEndEditable -->
-                    <label for="wdn_menu_toggle" class="wdn-icon-menu">Menu</label>
-                </nav>
-            </div>
-        </div>
-        <!-- Navigation Trigger -->
-        <div class="wdn-menu-trigger wdn-content-slide">
-            <label for="wdn_menu_toggle" class="wdn-icon-menu">Menu</label>
-        </div>
-        <!-- End navigation trigger -->
-        <div id="wdn_content_wrapper" role="main" class="wdn-content-slide">
-            <div class="wdn-band">
-                <div class="wdn-inner-wrapper">
-                    <div id="pagetitle">
-                        
-<!-- InstanceBeginEditable name="pagetitle" -->
-                        <h1>Please Title Your Page Here</h1>
-                        
-<!-- InstanceEndEditable -->
-                    </div>
-                </div>
-            </div>
-            <div id="maincontent" class="wdn-main">
-                <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-                
-<!-- InstanceBeginEditable name="maincontentarea" -->
-                <div class="wdn-band">
-                    <div class="wdn-inner-wrapper">
-                        <p>Impress your audience with awesome content!</p>
-                    </div>
-                </div>
-                
-<!-- InstanceEndEditable -->
-                <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-            </div>
-        </div>
-        <div class="wdn-band wdn-content-slide" id="wdn_optional_footer">
-            <div class="wdn-inner-wrapper">
-                
-<!-- InstanceBeginEditable name="optionalfooter" -->
-                
-<!-- InstanceEndEditable -->
-            </div>
-        </div>
-        <footer id="footer" role="contentinfo" class="wdn-content-slide">
-            <div class="wdn-band" id="wdn_footer_related">
-                <div class="wdn-inner-wrapper">
-                    
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                    <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                    
-<!-- InstanceEndEditable -->
-                </div>
-            </div>
-            <div class="wdn-band">
-                <div class="wdn-inner-wrapper">
-                    <div class="footer_col" id="wdn_footer_contact">
-                        <h3>Contact Us</h3>
-                        <div class="wdn-contact-wrapper">
-                            
-<!-- InstanceBeginEditable name="contactinfo" -->
-                            <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                            
-<!-- InstanceEndEditable -->
-                        </div>
-                    </div>
-                    <div id="wdn_copyright">
-                        <div class="wdn-footer-text">
-                            
-<!-- InstanceBeginEditable name="footercontent" -->
-                            <!--#include virtual="../sharedcode/footer.html" -->
-                            
-<!-- InstanceEndEditable -->
-                            <!--#include virtual="/wdn/templates_4.0/includes/wdn.html" -->
-                        </div>
-                    <!--#include virtual="/wdn/templates_4.0/includes/logos.html" -->
-                    </div>
-                </div>
-            </div>
-            <!--#include virtual="/wdn/templates_4.0/includes/footer_floater.html" -->
-        </footer>
-        <!--#include virtual="/wdn/templates_4.0/includes/noscript.html" -->
-    </div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Local.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Local.tpl
deleted file mode 100644
index ecc46f57bfb32bcf9527e08f5e8b021288c167f3..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Local.tpl
+++ /dev/null
@@ -1,166 +0,0 @@
-<!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><![endif]-->
-<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/local.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
-<head>
-<!--#include virtual="/wdn/templates_4.0/includes/metanfavico.html" -->
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: local.dwt | 1453c8fc0eafda458699fd5676379805da2368cc | Fri Oct 12 13:23:32 2012 -0500 | Seth Meranda  $
--->
-<!--#include virtual="/wdn/templates_4.0/includes/scriptsandstyles_local.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>Use a descriptive page title | Optional Site Title (use for context) | University of Nebraska&ndash;Lincoln</title>
-<!-- InstanceEndEditable -->
-
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-
-<!-- InstanceEndEditable -->
-<!-- InstanceParam name="class" type="text" value="" -->
-</head>
-<body class="@@(_document['class'])@@" data-version="4.0">
-    <!--#include virtual="/wdn/templates_4.0/includes/skipnav.html" -->
-    <div id="wdn_wrapper">
-        <input type="checkbox" id="wdn_menu_toggle" value="Show navigation menu" class="wdn-content-slide wdn-input-driver" />
-        <!--#include virtual="/wdn/templates_4.0/includes/noscript-padding.html" -->
-        <header id="header" role="banner" class="wdn-content-slide wdn-band">
-            <!--#include virtual="/wdn/templates_4.0/includes/wdnResources.html" -->
-            <div class="wdn-inner-wrapper">
-                <!--#include virtual="/wdn/templates_4.0/includes/logo.html" -->
-                <div id="wdn_resources">
-                    <!--#include virtual="/wdn/templates_4.0/includes/idm.html" -->
-                    <!--#include virtual="/wdn/templates_4.0/includes/wdnTools.html" -->
-                </div>
-                <span id="wdn_institution_title">University of Nebraska&ndash;Lincoln</span>
-            </div>
-            <!--#include virtual="/wdn/templates_4.0/includes/apps.html" -->
-            <div class="wdn-inner-wrapper">
-                <div id="wdn_site_title">
-                    <span>
-<!-- InstanceBeginEditable name="titlegraphic" -->
-The Title of My Site
-<!-- InstanceEndEditable -->
-</span>
-                </div>
-            </div>
-        </header>
-        <div id="wdn_navigation_bar" role="navigation" class="wdn-band">
-            <nav id="breadcrumbs" class="wdn-inner-wrapper">
-                <!-- WDN: see glossary item 'breadcrumbs' -->
-                <h3 class="wdn_list_descriptor wdn-text-hidden">Breadcrumbs</h3>
-                
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-                <ul>
-                    <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln" class="wdn-icon-home">UNL</a></li>
-                    <li><a href="#" title="Site Title">Site Title</a></li>
-                    <li>Home</li>
-                </ul>
-                
-<!-- InstanceEndEditable -->
-            </nav>
-            <div id="wdn_navigation_wrapper">
-                <nav id="navigation" role="navigation" class="wdn-band">
-                    <h3 class="wdn_list_descriptor wdn-text-hidden">Navigation</h3>
-                    
-<!-- InstanceBeginEditable name="navlinks" -->
-                    <!--#include virtual="../sharedcode/navigation.html" -->
-                    
-<!-- InstanceEndEditable -->
-                    <label for="wdn_menu_toggle" class="wdn-icon-menu">Menu</label>
-                </nav>
-            </div>
-        </div>
-        <!-- Navigation Trigger -->
-        <div class="wdn-menu-trigger wdn-content-slide">
-            <label for="wdn_menu_toggle" class="wdn-icon-menu">Menu</label>
-        </div>
-        <!-- End navigation trigger -->
-        <div id="wdn_content_wrapper" role="main" class="wdn-content-slide">
-            <div class="wdn-band">
-                <div class="wdn-inner-wrapper">
-                    <div id="pagetitle">
-                        
-<!-- InstanceBeginEditable name="pagetitle" -->
-                        <h1>Please Title Your Page Here</h1>
-                        
-<!-- InstanceEndEditable -->
-                    </div>
-                </div>
-            </div>
-            <div id="maincontent" class="wdn-main">
-                <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-                
-<!-- InstanceBeginEditable name="maincontentarea" -->
-                <div class="wdn-band">
-                    <div class="wdn-inner-wrapper">
-                        <p>Impress your audience with awesome content!</p>
-                    </div>
-                </div>
-                
-<!-- InstanceEndEditable -->
-                <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-            </div>
-        </div>
-        <div class="wdn-band wdn-content-slide" id="wdn_optional_footer">
-            <div class="wdn-inner-wrapper">
-                
-<!-- InstanceBeginEditable name="optionalfooter" -->
-                
-<!-- InstanceEndEditable -->
-            </div>
-        </div>
-        <footer id="footer" role="contentinfo" class="wdn-content-slide">
-            <div class="wdn-band" id="wdn_footer_related">
-                <div class="wdn-inner-wrapper">
-                    
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                    <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                    
-<!-- InstanceEndEditable -->
-                </div>
-            </div>
-            <div class="wdn-band">
-                <div class="wdn-inner-wrapper">
-                    <div class="footer_col" id="wdn_footer_contact">
-                        <h3>Contact Us</h3>
-                        <div class="wdn-contact-wrapper">
-                            
-<!-- InstanceBeginEditable name="contactinfo" -->
-                            <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                            
-<!-- InstanceEndEditable -->
-                        </div>
-                    </div>
-                    <div id="wdn_copyright">
-                        <div class="wdn-footer-text">
-                            
-<!-- InstanceBeginEditable name="footercontent" -->
-                            <!--#include virtual="../sharedcode/footer.html" -->
-                            
-<!-- InstanceEndEditable -->
-                            <!--#include virtual="/wdn/templates_4.0/includes/wdn.html" -->
-                        </div>
-                    <!--#include virtual="/wdn/templates_4.0/includes/logos.html" -->
-                    </div>
-                </div>
-            </div>
-            <!--#include virtual="/wdn/templates_4.0/includes/footer_floater.html" -->
-        </footer>
-        <!--#include virtual="/wdn/templates_4.0/includes/noscript.html" -->
-    </div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Unlaffiliate.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Unlaffiliate.tpl
deleted file mode 100644
index d9d358631659857513eb985b2008445acdc63f25..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Unlaffiliate.tpl
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><![endif]-->
-<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
-<head>
-<!--#include virtual="/wdn/templates_4.0/includes/metanfavico.html" -->
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: unlaffiliate.dwt | 1453c8fc0eafda458699fd5676379805da2368cc | Fri Oct 12 13:23:32 2012 -0500 | Seth Meranda  $
--->
-<!--#include virtual="/wdn/templates_4.0/includes/scriptsandstyles.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>Use a descriptive page title | Optional Site Title (use for context) | UNL Affiliate</title>
-<!-- InstanceEndEditable -->
-
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<link rel="stylesheet" type="text/css" media="screen" href="../sharedcode/affiliate.css" />
-<link href="../sharedcode/affiliate_imgs/favicon.ico" rel="shortcut icon" />
-<!-- InstanceEndEditable -->
-<!-- InstanceParam name="class" type="text" value="" -->
-</head>
-<body class="@@(_document['class'])@@" data-version="4.0">
-    <!--#include virtual="/wdn/templates_4.0/includes/skipnav.html" -->
-    <div id="wdn_wrapper">
-        <input type="checkbox" id="wdn_menu_toggle" value="Show navigation menu" class="wdn-content-slide wdn-input-driver" />
-        <!--#include virtual="/wdn/templates_4.0/includes/noscript-padding.html" -->
-        <header id="header" role="banner" class="wdn-content-slide wdn-band">
-            <!--#include virtual="/wdn/templates_4.0/includes/wdnResources.html" -->
-            <div class="wdn-inner-wrapper">
-                <!-- InstanceBeginEditable name="sitebranding_logo" -->
-                <div id="logo">
-                    <a href="http://www.throughtheeyes.org/" title="Through the Eyes of the Child Initiative" id="wdn_logo_link">Through the Eyes of the Child Initiative</a>
-                </div>
-                
-<!-- InstanceEndEditable -->
-                <div id="wdn_resources">
-                    <!--#include virtual="/wdn/templates_4.0/includes/idm.html" -->
-                    <!--#include virtual="/wdn/templates_4.0/includes/wdnTools.html" -->
-                </div>
-                <span id="wdn_institution_title"><!-- InstanceBeginEditable name="sitebranding_affiliate" --><a href="http://www.unl.edu" title="University of Nebraska&ndash;Lincoln">An affiliate of the University of Nebraska&ndash;Lincoln</a>
-<!-- InstanceEndEditable -->
-</span>
-            </div>
-            <!--#include virtual="/wdn/templates_4.0/includes/apps.html" -->
-            <div class="wdn-inner-wrapper">
-                <div id="wdn_site_title">
-                    <span>
-<!-- InstanceBeginEditable name="titlegraphic" -->
-The Title of My Site
-<!-- InstanceEndEditable -->
-</span>
-                </div>
-            </div>
-        </header>
-        <div id="wdn_navigation_bar" role="navigation" class="wdn-band">
-            <nav id="breadcrumbs" class="wdn-inner-wrapper">
-                <!-- WDN: see glossary item 'breadcrumbs' -->
-                <h3 class="wdn_list_descriptor wdn-text-hidden">Breadcrumbs</h3>
-                
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-                <ul>
-                    <li><a href="http://www.throughtheeyes.org/" title="Through the Eyes of the Child Initiative">Home</a></li>
-                </ul>
-                
-<!-- InstanceEndEditable -->
-            </nav>
-            <div id="wdn_navigation_wrapper">
-                <nav id="navigation" role="navigation" class="wdn-band">
-                    <h3 class="wdn_list_descriptor wdn-text-hidden">Navigation</h3>
-                    
-<!-- InstanceBeginEditable name="navlinks" -->
-                    <!--#include virtual="../sharedcode/navigation.html" -->
-                    
-<!-- InstanceEndEditable -->
-                    <label for="wdn_menu_toggle" class="wdn-icon-menu">Menu</label>
-                </nav>
-            </div>
-        </div>
-        <!-- Navigation Trigger -->
-        <div class="wdn-menu-trigger wdn-content-slide">
-            <label for="wdn_menu_toggle" class="wdn-icon-menu">Menu</label>
-        </div>
-        <!-- End navigation trigger -->
-        <div id="wdn_content_wrapper" role="main" class="wdn-content-slide">
-            <div class="wdn-band">
-                <div class="wdn-inner-wrapper">
-                    <div id="pagetitle">
-                        
-<!-- InstanceBeginEditable name="pagetitle" -->
-                        <h1>Please Title Your Page Here</h1>
-                        
-<!-- InstanceEndEditable -->
-                    </div>
-                </div>
-            </div>
-            <div id="maincontent" class="wdn-main">
-                <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-                
-<!-- InstanceBeginEditable name="maincontentarea" -->
-                <div class="wdn-band">
-                    <div class="wdn-inner-wrapper">
-                        <p>Impress your audience with awesome content!</p>
-                    </div>
-                </div>
-                
-<!-- InstanceEndEditable -->
-                <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-            </div>
-        </div>
-        <div class="wdn-band wdn-content-slide" id="wdn_optional_footer">
-            <div class="wdn-inner-wrapper">
-                
-<!-- InstanceBeginEditable name="optionalfooter" -->
-                
-<!-- InstanceEndEditable -->
-            </div>
-        </div>
-        <footer id="footer" role="contentinfo" class="wdn-content-slide">
-            <div class="wdn-band" id="wdn_footer_related">
-                <div class="wdn-inner-wrapper">
-                    
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                    <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                    
-<!-- InstanceEndEditable -->
-                </div>
-            </div>
-            <div class="wdn-band">
-                <div class="wdn-inner-wrapper">
-                    <div class="footer_col" id="wdn_footer_contact">
-                        <h3>Contact Us</h3>
-                        <div class="wdn-contact-wrapper">
-                            
-<!-- InstanceBeginEditable name="contactinfo" -->
-                            <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                            
-<!-- InstanceEndEditable -->
-                        </div>
-                    </div>
-                    <div id="wdn_copyright">
-                        <div class="wdn-footer-text">
-                            
-<!-- InstanceBeginEditable name="footercontent" -->
-                            <!--#include virtual="../sharedcode/footer.html" -->
-                            
-<!-- InstanceEndEditable -->
-                            <!--#include virtual="/wdn/templates_4.0/includes/wdn.html" -->
-                        </div>
-                    <!--#include virtual="/wdn/templates_4.0/includes/logos.html" -->
-                    </div>
-                </div>
-            </div>
-            <!--#include virtual="/wdn/templates_4.0/includes/footer_floater.html" -->
-        </footer>
-        <!--#include virtual="/wdn/templates_4.0/includes/noscript.html" -->
-    </div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Unlaffiliate_debug.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Unlaffiliate_debug.tpl
deleted file mode 100644
index 08371ae90ef51277e7e070cbb654711d240214c5..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Unlaffiliate_debug.tpl
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><![endif]-->
-<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate_debug.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
-<head>
-<!--#include virtual="/wdn/templates_4.0/includes/metanfavico.html" -->
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: unlaffiliate_debug.dwt | 1453c8fc0eafda458699fd5676379805da2368cc | Fri Oct 12 13:23:32 2012 -0500 | Seth Meranda  $
--->
-<!--#include virtual="/wdn/templates_4.0/includes/scriptsandstyles_debug.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>Use a descriptive page title | Optional Site Title (use for context) | UNL Affiliate</title>
-<!-- InstanceEndEditable -->
-
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<link rel="stylesheet" type="text/css" media="screen" href="../sharedcode/affiliate.css" />
-<link href="../sharedcode/affiliate_imgs/favicon.ico" rel="shortcut icon" />
-<!-- InstanceEndEditable -->
-<!-- InstanceParam name="class" type="text" value="debug" -->
-</head>
-<body class="@@(_document['class'])@@" data-version="4.0">
-    <!--#include virtual="/wdn/templates_4.0/includes/skipnav.html" -->
-    <div id="wdn_wrapper">
-        <input type="checkbox" id="wdn_menu_toggle" value="Show navigation menu" class="wdn-content-slide wdn-input-driver" />
-        <!--#include virtual="/wdn/templates_4.0/includes/noscript-padding.html" -->
-        <header id="header" role="banner" class="wdn-content-slide wdn-band">
-            <!--#include virtual="/wdn/templates_4.0/includes/wdnResources.html" -->
-            <div class="wdn-inner-wrapper">
-                <!-- InstanceBeginEditable name="sitebranding_logo" -->
-                <div id="logo">
-                    <a href="http://www.throughtheeyes.org/" title="Through the Eyes of the Child Initiative" id="wdn_logo_link">Through the Eyes of the Child Initiative</a>
-                </div>
-                
-<!-- InstanceEndEditable -->
-                <div id="wdn_resources">
-                    <!--#include virtual="/wdn/templates_4.0/includes/idm.html" -->
-                    <!--#include virtual="/wdn/templates_4.0/includes/wdnTools.html" -->
-                </div>
-                <span id="wdn_institution_title"><!-- InstanceBeginEditable name="sitebranding_affiliate" --><a href="http://www.unl.edu" title="University of Nebraska&ndash;Lincoln">An affiliate of the University of Nebraska&ndash;Lincoln</a>
-<!-- InstanceEndEditable -->
-</span>
-            </div>
-            <!--#include virtual="/wdn/templates_4.0/includes/apps.html" -->
-            <div class="wdn-inner-wrapper">
-                <div id="wdn_site_title">
-                    <span>
-<!-- InstanceBeginEditable name="titlegraphic" -->
-The Title of My Site
-<!-- InstanceEndEditable -->
-</span>
-                </div>
-            </div>
-        </header>
-        <div id="wdn_navigation_bar" role="navigation" class="wdn-band">
-            <nav id="breadcrumbs" class="wdn-inner-wrapper">
-                <!-- WDN: see glossary item 'breadcrumbs' -->
-                <h3 class="wdn_list_descriptor wdn-text-hidden">Breadcrumbs</h3>
-                
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-                <ul>
-                    <li><a href="http://www.throughtheeyes.org/" title="Through the Eyes of the Child Initiative">Home</a></li>
-                </ul>
-                
-<!-- InstanceEndEditable -->
-            </nav>
-            <div id="wdn_navigation_wrapper">
-                <nav id="navigation" role="navigation" class="wdn-band">
-                    <h3 class="wdn_list_descriptor wdn-text-hidden">Navigation</h3>
-                    
-<!-- InstanceBeginEditable name="navlinks" -->
-                    <!--#include virtual="../sharedcode/navigation.html" -->
-                    
-<!-- InstanceEndEditable -->
-                    <label for="wdn_menu_toggle" class="wdn-icon-menu">Menu</label>
-                </nav>
-            </div>
-        </div>
-        <!-- Navigation Trigger -->
-        <div class="wdn-menu-trigger wdn-content-slide">
-            <label for="wdn_menu_toggle" class="wdn-icon-menu">Menu</label>
-        </div>
-        <!-- End navigation trigger -->
-        <div id="wdn_content_wrapper" role="main" class="wdn-content-slide">
-            <div class="wdn-band">
-                <div class="wdn-inner-wrapper">
-                    <div id="pagetitle">
-                        
-<!-- InstanceBeginEditable name="pagetitle" -->
-                        <h1>Please Title Your Page Here</h1>
-                        
-<!-- InstanceEndEditable -->
-                    </div>
-                </div>
-            </div>
-            <div id="maincontent" class="wdn-main">
-                <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-                
-<!-- InstanceBeginEditable name="maincontentarea" -->
-                <div class="wdn-band">
-                    <div class="wdn-inner-wrapper">
-                        <p>Impress your audience with awesome content!</p>
-                    </div>
-                </div>
-                
-<!-- InstanceEndEditable -->
-                <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-            </div>
-        </div>
-        <div class="wdn-band wdn-content-slide" id="wdn_optional_footer">
-            <div class="wdn-inner-wrapper">
-                
-<!-- InstanceBeginEditable name="optionalfooter" -->
-                
-<!-- InstanceEndEditable -->
-            </div>
-        </div>
-        <footer id="footer" role="contentinfo" class="wdn-content-slide">
-            <div class="wdn-band" id="wdn_footer_related">
-                <div class="wdn-inner-wrapper">
-                    
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                    <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                    
-<!-- InstanceEndEditable -->
-                </div>
-            </div>
-            <div class="wdn-band">
-                <div class="wdn-inner-wrapper">
-                    <div class="footer_col" id="wdn_footer_contact">
-                        <h3>Contact Us</h3>
-                        <div class="wdn-contact-wrapper">
-                            
-<!-- InstanceBeginEditable name="contactinfo" -->
-                            <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                            
-<!-- InstanceEndEditable -->
-                        </div>
-                    </div>
-                    <div id="wdn_copyright">
-                        <div class="wdn-footer-text">
-                            
-<!-- InstanceBeginEditable name="footercontent" -->
-                            <!--#include virtual="../sharedcode/footer.html" -->
-                            
-<!-- InstanceEndEditable -->
-                            <!--#include virtual="/wdn/templates_4.0/includes/wdn.html" -->
-                        </div>
-                    <!--#include virtual="/wdn/templates_4.0/includes/logos.html" -->
-                    </div>
-                </div>
-            </div>
-            <!--#include virtual="/wdn/templates_4.0/includes/footer_floater.html" -->
-        </footer>
-        <!--#include virtual="/wdn/templates_4.0/includes/noscript.html" -->
-    </div>
-</body>
-</html>
diff --git a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Unlaffiliate_local.tpl b/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Unlaffiliate_local.tpl
deleted file mode 100644
index 2328632d3a0d8449110e9c575ec3628de832fd4b..0000000000000000000000000000000000000000
--- a/lib/data/pear.unl.edu/UNL_Templates/tpl_cache/Version4/Unlaffiliate_local.tpl
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><![endif]-->
-<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate_local.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
-<head>
-<!--#include virtual="/wdn/templates_4.0/includes/metanfavico.html" -->
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: unlaffiliate_local.dwt | 1453c8fc0eafda458699fd5676379805da2368cc | Fri Oct 12 13:23:32 2012 -0500 | Seth Meranda  $
--->
-<!--#include virtual="/wdn/templates_4.0/includes/scriptsandstyles_local.html" -->
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>Use a descriptive page title | Optional Site Title (use for context) | UNL Affiliate</title>
-<!-- InstanceEndEditable -->
-
-<!-- InstanceBeginEditable name="head" -->
-<!-- Place optional header elements here -->
-<link rel="stylesheet" type="text/css" media="screen" href="../sharedcode/affiliate.css" />
-<link href="../sharedcode/affiliate_imgs/favicon.ico" rel="shortcut icon" />
-<!-- InstanceEndEditable -->
-<!-- InstanceParam name="class" type="text" value="" -->
-</head>
-<body class="@@(_document['class'])@@" data-version="4.0">
-    <!--#include virtual="/wdn/templates_4.0/includes/skipnav.html" -->
-    <div id="wdn_wrapper">
-        <input type="checkbox" id="wdn_menu_toggle" value="Show navigation menu" class="wdn-content-slide wdn-input-driver" />
-        <!--#include virtual="/wdn/templates_4.0/includes/noscript-padding.html" -->
-        <header id="header" role="banner" class="wdn-content-slide wdn-band">
-            <!--#include virtual="/wdn/templates_4.0/includes/wdnResources.html" -->
-            <div class="wdn-inner-wrapper">
-                <!-- InstanceBeginEditable name="sitebranding_logo" -->
-                <div id="logo">
-                    <a href="http://www.throughtheeyes.org/" title="Through the Eyes of the Child Initiative" id="wdn_logo_link">Through the Eyes of the Child Initiative</a>
-                </div>
-                
-<!-- InstanceEndEditable -->
-                <div id="wdn_resources">
-                    <!--#include virtual="/wdn/templates_4.0/includes/idm.html" -->
-                    <!--#include virtual="/wdn/templates_4.0/includes/wdnTools.html" -->
-                </div>
-                <span id="wdn_institution_title"><!-- InstanceBeginEditable name="sitebranding_affiliate" --><a href="http://www.unl.edu" title="University of Nebraska&ndash;Lincoln">An affiliate of the University of Nebraska&ndash;Lincoln</a>
-<!-- InstanceEndEditable -->
-</span>
-            </div>
-            <!--#include virtual="/wdn/templates_4.0/includes/apps.html" -->
-            <div class="wdn-inner-wrapper">
-                <div id="wdn_site_title">
-                    <span>
-<!-- InstanceBeginEditable name="titlegraphic" -->
-The Title of My Site
-<!-- InstanceEndEditable -->
-</span>
-                </div>
-            </div>
-        </header>
-        <div id="wdn_navigation_bar" role="navigation" class="wdn-band">
-            <nav id="breadcrumbs" class="wdn-inner-wrapper">
-                <!-- WDN: see glossary item 'breadcrumbs' -->
-                <h3 class="wdn_list_descriptor wdn-text-hidden">Breadcrumbs</h3>
-                
-<!-- InstanceBeginEditable name="breadcrumbs" -->
-                <ul>
-                    <li><a href="http://www.throughtheeyes.org/" title="Through the Eyes of the Child Initiative">Home</a></li>
-                </ul>
-                
-<!-- InstanceEndEditable -->
-            </nav>
-            <div id="wdn_navigation_wrapper">
-                <nav id="navigation" role="navigation" class="wdn-band">
-                    <h3 class="wdn_list_descriptor wdn-text-hidden">Navigation</h3>
-                    
-<!-- InstanceBeginEditable name="navlinks" -->
-                    <!--#include virtual="../sharedcode/navigation.html" -->
-                    
-<!-- InstanceEndEditable -->
-                    <label for="wdn_menu_toggle" class="wdn-icon-menu">Menu</label>
-                </nav>
-            </div>
-        </div>
-        <!-- Navigation Trigger -->
-        <div class="wdn-menu-trigger wdn-content-slide">
-            <label for="wdn_menu_toggle" class="wdn-icon-menu">Menu</label>
-        </div>
-        <!-- End navigation trigger -->
-        <div id="wdn_content_wrapper" role="main" class="wdn-content-slide">
-            <div class="wdn-band">
-                <div class="wdn-inner-wrapper">
-                    <div id="pagetitle">
-                        
-<!-- InstanceBeginEditable name="pagetitle" -->
-                        <h1>Please Title Your Page Here</h1>
-                        
-<!-- InstanceEndEditable -->
-                    </div>
-                </div>
-            </div>
-            <div id="maincontent" class="wdn-main">
-                <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-                
-<!-- InstanceBeginEditable name="maincontentarea" -->
-                <div class="wdn-band">
-                    <div class="wdn-inner-wrapper">
-                        <p>Impress your audience with awesome content!</p>
-                    </div>
-                </div>
-                
-<!-- InstanceEndEditable -->
-                <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-            </div>
-        </div>
-        <div class="wdn-band wdn-content-slide" id="wdn_optional_footer">
-            <div class="wdn-inner-wrapper">
-                
-<!-- InstanceBeginEditable name="optionalfooter" -->
-                
-<!-- InstanceEndEditable -->
-            </div>
-        </div>
-        <footer id="footer" role="contentinfo" class="wdn-content-slide">
-            <div class="wdn-band" id="wdn_footer_related">
-                <div class="wdn-inner-wrapper">
-                    
-<!-- InstanceBeginEditable name="leftcollinks" -->
-                    <!--#include virtual="../sharedcode/relatedLinks.html" -->
-                    
-<!-- InstanceEndEditable -->
-                </div>
-            </div>
-            <div class="wdn-band">
-                <div class="wdn-inner-wrapper">
-                    <div class="footer_col" id="wdn_footer_contact">
-                        <h3>Contact Us</h3>
-                        <div class="wdn-contact-wrapper">
-                            
-<!-- InstanceBeginEditable name="contactinfo" -->
-                            <!--#include virtual="../sharedcode/footerContactInfo.html" -->
-                            
-<!-- InstanceEndEditable -->
-                        </div>
-                    </div>
-                    <div id="wdn_copyright">
-                        <div class="wdn-footer-text">
-                            
-<!-- InstanceBeginEditable name="footercontent" -->
-                            <!--#include virtual="../sharedcode/footer.html" -->
-                            
-<!-- InstanceEndEditable -->
-                            <!--#include virtual="/wdn/templates_4.0/includes/wdn.html" -->
-                        </div>
-                    <!--#include virtual="/wdn/templates_4.0/includes/logos.html" -->
-                    </div>
-                </div>
-            </div>
-            <!--#include virtual="/wdn/templates_4.0/includes/footer_floater.html" -->
-        </footer>
-        <!--#include virtual="/wdn/templates_4.0/includes/noscript.html" -->
-    </div>
-</body>
-</html>
diff --git a/lib/docs/UNL_Cache_Lite/docs/examples b/lib/docs/UNL_Cache_Lite/docs/examples
deleted file mode 100644
index ab0a2d19b027e2f27f163d36877242e2d91f1606..0000000000000000000000000000000000000000
--- a/lib/docs/UNL_Cache_Lite/docs/examples
+++ /dev/null
@@ -1,254 +0,0 @@
-A few examples of Cache_Lite using :
-------------------------------------
-
->>> Basic one :
-
-<?php
-
-// Include the package
-require_once('Cache/Lite.php');
-
-// Set a id for this cache
-$id = '123';
-
-// Set a few options
-$options = array(
-    'cacheDir' => '/tmp/',
-    'lifeTime' => 3600
-);
-
-// Create a Cache_Lite object
-$Cache_Lite = new Cache_Lite($options);
-
-// Test if thereis a valide cache for this id
-if ($data = $Cache_Lite->get($id)) {
-
-    // Cache hit !
-    // Content is in $data
-    // (...)
-
-} else { // No valid cache found (you have to make the page)
-
-    // Cache miss !
-    // Put in $data datas to put in cache
-    // (...)
-    $Cache_Lite->save($data);
-
-}
-
-?>
-
-
->>> Usage with blocks
-(You can use Cache_Lite for caching blocks and not the whole page)
-
-<?php
-
-require_once('Cache/Lite.php');
-
-$options = array(
-    'cacheDir' => '/tmp/',
-    'lifeTime' => 3600
-);
-
-// Create a Cache_Lite object
-$Cache_Lite = new Cache_Lite($options);
-
-if ($data = $Cache_Lite->get('block1')) {
-    echo($data);
-} else { 
-    $data = 'Data of the block 1';
-    $Cache_Lite->save($data);
-}
-
-echo('<br><br>Non cached line !<br><br>');
-
-if ($data = $Cache_Lite->get('block2')) {
-    echo($data);
-} else { 
-    $data = 'Data of the block 2';
-    $Cache_Lite->save($data);
-}
-
-?>
-
-
-A few examples of Cache_Lite_Output using :
--------------------------------------------
-
->>> Basic one :
-
-<?php
-
-require_once('Cache/Lite/Output.php');
-
-$options = array(
-    'cacheDir' => '/tmp/',
-    'lifeTime' => 10
-);
-
-$cache = new Cache_Lite_Output($options);
-
-if (!($cache->start('123'))) {
-    // Cache missed...
-    for($i=0;$i<1000;$i++) { // Making of the page...
-        echo('0123456789');
-    }
-    $cache->end();
-}
-
-?>
-
->>> Usage with blocks :
-(You can use Cache_Lite_Output for caching blocks and not the whole page)
-
-<?php
-
-require_once('Cache/Lite/Output.php');
-
-$options = array(
-    'cacheDir' => '/tmp/',
-    'lifeTime' => 10
-);
-
-$cache = new Cache_Lite_Output($options);
-
-if (!($cache->start('block1'))) {
-    // Cache missed...
-    echo('Data of the block 1 !<br>');
-    $cache->end();
-}
-
-echo('<br><br>Non cached line !<br><br>');
-
-if (!($cache->start('block2'))) {
-    // Cache missed...
-    echo('Data of the block 2 !<br>');
-    $cache->end();
-}
-
-
-A few examples of Cache_Lite_Function using :
----------------------------------------------
-
->>> With function :
-
-<?php
-
-require_once('Cache/Lite/Function.php');
-
-$options = array(
-    'cacheDir' => '/tmp/',
-    'lifeTime' => 10
-);
-
-$cache = new Cache_Lite_Function($options);
-
-$cache->call('function_to_bench', 12, 45);
-
-function function_to_bench($arg1, $arg2) 
-{
-    echo "This is the output of the function function_to_bench($arg1, $arg2) !<br>";
-    return "This is the result of the function function_to_bench($arg1, $arg2) !<br>";
-}
-
-?>
-
->>> With method :
-
-<?php
-
-require_once('Cache/Lite/Function.php');
-
-$options = array(
-    'cacheDir' => '/tmp/',
-    'lifeTime' => 10
-);
-
-$cache = new Cache_Lite_Function($options);
-
-$obj = new bench();
-$obj->test = 666;
-
-$cache->call('obj->method_to_bench', 12, 45);
-
-class bench
-{
-    var $test;
-
-    function method_to_bench($arg1, $arg2)
-    {
-        echo "\$obj->test = $this->test and this is the output of the method \$obj->method_to_bench($arg1, $arg2) !<br>";
-        return "\$obj->test = $this->test and this is the result of the method \$obj->method_to_bench($arg1, $arg2) !<br>";        
-    }
-    
-}
-
-?>
-
->>> With static method :
-
-<?php
-
-require_once('Cache/Lite/Function.php');
-
-$options = array(
-    'cacheDir' => '/tmp/',
-    'lifeTime' => 10
-);
-
-$cache = new Cache_Lite_Function($options);
-
-$cache->call('bench::static_method_to_bench', 12, 45);
-
-class bench
-{
-    var $test;
-
-    function static_method_to_bench($arg1, $arg2) {
-        echo "This is the output of the function static_method_to_bench($arg1, $arg2) !<br>";
-        return "This is the result of the function static_method_to_bench($arg1, $arg2) !<br>";
-    }
-}
-
-?>
-
->>> IMPORTANT :
-
-If you try to use Cache_Lite_Function with $this object ($cache->call('this->method',...) 
-for example), have a look first at :
-
-http://pear.php.net/bugs/bug.php?id=660
-
-
-A few examples of Cache_Lite_File using :
------------------------------------------
-
-<?php
-
-$options = array(
-    'cacheDir' => '/tmp/',
-    'masterFile' => '/home/web/config.xml'
-);
-$cache = new Cache_Lite_File($options);
-
-// Set a id for this cache
-$id = '123';
-
-if ($data = $cache->get($id)) {
-
-    // Cache hit !
-    // Content is in $data
-    // (...)
-
-} else { // No valid cache found (you have to make the page)
-
-    // Cache miss !
-    // Put in $data datas to put in cache
-    // (...)
-    $cache->save($data);
-
-}
-
-
-?>
diff --git a/lib/docs/UNL_Cache_Lite/docs/technical b/lib/docs/UNL_Cache_Lite/docs/technical
deleted file mode 100644
index 790696c87ec096663cf7133a05f981d19c0b6d58..0000000000000000000000000000000000000000
--- a/lib/docs/UNL_Cache_Lite/docs/technical
+++ /dev/null
@@ -1,28 +0,0 @@
-Technical choices for Cache_Lite...
------------------------------------
-
-To begin, the main goals of Cache_Lite :
-- performances
-- safe use (even on very high traffic or with NFS (file locking doesn't work
-            with NFS))
-- flexibility (can be used by the end user or as a part of a larger script)
-
-
-For speed reasons, it has been decided to focus on the file container (the 
-faster one). So, cache is only stored in files. The class is optimized for that. 
-If you want to use a different cache container, have a look to PEAR/Cache.
-
-For speed reasons too, the class 'Cache_Lite' has do be independant (so no 
-'require_once' at all in 'Cache_Lite.php'). But, a conditional include_once
-is allowed. For example, when an error is detected, the class include dynamicaly
-the PEAR base class 'PEAR.php' to be able to use PEAR::raiseError(). But, in
-most cases, PEAR.php isn't included.
-
-For the second goal (safe use), there is three (optional) mecanisms :
-- File Locking : seems to work fine (but not with distributed file system
-                 like NFS...)
-- WriteControl : the cache is read and compared just after being stored
-                 (efficient but not perfect)
-- ReadControl : a control key (crc32(), md5() ou strlen()) is embeded is the 
-                cache file and compared just after reading (the most efficient
-                but the slowest)
diff --git a/lib/docs/UNL_DWT/docs/examples/Template_style1.php b/lib/docs/UNL_DWT/docs/examples/Template_style1.php
deleted file mode 100644
index 69514f230bf152a46ef0f78f1341cd90657de011..0000000000000000000000000000000000000000
--- a/lib/docs/UNL_DWT/docs/examples/Template_style1.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Template Definition for template_style1.dwt
- */
-require_once 'UNL/DWT.php';
-
-class UNL_DWT_Template_style1 extends UNL_DWT 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    var $__template = 'Template_style1.tpl';                                // template name
-    var $doctitle = "<title>Sample Template Style 1</title>";                       // string()  
-    var $head = "";                           // string()  
-    var $header = "Header";                         // string()  
-    var $leftnav = "<p> Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut. </p>";                        // string()  
-    var $content = "<h2>Subheading</h2> <p> Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. </p> <p> Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. </p>";                        // string()  
-    var $footer = "Footer";                         // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_DWT_Template_style1',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/docs/UNL_DWT/docs/examples/Template_style1.tpl b/lib/docs/UNL_DWT/docs/examples/Template_style1.tpl
deleted file mode 100644
index bd63d0408c2fdc1289ca180fdf4a09a0b64c069b..0000000000000000000000000000000000000000
--- a/lib/docs/UNL_DWT/docs/examples/Template_style1.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><!-- InstanceBegin template="/Templates/template_style1.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>Sample Template Style 1</title>
-<!-- InstanceEndEditable -->
-<style type="text/css">
-#container
-{
-width: 90%;
-margin: 10px auto;
-background-color: #fff;
-color: #333;
-border: 1px solid gray;
-line-height: 130%;
-}
-#top
-{
-padding: .5em;
-background-color: #ddd;
-border-bottom: 1px solid gray;
-}
-#top h1
-{
-padding: 0;
-margin: 0;
-}
-#leftnav
-{
-float: left;
-width: 160px;
-margin: 0;
-padding: 1em;
-}
-#content
-{
-margin-left: 200px;
-border-left: 1px solid gray;
-padding: 1em;
-max-width: 36em;
-}
-#footer
-{
-clear: both;
-margin: 0;
-padding: .5em;
-color: #333;
-background-color: #ddd;
-border-top: 1px solid gray;
-}
-#leftnav p { margin: 0 0 1em 0; }
-#content h2 { margin: 0 0 .5em 0; }
-</style>
-<!-- InstanceBeginEditable name="head" -->
-<!-- InstanceEndEditable -->
-</head>
-<body>
-<div id="container">
-<div id="top">
-<h1>
-<!-- InstanceBeginEditable name="header" -->
-Header
-<!-- InstanceEndEditable -->
-</h1>
-</div>
-<div id="leftnav">
-<!-- InstanceBeginEditable name="leftnav" -->
-    <p> Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut. </p>
-<!-- InstanceEndEditable -->
-</div>
-<div id="content">
-<!-- InstanceBeginEditable name="content" -->
-    <h2>Subheading</h2>
-    <p> Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. </p>
-    <p> Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. </p>
-<!-- InstanceEndEditable -->
-</div>
-<div id="footer">
-<!-- InstanceBeginEditable name="footer" -->
-Footer
-<!-- InstanceEndEditable -->
-</div>
-</div>
-</body>
-</html>
diff --git a/lib/docs/UNL_DWT/docs/examples/example.ini b/lib/docs/UNL_DWT/docs/examples/example.ini
deleted file mode 100644
index 4efad9b767880acf6ce6881e249a465ce184eec4..0000000000000000000000000000000000000000
--- a/lib/docs/UNL_DWT/docs/examples/example.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[UNL_DWT]
-dwt_location    = /Users/bbieber/Documents/workspace/UNL_Search/trunk/lib/docs/UNL_DWT/docs/examples/
-class_location  = /Users/bbieber/Documents/workspace/UNL_Search/trunk/lib/docs/UNL_DWT/docs/examples/
-tpl_location	= /Users/bbieber/Documents/workspace/UNL_Search/trunk/lib/docs/UNL_DWT/docs/examples/
-class_prefix    = UNL_DWT_
\ No newline at end of file
diff --git a/lib/docs/UNL_DWT/docs/examples/example_style1.php b/lib/docs/UNL_DWT/docs/examples/example_style1.php
deleted file mode 100644
index d99f48f9cd8fa908ad97d659d775249305faa0ea..0000000000000000000000000000000000000000
--- a/lib/docs/UNL_DWT/docs/examples/example_style1.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * This example uses the DWT object generated by: '/usr/local/bin/php /Users/bbieber/Documents/workspace/UNL_Search/trunk/lib/php/UNL/DWT/createTemplates.php /Users/bbieber/Documents/workspace/UNL_Search/trunk/lib/docs/UNL_DWT/docs/examples/example.ini'
- * 
- */
-ini_set('display_errors',true);
-error_reporting(E_ALL|E_STRICT);
-
-require_once 'UNL/DWT.php';
-if ('/Users/bbieber/Documents/workspace/UNL_Search/trunk/lib/data' == '@'.'DATA_DIR@') {
-    $configfile = 'example.test.ini';
-} else {
-    $configfile = '/Users/bbieber/Documents/workspace/UNL_Search/trunk/lib/docs/UNL_DWT/docs/examples/example.ini';
-}
-$config = parse_ini_file($configfile, true);
-foreach($config as $class=>$values) {
-   UNL_DWT::$options = $values;
-}
-$page = UNL_DWT::factory('Template_style1');
-$page->header  = "Example Using Template Style 1";
-$page->leftnav = "<ul><li><a href='http://pear.unl.edu/'>UNL PEAR Channel</a></li></ul>";
-$page->content = "<p>This example demonstrates the usefulness of the DWT object generator for Dreamweaver Templates.</p>";
-$page->content .= "<p>Included with the DWT package is a Dreamweaver template with 4 editable regions [template_style1.dwt]. This page is rendered using the DWT class created from that template.</p>";
-$page->content .= "<p>To create classes for your Templates, create a .ini file with the location of your Dreamweaver templates (dwt's) and then run the createTemplates.php script to generate objects for each of your template files.</p>";
-$page->content .= "<p>Here is the ini file used to create the Template_style1:<pre><code>".file_get_contents($configfile)."</code></pre></p>";
-$page->content .= "<p>And the command used to create the template classes:<pre><code>/usr/local/bin/php /Users/bbieber/Documents/workspace/UNL_Search/trunk/lib/php/UNL/DWT/createTemplates.php /Users/bbieber/Documents/workspace/UNL_Search/trunk/lib/docs/UNL_DWT/docs/examples/example.ini</code></pre></p>";
-$page->footer  = "<a href='mailto:brett.bieber@gmail.com'>Brett Bieber</a>";
-echo $page->toHtml();
\ No newline at end of file
diff --git a/lib/docs/UNL_DWT/docs/examples/scanner_example.php b/lib/docs/UNL_DWT/docs/examples/scanner_example.php
deleted file mode 100644
index c0ba19014a1b6cbe7ff14b1b150e2fa916c00504..0000000000000000000000000000000000000000
--- a/lib/docs/UNL_DWT/docs/examples/scanner_example.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-require_once 'UNL/DWT/Scanner.php';
-
-$file = file_get_contents(dirname(__FILE__).'/'.'template_style1.dwt');
-
-$scanned = new UNL_DWT_Scanner($file);
-
-echo $scanned->leftnav;
-echo $scanned->content;
-
-?>
\ No newline at end of file
diff --git a/lib/docs/UNL_DWT/docs/examples/template_style1.dwt b/lib/docs/UNL_DWT/docs/examples/template_style1.dwt
deleted file mode 100644
index f22ce6abf12031903536a83ed335547cd9044b28..0000000000000000000000000000000000000000
--- a/lib/docs/UNL_DWT/docs/examples/template_style1.dwt
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<!-- TemplateBeginEditable name="doctitle" -->
-<title>Sample Template Style 1</title>
-<!-- TemplateEndEditable -->
-<style type="text/css">
-#container
-{
-width: 90%;
-margin: 10px auto;
-background-color: #fff;
-color: #333;
-border: 1px solid gray;
-line-height: 130%;
-}
-
-#top
-{
-padding: .5em;
-background-color: #ddd;
-border-bottom: 1px solid gray;
-}
-
-#top h1
-{
-padding: 0;
-margin: 0;
-}
-
-#leftnav
-{
-float: left;
-width: 160px;
-margin: 0;
-padding: 1em;
-}
-
-#content
-{
-margin-left: 200px;
-border-left: 1px solid gray;
-padding: 1em;
-max-width: 36em;
-}
-
-#footer
-{
-clear: both;
-margin: 0;
-padding: .5em;
-color: #333;
-background-color: #ddd;
-border-top: 1px solid gray;
-}
-
-#leftnav p { margin: 0 0 1em 0; }
-#content h2 { margin: 0 0 .5em 0; }
-</style>
-<!-- TemplateBeginEditable name="head" --><!-- TemplateEndEditable -->
-</head>
-
-<body>
-<div id="container">
-<div id="top">
-<h1><!-- TemplateBeginEditable name="header" -->Header<!-- TemplateEndEditable --></h1>
-</div>
-<div id="leftnav"><!-- TemplateBeginEditable name="leftnav" -->
-    <p> Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut. </p>
-<!-- TemplateEndEditable --></div>
-<div id="content"><!-- TemplateBeginEditable name="content" -->
-    <h2>Subheading</h2>
-    <p> Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. </p>
-    <p> Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. </p>
-<!-- TemplateEndEditable --></div>
-<div id="footer"><!-- TemplateBeginEditable name="footer" -->Footer<!-- TemplateEndEditable --></div>
-</div>
-</body>
-</html>
diff --git a/lib/docs/pear.unl.edu/UNL_DWT/examples/Template_style1.php b/lib/docs/pear.unl.edu/UNL_DWT/examples/Template_style1.php
deleted file mode 100644
index 69514f230bf152a46ef0f78f1341cd90657de011..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_DWT/examples/Template_style1.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Template Definition for template_style1.dwt
- */
-require_once 'UNL/DWT.php';
-
-class UNL_DWT_Template_style1 extends UNL_DWT 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    var $__template = 'Template_style1.tpl';                                // template name
-    var $doctitle = "<title>Sample Template Style 1</title>";                       // string()  
-    var $head = "";                           // string()  
-    var $header = "Header";                         // string()  
-    var $leftnav = "<p> Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut. </p>";                        // string()  
-    var $content = "<h2>Subheading</h2> <p> Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. </p> <p> Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. </p>";                        // string()  
-    var $footer = "Footer";                         // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_DWT_Template_style1',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/docs/pear.unl.edu/UNL_DWT/examples/Template_style1.tpl b/lib/docs/pear.unl.edu/UNL_DWT/examples/Template_style1.tpl
deleted file mode 100644
index bd63d0408c2fdc1289ca180fdf4a09a0b64c069b..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_DWT/examples/Template_style1.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><!-- InstanceBegin template="/Templates/template_style1.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>Sample Template Style 1</title>
-<!-- InstanceEndEditable -->
-<style type="text/css">
-#container
-{
-width: 90%;
-margin: 10px auto;
-background-color: #fff;
-color: #333;
-border: 1px solid gray;
-line-height: 130%;
-}
-#top
-{
-padding: .5em;
-background-color: #ddd;
-border-bottom: 1px solid gray;
-}
-#top h1
-{
-padding: 0;
-margin: 0;
-}
-#leftnav
-{
-float: left;
-width: 160px;
-margin: 0;
-padding: 1em;
-}
-#content
-{
-margin-left: 200px;
-border-left: 1px solid gray;
-padding: 1em;
-max-width: 36em;
-}
-#footer
-{
-clear: both;
-margin: 0;
-padding: .5em;
-color: #333;
-background-color: #ddd;
-border-top: 1px solid gray;
-}
-#leftnav p { margin: 0 0 1em 0; }
-#content h2 { margin: 0 0 .5em 0; }
-</style>
-<!-- InstanceBeginEditable name="head" -->
-<!-- InstanceEndEditable -->
-</head>
-<body>
-<div id="container">
-<div id="top">
-<h1>
-<!-- InstanceBeginEditable name="header" -->
-Header
-<!-- InstanceEndEditable -->
-</h1>
-</div>
-<div id="leftnav">
-<!-- InstanceBeginEditable name="leftnav" -->
-    <p> Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut. </p>
-<!-- InstanceEndEditable -->
-</div>
-<div id="content">
-<!-- InstanceBeginEditable name="content" -->
-    <h2>Subheading</h2>
-    <p> Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. </p>
-    <p> Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. </p>
-<!-- InstanceEndEditable -->
-</div>
-<div id="footer">
-<!-- InstanceBeginEditable name="footer" -->
-Footer
-<!-- InstanceEndEditable -->
-</div>
-</div>
-</body>
-</html>
diff --git a/lib/docs/pear.unl.edu/UNL_DWT/examples/basic/Template_style1.php b/lib/docs/pear.unl.edu/UNL_DWT/examples/basic/Template_style1.php
deleted file mode 100644
index 539fb44c98acddb65482a39a24383eba3a2de80f..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_DWT/examples/basic/Template_style1.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Template Definition for template_style1.dwt
- */
-require_once 'UNL/DWT.php';
-
-class UNL_DWT_Template_style1 extends UNL_DWT 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Template_style1.tpl';             // template name
-    public $doctitle = "<title>Sample Template Style 1</title>";                       // string()  
-    public $head = "";                           // string()  
-    public $header = "Header";                         // string()  
-    public $leftnav = "<p> Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut. </p>";                        // string()  
-    public $content = "<h2>Subheading</h2> <p> Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. </p> <p> Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. </p>";                        // string()  
-    public $footer = "Footer";                         // string()  
-
-    public $__params = array (
-);
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_DWT_Template_style1',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/docs/pear.unl.edu/UNL_DWT/examples/basic/Template_style1.tpl b/lib/docs/pear.unl.edu/UNL_DWT/examples/basic/Template_style1.tpl
deleted file mode 100644
index bd63d0408c2fdc1289ca180fdf4a09a0b64c069b..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_DWT/examples/basic/Template_style1.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><!-- InstanceBegin template="/Templates/template_style1.dwt" codeOutsideHTMLIsLocked="false" -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>Sample Template Style 1</title>
-<!-- InstanceEndEditable -->
-<style type="text/css">
-#container
-{
-width: 90%;
-margin: 10px auto;
-background-color: #fff;
-color: #333;
-border: 1px solid gray;
-line-height: 130%;
-}
-#top
-{
-padding: .5em;
-background-color: #ddd;
-border-bottom: 1px solid gray;
-}
-#top h1
-{
-padding: 0;
-margin: 0;
-}
-#leftnav
-{
-float: left;
-width: 160px;
-margin: 0;
-padding: 1em;
-}
-#content
-{
-margin-left: 200px;
-border-left: 1px solid gray;
-padding: 1em;
-max-width: 36em;
-}
-#footer
-{
-clear: both;
-margin: 0;
-padding: .5em;
-color: #333;
-background-color: #ddd;
-border-top: 1px solid gray;
-}
-#leftnav p { margin: 0 0 1em 0; }
-#content h2 { margin: 0 0 .5em 0; }
-</style>
-<!-- InstanceBeginEditable name="head" -->
-<!-- InstanceEndEditable -->
-</head>
-<body>
-<div id="container">
-<div id="top">
-<h1>
-<!-- InstanceBeginEditable name="header" -->
-Header
-<!-- InstanceEndEditable -->
-</h1>
-</div>
-<div id="leftnav">
-<!-- InstanceBeginEditable name="leftnav" -->
-    <p> Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut. </p>
-<!-- InstanceEndEditable -->
-</div>
-<div id="content">
-<!-- InstanceBeginEditable name="content" -->
-    <h2>Subheading</h2>
-    <p> Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. </p>
-    <p> Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. </p>
-<!-- InstanceEndEditable -->
-</div>
-<div id="footer">
-<!-- InstanceBeginEditable name="footer" -->
-Footer
-<!-- InstanceEndEditable -->
-</div>
-</div>
-</body>
-</html>
diff --git a/lib/docs/pear.unl.edu/UNL_DWT/examples/basic/example.ini b/lib/docs/pear.unl.edu/UNL_DWT/examples/basic/example.ini
deleted file mode 100644
index 7c1426b6362ac73fbf4fd9e084c6022bd378308d..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_DWT/examples/basic/example.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[UNL_DWT]
-dwt_location    = @DOC_DIR@/UNL_DWT/docs/examples/basic
-class_location  = @DOC_DIR@/UNL_DWT/docs/examples/basic
-tpl_location	= @DOC_DIR@/UNL_DWT/docs/examples/basic
-class_prefix    = UNL_DWT_
diff --git a/lib/docs/pear.unl.edu/UNL_DWT/examples/basic/example.test.ini b/lib/docs/pear.unl.edu/UNL_DWT/examples/basic/example.test.ini
deleted file mode 100644
index 6f24a0b77b8e13197c9649c42aa2139a647de3fc..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_DWT/examples/basic/example.test.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[UNL_DWT]
-dwt_location    = ./
-class_location  = ./
-tpl_location	= ./
-class_prefix    = UNL_DWT_
\ No newline at end of file
diff --git a/lib/docs/pear.unl.edu/UNL_DWT/examples/basic/example_style1.php b/lib/docs/pear.unl.edu/UNL_DWT/examples/basic/example_style1.php
deleted file mode 100644
index 30f50bc36d93c19b73962d666abeab6c78b0e1dc..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_DWT/examples/basic/example_style1.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * This example uses the DWT object generated by: '@PHP_BIN@ @PHP_DIR@/UNL/DWT/createTemplates.php @DOC_DIR@/UNL_DWT/docs/examples/basic/example.ini'
- *
- */
-ini_set('display_errors',true);
-error_reporting(E_ALL|E_STRICT);
-
-set_include_path(dirname(__DIR__).'/../../src');
-
-require_once 'UNL/DWT.php';
-if ('@DATA_DIR@' == '@'.'DATA_DIR@') {
-    $configfile = 'example.test.ini';
-} else {
-    $configfile = '@DOC_DIR@/UNL_DWT/docs/examples/example.ini';
-}
-$config = parse_ini_file($configfile, true);
-foreach($config as $class=>$values) {
-   UNL_DWT::$options = $values;
-}
-$page = UNL_DWT::factory('Template_style1');
-$page->header  = "Example Using Template Style 1";
-$page->leftnav = "<ul><li><a href='http://pear.unl.edu/'>UNL PEAR Channel</a></li></ul>";
-$page->content = "<p>This example demonstrates the usefulness of the DWT object generator for Dreamweaver Templates.</p>";
-$page->content .= "<p>Included with the DWT package is a Dreamweaver template with 4 editable regions [template_style1.dwt]. This page is rendered using the DWT class created from that template.</p>";
-$page->content .= "<p>To create classes for your Templates, create a .ini file with the location of your Dreamweaver templates (dwt's) and then run the createTemplates.php script to generate objects for each of your template files.</p>";
-$page->content .= "<p>Here is the ini file used to create the Template_style1:<pre><code>".file_get_contents($configfile)."</code></pre></p>";
-$page->content .= "<p>And the command used to create the template classes:<pre><code>@PHP_BIN@ @PHP_DIR@/UNL/DWT/createTemplates.php @DOC_DIR@/UNL_DWT/docs/examples/example.ini</code></pre></p>";
-$page->footer  = "<a href='mailto:brett.bieber@gmail.com'>Brett Bieber</a>";
-echo $page->toHtml();
diff --git a/lib/docs/pear.unl.edu/UNL_DWT/examples/basic/template_style1.dwt b/lib/docs/pear.unl.edu/UNL_DWT/examples/basic/template_style1.dwt
deleted file mode 100644
index f22ce6abf12031903536a83ed335547cd9044b28..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_DWT/examples/basic/template_style1.dwt
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<!-- TemplateBeginEditable name="doctitle" -->
-<title>Sample Template Style 1</title>
-<!-- TemplateEndEditable -->
-<style type="text/css">
-#container
-{
-width: 90%;
-margin: 10px auto;
-background-color: #fff;
-color: #333;
-border: 1px solid gray;
-line-height: 130%;
-}
-
-#top
-{
-padding: .5em;
-background-color: #ddd;
-border-bottom: 1px solid gray;
-}
-
-#top h1
-{
-padding: 0;
-margin: 0;
-}
-
-#leftnav
-{
-float: left;
-width: 160px;
-margin: 0;
-padding: 1em;
-}
-
-#content
-{
-margin-left: 200px;
-border-left: 1px solid gray;
-padding: 1em;
-max-width: 36em;
-}
-
-#footer
-{
-clear: both;
-margin: 0;
-padding: .5em;
-color: #333;
-background-color: #ddd;
-border-top: 1px solid gray;
-}
-
-#leftnav p { margin: 0 0 1em 0; }
-#content h2 { margin: 0 0 .5em 0; }
-</style>
-<!-- TemplateBeginEditable name="head" --><!-- TemplateEndEditable -->
-</head>
-
-<body>
-<div id="container">
-<div id="top">
-<h1><!-- TemplateBeginEditable name="header" -->Header<!-- TemplateEndEditable --></h1>
-</div>
-<div id="leftnav"><!-- TemplateBeginEditable name="leftnav" -->
-    <p> Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut. </p>
-<!-- TemplateEndEditable --></div>
-<div id="content"><!-- TemplateBeginEditable name="content" -->
-    <h2>Subheading</h2>
-    <p> Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. </p>
-    <p> Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. </p>
-<!-- TemplateEndEditable --></div>
-<div id="footer"><!-- TemplateBeginEditable name="footer" -->Footer<!-- TemplateEndEditable --></div>
-</div>
-</body>
-</html>
diff --git a/lib/docs/pear.unl.edu/UNL_DWT/examples/example.ini b/lib/docs/pear.unl.edu/UNL_DWT/examples/example.ini
deleted file mode 100644
index edf2b239e2d2d653bf45049ecc277572de2266f5..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_DWT/examples/example.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[UNL_DWT]
-dwt_location    = @DOC_DIR@/UNL_DWT/docs/examples/
-class_location  = @DOC_DIR@/UNL_DWT/docs/examples/
-tpl_location	= @DOC_DIR@/UNL_DWT/docs/examples/
-class_prefix    = UNL_DWT_
\ No newline at end of file
diff --git a/lib/docs/pear.unl.edu/UNL_DWT/examples/example.test.ini b/lib/docs/pear.unl.edu/UNL_DWT/examples/example.test.ini
deleted file mode 100644
index 6f24a0b77b8e13197c9649c42aa2139a647de3fc..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_DWT/examples/example.test.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[UNL_DWT]
-dwt_location    = ./
-class_location  = ./
-tpl_location	= ./
-class_prefix    = UNL_DWT_
\ No newline at end of file
diff --git a/lib/docs/pear.unl.edu/UNL_DWT/examples/example_style1.php b/lib/docs/pear.unl.edu/UNL_DWT/examples/example_style1.php
deleted file mode 100644
index 632c8afa2e6f26b57c5a32c9e5c5c228860e2972..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_DWT/examples/example_style1.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * This example uses the DWT object generated by: '@PHP_BIN@ @PHP_DIR@/UNL/DWT/createTemplates.php @DOC_DIR@/UNL_DWT/docs/examples/example.ini'
- * 
- */
-ini_set('display_errors',true);
-error_reporting(E_ALL|E_STRICT);
-
-set_include_path(dirname(__DIR__).'/../src');
-
-require_once 'UNL/DWT.php';
-if ('@DATA_DIR@' == '@'.'DATA_DIR@') {
-    $configfile = 'example.test.ini';
-} else {
-    $configfile = '@DOC_DIR@/UNL_DWT/docs/examples/example.ini';
-}
-$config = parse_ini_file($configfile, true);
-foreach($config as $class=>$values) {
-   UNL_DWT::$options = $values;
-}
-$page = UNL_DWT::factory('Template_style1');
-$page->header  = "Example Using Template Style 1";
-$page->leftnav = "<ul><li><a href='http://pear.unl.edu/'>UNL PEAR Channel</a></li></ul>";
-$page->content = "<p>This example demonstrates the usefulness of the DWT object generator for Dreamweaver Templates.</p>";
-$page->content .= "<p>Included with the DWT package is a Dreamweaver template with 4 editable regions [template_style1.dwt]. This page is rendered using the DWT class created from that template.</p>";
-$page->content .= "<p>To create classes for your Templates, create a .ini file with the location of your Dreamweaver templates (dwt's) and then run the createTemplates.php script to generate objects for each of your template files.</p>";
-$page->content .= "<p>Here is the ini file used to create the Template_style1:<pre><code>".file_get_contents($configfile)."</code></pre></p>";
-$page->content .= "<p>And the command used to create the template classes:<pre><code>@PHP_BIN@ @PHP_DIR@/UNL/DWT/createTemplates.php @DOC_DIR@/UNL_DWT/docs/examples/example.ini</code></pre></p>";
-$page->footer  = "<a href='mailto:brett.bieber@gmail.com'>Brett Bieber</a>";
-echo $page->toHtml();
\ No newline at end of file
diff --git a/lib/docs/pear.unl.edu/UNL_DWT/examples/scanner_example.php b/lib/docs/pear.unl.edu/UNL_DWT/examples/scanner_example.php
deleted file mode 100644
index 00184321118c0efda8e8b714c02ca742b04efb3c..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_DWT/examples/scanner_example.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-set_include_path(dirname(__DIR__).'/../src');
-error_reporting(E_ALL);
-ini_set('display_errors', true);
-
-require_once 'UNL/DWT/Scanner.php';
-
-$file = file_get_contents(dirname(__FILE__).'/basic/'.'template_style1.dwt');
-
-$scanned = new UNL_DWT_Scanner($file);
-
-// Modify the scanned content
-$scanned->content .= '<h3>Scanned content from the left nav:</h3>';
-
-// Also, access the content that was scanned in
-$scanned->content .= '<pre>'.$scanned->leftnav.'</pre>';
-
-echo $scanned;
diff --git a/lib/docs/pear.unl.edu/UNL_DWT/examples/template_style1.dwt b/lib/docs/pear.unl.edu/UNL_DWT/examples/template_style1.dwt
deleted file mode 100644
index f22ce6abf12031903536a83ed335547cd9044b28..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_DWT/examples/template_style1.dwt
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<!-- TemplateBeginEditable name="doctitle" -->
-<title>Sample Template Style 1</title>
-<!-- TemplateEndEditable -->
-<style type="text/css">
-#container
-{
-width: 90%;
-margin: 10px auto;
-background-color: #fff;
-color: #333;
-border: 1px solid gray;
-line-height: 130%;
-}
-
-#top
-{
-padding: .5em;
-background-color: #ddd;
-border-bottom: 1px solid gray;
-}
-
-#top h1
-{
-padding: 0;
-margin: 0;
-}
-
-#leftnav
-{
-float: left;
-width: 160px;
-margin: 0;
-padding: 1em;
-}
-
-#content
-{
-margin-left: 200px;
-border-left: 1px solid gray;
-padding: 1em;
-max-width: 36em;
-}
-
-#footer
-{
-clear: both;
-margin: 0;
-padding: .5em;
-color: #333;
-background-color: #ddd;
-border-top: 1px solid gray;
-}
-
-#leftnav p { margin: 0 0 1em 0; }
-#content h2 { margin: 0 0 .5em 0; }
-</style>
-<!-- TemplateBeginEditable name="head" --><!-- TemplateEndEditable -->
-</head>
-
-<body>
-<div id="container">
-<div id="top">
-<h1><!-- TemplateBeginEditable name="header" -->Header<!-- TemplateEndEditable --></h1>
-</div>
-<div id="leftnav"><!-- TemplateBeginEditable name="leftnav" -->
-    <p> Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut. </p>
-<!-- TemplateEndEditable --></div>
-<div id="content"><!-- TemplateBeginEditable name="content" -->
-    <h2>Subheading</h2>
-    <p> Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. </p>
-    <p> Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. </p>
-<!-- TemplateEndEditable --></div>
-<div id="footer"><!-- TemplateBeginEditable name="footer" -->Footer<!-- TemplateEndEditable --></div>
-</div>
-</body>
-</html>
diff --git a/lib/docs/pear.unl.edu/UNL_Templates/examples/convert.php b/lib/docs/pear.unl.edu/UNL_Templates/examples/convert.php
deleted file mode 100644
index f16cee1a920f7454552afff3648e2937605588ba..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_Templates/examples/convert.php
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env php
-<?php
-if (!isset($_SERVER['argv'],$_SERVER['argv'][1])
-    || $_SERVER['argv'][1] == '--help' || $_SERVER['argc'] != 2) {
-    echo "This program requires 1 argument.\n";
-    echo "convert.php oldfile.shtml newfile.shtml\n\n";
-    exit();
-}
-
-require_once 'UNL/Autoload.php';
-
-if (!file_exists($_SERVER['argv'][1])) {
-    echo "Filename does not exist!\n";
-    exit();
-}
-
-UNL_Templates::$options['version'] = 3;
-UNL_Templates::$options['templatedependentspath'] = '/Library/WebServer/Documents';
-
-
-$p = new UNL_Templates_Scanner(file_get_contents($_SERVER['argv'][1]));
-
-
-
-$new = UNL_Templates::factory('Fixed');
-UNL_Templates::$options['templatedependentspath'] = '/Library/WebServer/Documents';
-
-
-foreach ($p->getRegions() as $region) {
-    if (count($region)) {
-        $new->{$region->name} = $region->value;
-    }
-}
-UNL_Templates::$options['templatedependentspath'] = 'paththatdoesnotexist!';
-
-echo $new;
-?>
\ No newline at end of file
diff --git a/lib/docs/pear.unl.edu/UNL_Templates/examples/customization/CustomClass.php b/lib/docs/pear.unl.edu/UNL_Templates/examples/customization/CustomClass.php
deleted file mode 100644
index 6f19d2e430592fbc844acd86fc785b001d7e2a55..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_Templates/examples/customization/CustomClass.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-set_include_path(dirname(dirname(dirname(__DIR__))).'/src'.PATH_SEPARATOR.dirname(dirname(dirname(__DIR__))).'/vendor/php');
-
-
-require_once 'UNL/Templates.php';
-
-class CustomClass
-{
-    public $template;
-    
-    function __construct()
-    {
-        $this->template = UNL_Templates::factory('Fixed');
-        $this->autoGenerate('Department of Mathematics', 'Math');
-    }
-    
-    function autoGenerateBreadcrumbs($unitShortName, array $organization = array('name' => 'UNL', 'url' => 'http://www.unl.edu/'), $delimiter = ' | ')
-    {
-        $fileName             = array_shift(explode('.', array_pop(explode(DIRECTORY_SEPARATOR, htmlentities($_SERVER['SCRIPT_NAME'])))));
-        $generatedBreadcrumbs = '';
-        $generatedDocTitle    = '';
-        
-        $isIndexPage = preg_match('/index/', $fileName);
-        
-        $searchFor = array($_SERVER['DOCUMENT_ROOT'], '_');
-        $replaceWith = array($unitShortName, ' ');
-        
-        $keys = explode(DIRECTORY_SEPARATOR, str_replace($searchFor, $replaceWith, getcwd()));
-        $values = array();
-        
-        for ($i = count($keys)-1; $i >= 0; $i--) {
-            array_push($values, str_replace($_SERVER['DOCUMENT_ROOT'], '', implode(DIRECTORY_SEPARATOR, explode(DIRECTORY_SEPARATOR, getcwd(), -$i)).DIRECTORY_SEPARATOR));
-        }
-        
-        for ($i = 0; $i < count($keys)  - $isIndexPage ; $i++) {
-            $generatedBreadcrumbs .= '<li><a href="'. $values[$i] .'">' . ucwords($keys[$i]) .' </a></li> '; 
-            $generatedDocTitle    .= ucwords($keys[$i]) . $delimiter;
-        }
-    
-        if ($isIndexPage) {
-            $generatedBreadcrumbs .= '<li>'. ucwords(end($keys)) .'</li></ul>';
-            $generatedDocTitle    .= ucwords(end($keys));
-        } else {
-            $generatedBreadcrumbs .= '<li>'. ucwords($fileName) .'</li></ul>';
-            $generatedDocTitle    .= ucwords($fileName);
-        }
-        
-        $doctitle    = '<title>' . $organization['name'] . $delimiter . $generatedDocTitle . '</title>';
-        $breadcrumbs = '<ul><li class="first"><a href="'.$organization['url'].'">'.$organization['name'].'</a></li> ' . $generatedBreadcrumbs;
-    
-        $this->template->doctitle = $doctitle;
-        $this->template->breadcrumbs = $breadcrumbs;
-    }
-    
-    /**
-     * This function finds an html file with the content of the body file and
-     * inserts it into the template.
-     *
-     * @param string $unitName Name of the department/unit
-     * 
-     * @return void
-     */
-    function autoGenerateBody($unitName)
-    {
-        // The file that has the body is in the same dir with the same base file name.
-        $bodyFile = array_shift(explode('.', array_pop(explode(DIRECTORY_SEPARATOR, htmlentities($_SERVER['SCRIPT_NAME']))))) . '.html';
-    
-        $maincontentarea_array = file($bodyFile);
-        $maincontentarea       = implode(' ', $maincontentarea_array);
-        $subhead               = preg_replace('/<!--\s*(.+)\s*-->/i', '$1', array_shift($maincontentarea_array));
-    
-        $titlegraphic = '<h1>' . $unitName . '</h1><h2>' . $subhead    . '</h2>';
-    
-        $this->template->titlegraphic    = $titlegraphic;
-        $this->template->maincontentarea = $maincontentarea;
-    }
-    
-    /**
-     * Autogenerate the contents of a page.
-     *
-     * @param string $unitName      name of the unit/department
-     * @param string $unitShortName abbreviation for the unit
-     * @param array  $organization  organization heirarchy
-     * @param string $delimiter     what separates files
-     * 
-     * @return void
-     */
-    function autoGenerate($unitName, $unitShortName, array $organization = array('name' => 'UNL', 'url' => 'http://www.unl.edu/'), $delimiter = ' | ')
-    {
-        $this->autoGenerateBreadcrumbs($unitShortName, $organization, $delimiter);
-        $this->autoGenerateBody($unitName);
-    }
-    
-    /**
-     * renders a string representation of the template
-     *
-     * @return unknown
-     */
-    function __toString()
-    {
-        return $this->template->toHtml();
-    }
-}
-?>
\ No newline at end of file
diff --git a/lib/docs/pear.unl.edu/UNL_Templates/examples/customization/customization_example.html b/lib/docs/pear.unl.edu/UNL_Templates/examples/customization/customization_example.html
deleted file mode 100644
index 0b9cbc15ae93a78f3367828241a62fbd8bef3714..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_Templates/examples/customization/customization_example.html
+++ /dev/null
@@ -1 +0,0 @@
-This is the main content of the body.
\ No newline at end of file
diff --git a/lib/docs/pear.unl.edu/UNL_Templates/examples/customization/customization_example.php b/lib/docs/pear.unl.edu/UNL_Templates/examples/customization/customization_example.php
deleted file mode 100644
index 4cd36edbcd8d519f56989dd67dd088caff39f0dc..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_Templates/examples/customization/customization_example.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-require_once 'CustomClass.php';
-
-$page = new CustomClass();
-
-echo $page;
-
-?>
\ No newline at end of file
diff --git a/lib/docs/pear.unl.edu/UNL_Templates/examples/example1.php b/lib/docs/pear.unl.edu/UNL_Templates/examples/example1.php
deleted file mode 100644
index be1a633f401c33e971949a60114d1e7a8ef81fbe..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_Templates/examples/example1.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * This example demonstrates the usage of the UNL Templates.
- *
- * 
- * @package UNL_Templates
- */
-ini_set('display_errors', true);
-error_reporting(E_ALL);
-set_include_path(dirname(dirname(__DIR__)).'/src'.PATH_SEPARATOR.dirname(dirname(__DIR__)).'/../UNL_DWT/src');
-require_once 'UNL/Templates.php';
-
-// Optionally set the version you'd like to use
-UNL_Templates::$options['version'] = 4;
-UNL_Templates::$options['templatedependentspath'] = 'https://raw.github.com/unl/wdntemplates/4.0';
-
-$page = UNL_Templates::factory('Fixed', array('sharedcodepath' => 'sharedcode'));
-$page->addScript('test.js');
-$page->addScriptDeclaration('function sayHello(){alert("Hello!");}');
-$page->addStylesheet('foo.css');
-$page->addStyleDeclaration('.foo {font-weight:bold;}');
-$page->titlegraphic     = 'Hello UNL Templates';
-$page->pagetitle        = '<h1>This is my page title h1.</h1>';
-$page->maincontentarea  = '<p>This is my main content.</p>';
-$page->navlinks         = '<ul><li><a href="#">Hello world!</a></li></ul>';
-$page->leftRandomPromo  = '';
-$page->maincontentarea  .= highlight_file(__FILE__, true);
-$page->loadSharedcodeFiles();
-echo $page->toHTML();
diff --git a/lib/docs/pear.unl.edu/UNL_Templates/examples/scanner.php b/lib/docs/pear.unl.edu/UNL_Templates/examples/scanner.php
deleted file mode 100644
index ce6ac1e7cc07db1998e6aa8d4a1093ff5c8e24d1..0000000000000000000000000000000000000000
--- a/lib/docs/pear.unl.edu/UNL_Templates/examples/scanner.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-set_include_path(dirname(dirname(__DIR__)).'/src'.PATH_SEPARATOR.dirname(dirname(__DIR__)).'/vendor/php');
-
-highlight_file(__FILE__);
-require_once 'UNL/Templates/Scanner.php';
-
-$html = file_get_contents('http://www.unl.edu/ucomm/unltoday/');
-
-// Scan this rendered UNL template-based page for editable regions
-$scanner = new UNL_Templates_Scanner($html);
-
-// All editable regions are now member variables of the scanner object.
-echo $scanner->maincontentarea;
diff --git a/lib/downloads/HTMLPurifier-4.0.0.tgz b/lib/downloads/HTMLPurifier-4.0.0.tgz
deleted file mode 100644
index da30c2df3f6e70b7e748b2ae22d0c9d74d6c6de6..0000000000000000000000000000000000000000
Binary files a/lib/downloads/HTMLPurifier-4.0.0.tgz and /dev/null differ
diff --git a/lib/downloads/UNL_Autoload-0.5.0.tgz b/lib/downloads/UNL_Autoload-0.5.0.tgz
deleted file mode 100644
index f5b5373556dd6878b8276748534baeee14745a10..0000000000000000000000000000000000000000
Binary files a/lib/downloads/UNL_Autoload-0.5.0.tgz and /dev/null differ
diff --git a/lib/downloads/UNL_Cache_Lite-0.1.0.tgz b/lib/downloads/UNL_Cache_Lite-0.1.0.tgz
deleted file mode 100644
index 3d4d5c397f49876f7d3a324277c39fe57d0e2061..0000000000000000000000000000000000000000
Binary files a/lib/downloads/UNL_Cache_Lite-0.1.0.tgz and /dev/null differ
diff --git a/lib/downloads/UNL_DWT-0.7.1.tgz b/lib/downloads/UNL_DWT-0.7.1.tgz
deleted file mode 100644
index 573413bc464c0418d8f78a7cde905362bb555050..0000000000000000000000000000000000000000
Binary files a/lib/downloads/UNL_DWT-0.7.1.tgz and /dev/null differ
diff --git a/lib/downloads/UNL_DWT-0.7.2.tgz b/lib/downloads/UNL_DWT-0.7.2.tgz
deleted file mode 100644
index c2375c729a9fe36701c90c7ea351d44af862ddf4..0000000000000000000000000000000000000000
Binary files a/lib/downloads/UNL_DWT-0.7.2.tgz and /dev/null differ
diff --git a/lib/downloads/UNL_DWT-0.9.0.phar b/lib/downloads/UNL_DWT-0.9.0.phar
deleted file mode 100644
index 83cc3ffc2464f8d67ba54421cc71fe157320c8b7..0000000000000000000000000000000000000000
--- a/lib/downloads/UNL_DWT-0.9.0.phar
+++ /dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><![endif]-->
-<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/fixed.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
-<head>
-<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-<meta name="author" content="University of Nebraska-Lincoln | Web Developer Network" />
-<meta name="viewport" content="initial-scale=1.0, width=device-width" />
-
-<!-- For Microsoft -->
-<!--[if IE]>
-<meta http-equiv="cleartype" content="on">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<![endif]-->
-
-<!-- For iPhone 4 -->
-<link rel="apple-touch-icon-precomposed" sizes="114x114" href="/wdn/templates_3.1/images/h-apple-touch-icon-precomposed.png">
-<!-- For iPad 1-->
-<link rel="apple-touch-icon-precomposed" sizes="72x72" href="/wdn/templates_3.1/images/m-apple-touch-icon-precomposed.png">
-<!-- For iPhone 3G, iPod Touch and Android -->
-<link rel="apple-touch-icon-precomposed" href="/wdn/templates_3.1/images/l-apple-touch-icon-precomposed.png">
-<!-- For everything else -->
-<link rel="shortcut icon" href="/wdn/templates_3.1/images/favicon.ico" />
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: fixed.dwt | ea2608181e2b6604db76106fd982b39218ddcb8b | Fri Mar 9 12:20:43 2012 -0600 | Kevin Abel  $
--->
-<!-- Load our base CSS file -->
-    <link rel="stylesheet" type="text/css" media="all" href="http://www.unl.edu/wdn/templates_3.1/css/compressed/base.css">
-<!-- Then load the various media queries (use 'only' to force non CSS3 compliant browser to ignore) -->
-<!-- Since this file is media query imports, IE 7 & 8 will not parse it -->
-<!--[if gt IE 8]><!-->
-    <link rel="stylesheet" type="text/css" media="all and (min-width: 320px)" href="http://www.unl.edu/wdn/templates_3.1/css/variations/media_queries.css">
-<!--<![endif]-->
-    
-<!-- Load the template JS file -->
-    <script type="text/javascript" src="http://www.unl.edu/wdn/templates_3.1/scripts/compressed/all.js?dep=3.1.19" id="wdn_dependents"></script>
-
-<!-- For old IE, bring in all the styles w/o media queries -->
-<!--[if lt IE 9]>
-    <link rel="stylesheet" type="text/css" media="all" href="http://www.unl.edu/wdn/templates_3.1/css/compressed/combined_widths.css" />
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-
-<!-- For all IE versions, bring in the tweaks -->
-<!--[if IE]>
-    <link rel="stylesheet" type="text/css" media="all" href="http://www.unl.edu/wdn/templates_3.1/css/variations/ie.css" />
-<![endif]-->
-
-<!-- Load the print styles -->
-    <link rel="stylesheet" type="text/css" media="print" href="http://www.unl.edu/wdn/templates_3.1/css/variations/print.css" />
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>{page_title}</title>
-<!-- InstanceEndEditable --><!-- InstanceBeginEditable name="head" -->
-<link rel="alternate" href="/?view=latest&amp;format=rss" title="Latest Releases" type="application/atom+xml" />
-<!-- Place optional header elements here -->
-<link rel="stylesheet" href="/css/all.css" />
-<!-- InstanceEndEditable -->
-<!-- InstanceParam name="class" type="text" value="fixed" -->
-</head>
-<body class="fixed" data-version="3.1">
-    <nav class="skipnav">
-        <a class="skipnav" href="#maincontent">Skip Navigation</a>
-    </nav>
-    <div id="wdn_wrapper">
-        <header id="header" role="banner">
-            <a id="logo" href="http://www.unl.edu/" title="UNL website">UNL</a>
-            <span id="wdn_institution_title">University of Nebraska&ndash;Lincoln</span>
-            <span id="wdn_site_title"><!-- InstanceBeginEditable name="titlegraphic" -->
-            UNL PHP Extension and Application Repository            <!-- InstanceEndEditable --></span>
-            <div id="wdn_identity_management" role="navigation" aria-labelledby="wdn_idm_username">
-    <a class="wdn_idm_user_profile" id="wdn_idm_login" href="https://login.unl.edu/cas/login" title="Log in to UNL">
-        <img id="wdn_idm_userpic" src="/wdn/templates_3.1/images/wdn_idm_defaulttopbar.gif" alt="User Profile Photo">
-        <span id="wdn_idm_username">UNL Login</span>
-    </a>
-    <h3 class="wdn_list_descriptor hidden">Account Links</h3>
-    <ul id="wdn_idm_user_options">
-        <li id="wdn_idm_logout">
-            <a title="Logout" href="https://login.unl.edu/cas/logout?url=http%3A//www.unl.edu/">Logout</a>
-        </li>
-    </ul>
-</div>            <div id="wdn_search">
-    <form id="wdn_search_form" action="http://www.google.com/u/UNL1?sa=Google+Search&amp;q=" method="get" role="search">
-        <fieldset>
-            <legend class="hidden">Search</legend>
-            <label for="q">Search this site, all UNL or for a person</label>
-            <input accesskey="f" id="q" name="q" type="search" placeholder="Search this site, all UNL or for a person" />
-            <input class="search" type="submit" value="Go" name="submit" />
-        </fieldset>
-    </form>
-</div>
-<h3 class="wdn_list_descriptor hidden">UNL Tools</h3>
-<menu id="wdn_tool_links">
-    <li><a href="http://www1.unl.edu/feeds/" class="feeds tooltip" data-title="RSS Feeds: View and Subscribe to News Feeds">Feeds</a></li>
-    <li><a href="http://forecast.weather.gov/MapClick.php?CityName=Lincoln&amp;state=NE&amp;site=OAX" class="weather tooltip" data-title="Weather: Local Forecast and Radar">Weather</a></li>
-    <li><a href="http://events.unl.edu/" class="events tooltip" data-title="UNL Events: Calendar of Upcoming Events">Events</a></li>
-    <li><a href="http://directory.unl.edu/" class="directory tooltip" data-title="UNL Directory: Search for Faculty, Staff, Students and Departments">Directory</a></li>
-</menu>
-<span class="corner-fix-top-right"></span>
-<span class="corner-fix-bottom-left"></span>
-        </header>
-        <div id="wdn_navigation_bar" role="navigation">
-            <nav id="breadcrumbs">
-            <!-- InstanceBeginEditable name="breadcrumbs" -->
-            <ul>
-                <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
-                <li>pear.unl.edu</li>
-            </ul>
-            <!-- TemplateEndEditable -->
-            </nav>
-            <div id="wdn_navigation_wrapper">
-                <nav id="navigation" role="navigation">
-                    <h3 class="wdn_list_descriptor hidden">Navigation</h3>
-                    <!-- InstanceBeginEditable name="navlinks" -->
-                <ul class="navigation">
-                    <li><a href="/">Home</a></li>
-                    <li><a href="/?view=packages">Packages</a></li>
-                    <li><a href="/?view=categories">Categories</a></li>
-                    <li><a href="/docs/">Documentation</a></li>
-                    <li><a href="/?view=support">Support</a></li>
-                </ul>
-                <!-- InstanceEndEditable -->
-                </nav>
-            </div>
-        </div>
-        <div id="wdn_content_wrapper" role="main">
-            <div id="pagetitle">
-                <!-- InstanceBeginEditable name="pagetitle" -->
-                <!-- InstanceEndEditable -->
-            </div>
-            <div id="maincontent">
-                <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-                <!-- InstanceBeginEditable name="maincontentarea" -->
-                <h1>WHOAH Nelly.</h1>
-<p>That view doesn't exist!</p>
-                <!-- InstanceEndEditable -->
-                <div class="clear"></div>
-                <noscript>
-    <p>
-    Your browser does not appear to support JavaScript, or you have turned JavaScript off. You may use unl.edu without enabling JavaScript, but certain functions may not be available.
-    </p>
-</noscript>                <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-            </div>
-        </div>
-        <footer id="footer">
-            <div id="footer_floater"></div>
-            <div class="footer_col" id="wdn_footer_feedback">
-                <h3><a href="http://www1.unl.edu/comments/">Your Feedback</a></h3>
-<form action="http://www1.unl.edu/comments/" method="post" id="wdn_feedback" title="WDN Feedback Form:4" class="rating">
-    <fieldset class="rating">
-        <legend>Please rate this page:</legend>
-        <input type="radio" id="star5" name="rating" value="5" />
-        <label for="star5" title="Rocks!">5 stars</label>
-        <input type="radio" id="star4" name="rating" value="4" />
-        <label for="star4" title="Pretty good">4 stars</label>
-        <input type="radio" id="star3" name="rating" value="3" />
-        <label for="star3" title="Meh">3 stars</label>
-        <input type="radio" id="star2" name="rating" value="2" />
-        <label for="star2" title="Kinda bad">2 stars</label>
-        <input type="radio" id="star1" name="rating" value="1" />
-        <label for="star1" title="Not so hot">1 star</label>
-        <input type="submit" value="Submit" name="submit" />
-    </fieldset>
-</form>
-<form action="http://www1.unl.edu/comments/" method="post" id="wdn_feedback_comments" title="WDN Feedback Form" class="comments">
-    <fieldset><legend>Comments for this page</legend>
-    <ol>
-        <li class="wdn_comment_name">
-            <label for="wdn_comment_name">Name (optional)</label>
-            <input type="text" name="name" id="wdn_comment_name" placeholder="Your Name" />
-        </li>
-        <li class="wdn_comment_email">
-            <label for="wdn_comment_email">Email (optional)</label>
-            <input type="text" name="email" id="wdn_comment_email" placeholder="Your Email" />
-        </li>
-        <li><label for="wdn_comments">Comments</label>
-          <textarea rows="2" cols="20" name="comment" id="wdn_comments" placeholder="Your Comment"></textarea>
-        </li>
-    </ol>
-    <input type="submit" value="Submit" name="submit" class="wdn_comment_submit" /></fieldset>
-</form>
-            </div>
-            <div class="footer_col" id="wdn_footer_related">
-                <!-- InstanceBeginEditable name="leftcollinks" -->
-                <h3>Related Links</h3>
-                <ul>
-                    <li><a href="http://wdn.unl.edu/">UNL Web Developer Network</a></li>
-                    <li><a href="http://pear.php.net/">PEAR</a></li>
-                </ul>
-                <!-- InstanceEndEditable --></div>
-            <div class="footer_col" id="wdn_footer_contact">
-                <!-- InstanceBeginEditable name="contactinfo" -->
-                <h3>Contacting Us</h3>
-                <p>
-                This PEAR channel is maintained by:<br />
-                <strong>Brett Bieber<br />
-                University Communications</strong><br />
-                Internet and Interactive Media<br />
-                bbieber2@unl.edu
-                </p>
-                <!-- InstanceEndEditable --></div>
-            <div class="footer_col" id="wdn_footer_share">
-                <h3>Share This Page</h3>
-<ul class="socialmedia">
-    <li><a href="http://go.unl.edu/?url=referer" id="wdn_createGoURL" rel="nofollow">Get a G<span>o</span>URL</a></li>
-    <li class="outpost" id="wdn_emailthis"><a href="mailto:" title="Share this page through email" rel="nofollow">Share this page through email</a></li>
-    <li class="outpost" id="wdn_facebook"><a href="https://www.facebook.com/" title="Share this page on Facebook" rel="nofollow">Share this page on Facebook</a></li>   
-    <li class="outpost" id="wdn_twitter"><a href="https://twitter.com/" title="Share this page on Twitter" rel="nofollow">Share this page on Twitter</a></li>
-</ul>            </div>
-            <!-- InstanceBeginEditable name="optionalfooter" -->
-            <!-- InstanceEndEditable -->
-            <div id="wdn_copyright">
-                <div>
-                    <!-- InstanceBeginEditable name="footercontent" -->
-                &copy; 2014 University of Nebraska-Lincoln | Lincoln, NE 68588 | 402-472-7211 | <a href="http://www1.unl.edu/comments/" title="Click here to direct your comments and questions">comments?</a>
-                <!-- InstanceEndEditable -->
-                <span id="wdn_attribution"><br/>UNL web templates and quality assurance provided by the <a href="http://wdn.unl.edu/" title="UNL Web Developer Network">Web Developer Network</a> | <a href="http://www1.unl.edu/wdn/qa/" id="wdn_qa_link">QA Test</a></span>                </div>
-                <div id="wdn_logos">
-    <a href="http://www.unl.edu/" title="UNL Home" id="unl_wordmark">UNL Home</a>
-    <a href="http://www.cic.net/home" title="CIC Website" id="cic_wordmark">CIC Website</a>
-    <a href="http://www.bigten.org/" title="Big Ten Website" id="b1g_wordmark">Big Ten Website</a>
-</div>            </div>
-        </footer>
-    </div>
-</body>
-<!-- InstanceEnd --></html>
diff --git a/lib/downloads/UNL_DWT-0.9.0.tgz b/lib/downloads/UNL_DWT-0.9.0.tgz
deleted file mode 100644
index b772b63bbc347a17300565ce89c3152dccae60e4..0000000000000000000000000000000000000000
Binary files a/lib/downloads/UNL_DWT-0.9.0.tgz and /dev/null differ
diff --git a/lib/downloads/UNL_Templates-1.3.0RC2.tgz b/lib/downloads/UNL_Templates-1.3.0RC2.tgz
deleted file mode 100644
index 0f67623b0fce5fd123f380fdb2a405a548628f88..0000000000000000000000000000000000000000
Binary files a/lib/downloads/UNL_Templates-1.3.0RC2.tgz and /dev/null differ
diff --git a/lib/downloads/UNL_Templates-1.4.0RC3.phar b/lib/downloads/UNL_Templates-1.4.0RC3.phar
deleted file mode 100644
index 83cc3ffc2464f8d67ba54421cc71fe157320c8b7..0000000000000000000000000000000000000000
--- a/lib/downloads/UNL_Templates-1.4.0RC3.phar
+++ /dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie" lang="en"><![endif]-->
-<!--[if !(IEMobile) | !(IE)]><!--><html lang="en"><!-- InstanceBegin template="/Templates/fixed.dwt" codeOutsideHTMLIsLocked="false" --><!--<![endif]-->
-<head>
-<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-<meta name="author" content="University of Nebraska-Lincoln | Web Developer Network" />
-<meta name="viewport" content="initial-scale=1.0, width=device-width" />
-
-<!-- For Microsoft -->
-<!--[if IE]>
-<meta http-equiv="cleartype" content="on">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<![endif]-->
-
-<!-- For iPhone 4 -->
-<link rel="apple-touch-icon-precomposed" sizes="114x114" href="/wdn/templates_3.1/images/h-apple-touch-icon-precomposed.png">
-<!-- For iPad 1-->
-<link rel="apple-touch-icon-precomposed" sizes="72x72" href="/wdn/templates_3.1/images/m-apple-touch-icon-precomposed.png">
-<!-- For iPhone 3G, iPod Touch and Android -->
-<link rel="apple-touch-icon-precomposed" href="/wdn/templates_3.1/images/l-apple-touch-icon-precomposed.png">
-<!-- For everything else -->
-<link rel="shortcut icon" href="/wdn/templates_3.1/images/favicon.ico" />
-<!--
-    Membership and regular participation in the UNL Web Developer Network
-    is required to use the UNL templates. Visit the WDN site at 
-    http://wdn.unl.edu/. Click the WDN Registry link to log in and
-    register your unl.edu site.
-    All UNL template code is the property of the UNL Web Developer Network.
-    The code seen in a source code view is not, and may not be used as, a 
-    template. You may not use this code, a reverse-engineered version of 
-    this code, or its associated visual presentation in whole or in part to
-    create a derivative work.
-    This message may not be removed from any pages based on the UNL site template.
-    
-    $Id: fixed.dwt | ea2608181e2b6604db76106fd982b39218ddcb8b | Fri Mar 9 12:20:43 2012 -0600 | Kevin Abel  $
--->
-<!-- Load our base CSS file -->
-    <link rel="stylesheet" type="text/css" media="all" href="http://www.unl.edu/wdn/templates_3.1/css/compressed/base.css">
-<!-- Then load the various media queries (use 'only' to force non CSS3 compliant browser to ignore) -->
-<!-- Since this file is media query imports, IE 7 & 8 will not parse it -->
-<!--[if gt IE 8]><!-->
-    <link rel="stylesheet" type="text/css" media="all and (min-width: 320px)" href="http://www.unl.edu/wdn/templates_3.1/css/variations/media_queries.css">
-<!--<![endif]-->
-    
-<!-- Load the template JS file -->
-    <script type="text/javascript" src="http://www.unl.edu/wdn/templates_3.1/scripts/compressed/all.js?dep=3.1.19" id="wdn_dependents"></script>
-
-<!-- For old IE, bring in all the styles w/o media queries -->
-<!--[if lt IE 9]>
-    <link rel="stylesheet" type="text/css" media="all" href="http://www.unl.edu/wdn/templates_3.1/css/compressed/combined_widths.css" />
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-
-<!-- For all IE versions, bring in the tweaks -->
-<!--[if IE]>
-    <link rel="stylesheet" type="text/css" media="all" href="http://www.unl.edu/wdn/templates_3.1/css/variations/ie.css" />
-<![endif]-->
-
-<!-- Load the print styles -->
-    <link rel="stylesheet" type="text/css" media="print" href="http://www.unl.edu/wdn/templates_3.1/css/variations/print.css" />
-<!-- InstanceBeginEditable name="doctitle" -->
-<title>{page_title}</title>
-<!-- InstanceEndEditable --><!-- InstanceBeginEditable name="head" -->
-<link rel="alternate" href="/?view=latest&amp;format=rss" title="Latest Releases" type="application/atom+xml" />
-<!-- Place optional header elements here -->
-<link rel="stylesheet" href="/css/all.css" />
-<!-- InstanceEndEditable -->
-<!-- InstanceParam name="class" type="text" value="fixed" -->
-</head>
-<body class="fixed" data-version="3.1">
-    <nav class="skipnav">
-        <a class="skipnav" href="#maincontent">Skip Navigation</a>
-    </nav>
-    <div id="wdn_wrapper">
-        <header id="header" role="banner">
-            <a id="logo" href="http://www.unl.edu/" title="UNL website">UNL</a>
-            <span id="wdn_institution_title">University of Nebraska&ndash;Lincoln</span>
-            <span id="wdn_site_title"><!-- InstanceBeginEditable name="titlegraphic" -->
-            UNL PHP Extension and Application Repository            <!-- InstanceEndEditable --></span>
-            <div id="wdn_identity_management" role="navigation" aria-labelledby="wdn_idm_username">
-    <a class="wdn_idm_user_profile" id="wdn_idm_login" href="https://login.unl.edu/cas/login" title="Log in to UNL">
-        <img id="wdn_idm_userpic" src="/wdn/templates_3.1/images/wdn_idm_defaulttopbar.gif" alt="User Profile Photo">
-        <span id="wdn_idm_username">UNL Login</span>
-    </a>
-    <h3 class="wdn_list_descriptor hidden">Account Links</h3>
-    <ul id="wdn_idm_user_options">
-        <li id="wdn_idm_logout">
-            <a title="Logout" href="https://login.unl.edu/cas/logout?url=http%3A//www.unl.edu/">Logout</a>
-        </li>
-    </ul>
-</div>            <div id="wdn_search">
-    <form id="wdn_search_form" action="http://www.google.com/u/UNL1?sa=Google+Search&amp;q=" method="get" role="search">
-        <fieldset>
-            <legend class="hidden">Search</legend>
-            <label for="q">Search this site, all UNL or for a person</label>
-            <input accesskey="f" id="q" name="q" type="search" placeholder="Search this site, all UNL or for a person" />
-            <input class="search" type="submit" value="Go" name="submit" />
-        </fieldset>
-    </form>
-</div>
-<h3 class="wdn_list_descriptor hidden">UNL Tools</h3>
-<menu id="wdn_tool_links">
-    <li><a href="http://www1.unl.edu/feeds/" class="feeds tooltip" data-title="RSS Feeds: View and Subscribe to News Feeds">Feeds</a></li>
-    <li><a href="http://forecast.weather.gov/MapClick.php?CityName=Lincoln&amp;state=NE&amp;site=OAX" class="weather tooltip" data-title="Weather: Local Forecast and Radar">Weather</a></li>
-    <li><a href="http://events.unl.edu/" class="events tooltip" data-title="UNL Events: Calendar of Upcoming Events">Events</a></li>
-    <li><a href="http://directory.unl.edu/" class="directory tooltip" data-title="UNL Directory: Search for Faculty, Staff, Students and Departments">Directory</a></li>
-</menu>
-<span class="corner-fix-top-right"></span>
-<span class="corner-fix-bottom-left"></span>
-        </header>
-        <div id="wdn_navigation_bar" role="navigation">
-            <nav id="breadcrumbs">
-            <!-- InstanceBeginEditable name="breadcrumbs" -->
-            <ul>
-                <li><a href="http://www.unl.edu/" title="University of Nebraska&ndash;Lincoln">UNL</a></li>
-                <li>pear.unl.edu</li>
-            </ul>
-            <!-- TemplateEndEditable -->
-            </nav>
-            <div id="wdn_navigation_wrapper">
-                <nav id="navigation" role="navigation">
-                    <h3 class="wdn_list_descriptor hidden">Navigation</h3>
-                    <!-- InstanceBeginEditable name="navlinks" -->
-                <ul class="navigation">
-                    <li><a href="/">Home</a></li>
-                    <li><a href="/?view=packages">Packages</a></li>
-                    <li><a href="/?view=categories">Categories</a></li>
-                    <li><a href="/docs/">Documentation</a></li>
-                    <li><a href="/?view=support">Support</a></li>
-                </ul>
-                <!-- InstanceEndEditable -->
-                </nav>
-            </div>
-        </div>
-        <div id="wdn_content_wrapper" role="main">
-            <div id="pagetitle">
-                <!-- InstanceBeginEditable name="pagetitle" -->
-                <!-- InstanceEndEditable -->
-            </div>
-            <div id="maincontent">
-                <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
-                <!-- InstanceBeginEditable name="maincontentarea" -->
-                <h1>WHOAH Nelly.</h1>
-<p>That view doesn't exist!</p>
-                <!-- InstanceEndEditable -->
-                <div class="clear"></div>
-                <noscript>
-    <p>
-    Your browser does not appear to support JavaScript, or you have turned JavaScript off. You may use unl.edu without enabling JavaScript, but certain functions may not be available.
-    </p>
-</noscript>                <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
-            </div>
-        </div>
-        <footer id="footer">
-            <div id="footer_floater"></div>
-            <div class="footer_col" id="wdn_footer_feedback">
-                <h3><a href="http://www1.unl.edu/comments/">Your Feedback</a></h3>
-<form action="http://www1.unl.edu/comments/" method="post" id="wdn_feedback" title="WDN Feedback Form:4" class="rating">
-    <fieldset class="rating">
-        <legend>Please rate this page:</legend>
-        <input type="radio" id="star5" name="rating" value="5" />
-        <label for="star5" title="Rocks!">5 stars</label>
-        <input type="radio" id="star4" name="rating" value="4" />
-        <label for="star4" title="Pretty good">4 stars</label>
-        <input type="radio" id="star3" name="rating" value="3" />
-        <label for="star3" title="Meh">3 stars</label>
-        <input type="radio" id="star2" name="rating" value="2" />
-        <label for="star2" title="Kinda bad">2 stars</label>
-        <input type="radio" id="star1" name="rating" value="1" />
-        <label for="star1" title="Not so hot">1 star</label>
-        <input type="submit" value="Submit" name="submit" />
-    </fieldset>
-</form>
-<form action="http://www1.unl.edu/comments/" method="post" id="wdn_feedback_comments" title="WDN Feedback Form" class="comments">
-    <fieldset><legend>Comments for this page</legend>
-    <ol>
-        <li class="wdn_comment_name">
-            <label for="wdn_comment_name">Name (optional)</label>
-            <input type="text" name="name" id="wdn_comment_name" placeholder="Your Name" />
-        </li>
-        <li class="wdn_comment_email">
-            <label for="wdn_comment_email">Email (optional)</label>
-            <input type="text" name="email" id="wdn_comment_email" placeholder="Your Email" />
-        </li>
-        <li><label for="wdn_comments">Comments</label>
-          <textarea rows="2" cols="20" name="comment" id="wdn_comments" placeholder="Your Comment"></textarea>
-        </li>
-    </ol>
-    <input type="submit" value="Submit" name="submit" class="wdn_comment_submit" /></fieldset>
-</form>
-            </div>
-            <div class="footer_col" id="wdn_footer_related">
-                <!-- InstanceBeginEditable name="leftcollinks" -->
-                <h3>Related Links</h3>
-                <ul>
-                    <li><a href="http://wdn.unl.edu/">UNL Web Developer Network</a></li>
-                    <li><a href="http://pear.php.net/">PEAR</a></li>
-                </ul>
-                <!-- InstanceEndEditable --></div>
-            <div class="footer_col" id="wdn_footer_contact">
-                <!-- InstanceBeginEditable name="contactinfo" -->
-                <h3>Contacting Us</h3>
-                <p>
-                This PEAR channel is maintained by:<br />
-                <strong>Brett Bieber<br />
-                University Communications</strong><br />
-                Internet and Interactive Media<br />
-                bbieber2@unl.edu
-                </p>
-                <!-- InstanceEndEditable --></div>
-            <div class="footer_col" id="wdn_footer_share">
-                <h3>Share This Page</h3>
-<ul class="socialmedia">
-    <li><a href="http://go.unl.edu/?url=referer" id="wdn_createGoURL" rel="nofollow">Get a G<span>o</span>URL</a></li>
-    <li class="outpost" id="wdn_emailthis"><a href="mailto:" title="Share this page through email" rel="nofollow">Share this page through email</a></li>
-    <li class="outpost" id="wdn_facebook"><a href="https://www.facebook.com/" title="Share this page on Facebook" rel="nofollow">Share this page on Facebook</a></li>   
-    <li class="outpost" id="wdn_twitter"><a href="https://twitter.com/" title="Share this page on Twitter" rel="nofollow">Share this page on Twitter</a></li>
-</ul>            </div>
-            <!-- InstanceBeginEditable name="optionalfooter" -->
-            <!-- InstanceEndEditable -->
-            <div id="wdn_copyright">
-                <div>
-                    <!-- InstanceBeginEditable name="footercontent" -->
-                &copy; 2014 University of Nebraska-Lincoln | Lincoln, NE 68588 | 402-472-7211 | <a href="http://www1.unl.edu/comments/" title="Click here to direct your comments and questions">comments?</a>
-                <!-- InstanceEndEditable -->
-                <span id="wdn_attribution"><br/>UNL web templates and quality assurance provided by the <a href="http://wdn.unl.edu/" title="UNL Web Developer Network">Web Developer Network</a> | <a href="http://www1.unl.edu/wdn/qa/" id="wdn_qa_link">QA Test</a></span>                </div>
-                <div id="wdn_logos">
-    <a href="http://www.unl.edu/" title="UNL Home" id="unl_wordmark">UNL Home</a>
-    <a href="http://www.cic.net/home" title="CIC Website" id="cic_wordmark">CIC Website</a>
-    <a href="http://www.bigten.org/" title="Big Ten Website" id="b1g_wordmark">Big Ten Website</a>
-</div>            </div>
-        </footer>
-    </div>
-</body>
-<!-- InstanceEnd --></html>
diff --git a/lib/downloads/UNL_Templates-1.4.0RC3.tgz b/lib/downloads/UNL_Templates-1.4.0RC3.tgz
deleted file mode 100644
index 23a82f185e1687fd012b1285d63a4290f7f6e67d..0000000000000000000000000000000000000000
Binary files a/lib/downloads/UNL_Templates-1.4.0RC3.tgz and /dev/null differ
diff --git a/lib/php/HTMLPurifier.auto.php b/lib/php/HTMLPurifier.auto.php
deleted file mode 100644
index 1960c399f89861a4a1da263030feddb150fe1384..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier.auto.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * This is a stub include that automatically configures the include path.
- */
-
-set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() );
-require_once 'HTMLPurifier/Bootstrap.php';
-require_once 'HTMLPurifier.autoload.php';
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier.autoload.php b/lib/php/HTMLPurifier.autoload.php
deleted file mode 100644
index 8d40176406a079f8ab49b7d0260c86073daf2c58..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier.autoload.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * @file
- * Convenience file that registers autoload handler for HTML Purifier.
- */
-
-if (function_exists('spl_autoload_register') && function_exists('spl_autoload_unregister')) {
-    // We need unregister for our pre-registering functionality
-    HTMLPurifier_Bootstrap::registerAutoload();
-    if (function_exists('__autoload')) {
-        // Be polite and ensure that userland autoload gets retained
-        spl_autoload_register('__autoload');
-    }
-} elseif (!function_exists('__autoload')) {
-    function __autoload($class) {
-        return HTMLPurifier_Bootstrap::autoload($class);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier.func.php b/lib/php/HTMLPurifier.func.php
deleted file mode 100644
index 56a55b2fedac9c4c035ae476ece07e56cdb14252..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier.func.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * @file
- * Defines a function wrapper for HTML Purifier for quick use.
- * @note ''HTMLPurifier()'' is NOT the same as ''new HTMLPurifier()''
- */
-
-/**
- * Purify HTML.
- * @param $html String HTML to purify
- * @param $config Configuration to use, can be any value accepted by
- *        HTMLPurifier_Config::create()
- */
-function HTMLPurifier($html, $config = null) {
-    static $purifier = false;
-    if (!$purifier) {
-        $purifier = new HTMLPurifier();
-    }
-    return $purifier->purify($html, $config);
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier.includes.php b/lib/php/HTMLPurifier.includes.php
deleted file mode 100644
index 7cfb970601a84b97f5cfa2b5b97bcbc74f26ff3a..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier.includes.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-
-/**
- * @file
- * This file was auto-generated by generate-includes.php and includes all of
- * the core files required by HTML Purifier. Use this if performance is a
- * primary concern and you are using an opcode cache. PLEASE DO NOT EDIT THIS
- * FILE, changes will be overwritten the next time the script is run.
- *
- * @version 4.0.0
- *
- * @warning
- *      You must *not* include any other HTML Purifier files before this file,
- *      because 'require' not 'require_once' is used.
- *
- * @warning
- *      This file requires that the include path contains the HTML Purifier
- *      library directory; this is not auto-set.
- */
-
-require 'HTMLPurifier.php';
-require 'HTMLPurifier/AttrCollections.php';
-require 'HTMLPurifier/AttrDef.php';
-require 'HTMLPurifier/AttrTransform.php';
-require 'HTMLPurifier/AttrTypes.php';
-require 'HTMLPurifier/AttrValidator.php';
-require 'HTMLPurifier/Bootstrap.php';
-require 'HTMLPurifier/Definition.php';
-require 'HTMLPurifier/CSSDefinition.php';
-require 'HTMLPurifier/ChildDef.php';
-require 'HTMLPurifier/Config.php';
-require 'HTMLPurifier/ConfigSchema.php';
-require 'HTMLPurifier/ContentSets.php';
-require 'HTMLPurifier/Context.php';
-require 'HTMLPurifier/DefinitionCache.php';
-require 'HTMLPurifier/DefinitionCacheFactory.php';
-require 'HTMLPurifier/Doctype.php';
-require 'HTMLPurifier/DoctypeRegistry.php';
-require 'HTMLPurifier/ElementDef.php';
-require 'HTMLPurifier/Encoder.php';
-require 'HTMLPurifier/EntityLookup.php';
-require 'HTMLPurifier/EntityParser.php';
-require 'HTMLPurifier/ErrorCollector.php';
-require 'HTMLPurifier/ErrorStruct.php';
-require 'HTMLPurifier/Exception.php';
-require 'HTMLPurifier/Filter.php';
-require 'HTMLPurifier/Generator.php';
-require 'HTMLPurifier/HTMLDefinition.php';
-require 'HTMLPurifier/HTMLModule.php';
-require 'HTMLPurifier/HTMLModuleManager.php';
-require 'HTMLPurifier/IDAccumulator.php';
-require 'HTMLPurifier/Injector.php';
-require 'HTMLPurifier/Language.php';
-require 'HTMLPurifier/LanguageFactory.php';
-require 'HTMLPurifier/Length.php';
-require 'HTMLPurifier/Lexer.php';
-require 'HTMLPurifier/PercentEncoder.php';
-require 'HTMLPurifier/PropertyList.php';
-require 'HTMLPurifier/PropertyListIterator.php';
-require 'HTMLPurifier/Strategy.php';
-require 'HTMLPurifier/StringHash.php';
-require 'HTMLPurifier/StringHashParser.php';
-require 'HTMLPurifier/TagTransform.php';
-require 'HTMLPurifier/Token.php';
-require 'HTMLPurifier/TokenFactory.php';
-require 'HTMLPurifier/URI.php';
-require 'HTMLPurifier/URIDefinition.php';
-require 'HTMLPurifier/URIFilter.php';
-require 'HTMLPurifier/URIParser.php';
-require 'HTMLPurifier/URIScheme.php';
-require 'HTMLPurifier/URISchemeRegistry.php';
-require 'HTMLPurifier/UnitConverter.php';
-require 'HTMLPurifier/VarParser.php';
-require 'HTMLPurifier/VarParserException.php';
-require 'HTMLPurifier/AttrDef/CSS.php';
-require 'HTMLPurifier/AttrDef/Enum.php';
-require 'HTMLPurifier/AttrDef/Integer.php';
-require 'HTMLPurifier/AttrDef/Lang.php';
-require 'HTMLPurifier/AttrDef/Switch.php';
-require 'HTMLPurifier/AttrDef/Text.php';
-require 'HTMLPurifier/AttrDef/URI.php';
-require 'HTMLPurifier/AttrDef/CSS/Number.php';
-require 'HTMLPurifier/AttrDef/CSS/AlphaValue.php';
-require 'HTMLPurifier/AttrDef/CSS/Background.php';
-require 'HTMLPurifier/AttrDef/CSS/BackgroundPosition.php';
-require 'HTMLPurifier/AttrDef/CSS/Border.php';
-require 'HTMLPurifier/AttrDef/CSS/Color.php';
-require 'HTMLPurifier/AttrDef/CSS/Composite.php';
-require 'HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php';
-require 'HTMLPurifier/AttrDef/CSS/Filter.php';
-require 'HTMLPurifier/AttrDef/CSS/Font.php';
-require 'HTMLPurifier/AttrDef/CSS/FontFamily.php';
-require 'HTMLPurifier/AttrDef/CSS/ImportantDecorator.php';
-require 'HTMLPurifier/AttrDef/CSS/Length.php';
-require 'HTMLPurifier/AttrDef/CSS/ListStyle.php';
-require 'HTMLPurifier/AttrDef/CSS/Multiple.php';
-require 'HTMLPurifier/AttrDef/CSS/Percentage.php';
-require 'HTMLPurifier/AttrDef/CSS/TextDecoration.php';
-require 'HTMLPurifier/AttrDef/CSS/URI.php';
-require 'HTMLPurifier/AttrDef/HTML/Bool.php';
-require 'HTMLPurifier/AttrDef/HTML/Nmtokens.php';
-require 'HTMLPurifier/AttrDef/HTML/Class.php';
-require 'HTMLPurifier/AttrDef/HTML/Color.php';
-require 'HTMLPurifier/AttrDef/HTML/FrameTarget.php';
-require 'HTMLPurifier/AttrDef/HTML/ID.php';
-require 'HTMLPurifier/AttrDef/HTML/Pixels.php';
-require 'HTMLPurifier/AttrDef/HTML/Length.php';
-require 'HTMLPurifier/AttrDef/HTML/LinkTypes.php';
-require 'HTMLPurifier/AttrDef/HTML/MultiLength.php';
-require 'HTMLPurifier/AttrDef/URI/Email.php';
-require 'HTMLPurifier/AttrDef/URI/Host.php';
-require 'HTMLPurifier/AttrDef/URI/IPv4.php';
-require 'HTMLPurifier/AttrDef/URI/IPv6.php';
-require 'HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php';
-require 'HTMLPurifier/AttrTransform/Background.php';
-require 'HTMLPurifier/AttrTransform/BdoDir.php';
-require 'HTMLPurifier/AttrTransform/BgColor.php';
-require 'HTMLPurifier/AttrTransform/BoolToCSS.php';
-require 'HTMLPurifier/AttrTransform/Border.php';
-require 'HTMLPurifier/AttrTransform/EnumToCSS.php';
-require 'HTMLPurifier/AttrTransform/ImgRequired.php';
-require 'HTMLPurifier/AttrTransform/ImgSpace.php';
-require 'HTMLPurifier/AttrTransform/Input.php';
-require 'HTMLPurifier/AttrTransform/Lang.php';
-require 'HTMLPurifier/AttrTransform/Length.php';
-require 'HTMLPurifier/AttrTransform/Name.php';
-require 'HTMLPurifier/AttrTransform/NameSync.php';
-require 'HTMLPurifier/AttrTransform/SafeEmbed.php';
-require 'HTMLPurifier/AttrTransform/SafeObject.php';
-require 'HTMLPurifier/AttrTransform/SafeParam.php';
-require 'HTMLPurifier/AttrTransform/ScriptRequired.php';
-require 'HTMLPurifier/AttrTransform/Textarea.php';
-require 'HTMLPurifier/ChildDef/Chameleon.php';
-require 'HTMLPurifier/ChildDef/Custom.php';
-require 'HTMLPurifier/ChildDef/Empty.php';
-require 'HTMLPurifier/ChildDef/Required.php';
-require 'HTMLPurifier/ChildDef/Optional.php';
-require 'HTMLPurifier/ChildDef/StrictBlockquote.php';
-require 'HTMLPurifier/ChildDef/Table.php';
-require 'HTMLPurifier/DefinitionCache/Decorator.php';
-require 'HTMLPurifier/DefinitionCache/Null.php';
-require 'HTMLPurifier/DefinitionCache/Serializer.php';
-require 'HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
-require 'HTMLPurifier/DefinitionCache/Decorator/Memory.php';
-require 'HTMLPurifier/HTMLModule/Bdo.php';
-require 'HTMLPurifier/HTMLModule/CommonAttributes.php';
-require 'HTMLPurifier/HTMLModule/Edit.php';
-require 'HTMLPurifier/HTMLModule/Forms.php';
-require 'HTMLPurifier/HTMLModule/Hypertext.php';
-require 'HTMLPurifier/HTMLModule/Image.php';
-require 'HTMLPurifier/HTMLModule/Legacy.php';
-require 'HTMLPurifier/HTMLModule/List.php';
-require 'HTMLPurifier/HTMLModule/Name.php';
-require 'HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php';
-require 'HTMLPurifier/HTMLModule/Object.php';
-require 'HTMLPurifier/HTMLModule/Presentation.php';
-require 'HTMLPurifier/HTMLModule/Proprietary.php';
-require 'HTMLPurifier/HTMLModule/Ruby.php';
-require 'HTMLPurifier/HTMLModule/SafeEmbed.php';
-require 'HTMLPurifier/HTMLModule/SafeObject.php';
-require 'HTMLPurifier/HTMLModule/Scripting.php';
-require 'HTMLPurifier/HTMLModule/StyleAttribute.php';
-require 'HTMLPurifier/HTMLModule/Tables.php';
-require 'HTMLPurifier/HTMLModule/Target.php';
-require 'HTMLPurifier/HTMLModule/Text.php';
-require 'HTMLPurifier/HTMLModule/Tidy.php';
-require 'HTMLPurifier/HTMLModule/XMLCommonAttributes.php';
-require 'HTMLPurifier/HTMLModule/Tidy/Name.php';
-require 'HTMLPurifier/HTMLModule/Tidy/Proprietary.php';
-require 'HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php';
-require 'HTMLPurifier/HTMLModule/Tidy/Strict.php';
-require 'HTMLPurifier/HTMLModule/Tidy/Transitional.php';
-require 'HTMLPurifier/HTMLModule/Tidy/XHTML.php';
-require 'HTMLPurifier/Injector/AutoParagraph.php';
-require 'HTMLPurifier/Injector/DisplayLinkURI.php';
-require 'HTMLPurifier/Injector/Linkify.php';
-require 'HTMLPurifier/Injector/PurifierLinkify.php';
-require 'HTMLPurifier/Injector/RemoveEmpty.php';
-require 'HTMLPurifier/Injector/SafeObject.php';
-require 'HTMLPurifier/Lexer/DOMLex.php';
-require 'HTMLPurifier/Lexer/DirectLex.php';
-require 'HTMLPurifier/Strategy/Composite.php';
-require 'HTMLPurifier/Strategy/Core.php';
-require 'HTMLPurifier/Strategy/FixNesting.php';
-require 'HTMLPurifier/Strategy/MakeWellFormed.php';
-require 'HTMLPurifier/Strategy/RemoveForeignElements.php';
-require 'HTMLPurifier/Strategy/ValidateAttributes.php';
-require 'HTMLPurifier/TagTransform/Font.php';
-require 'HTMLPurifier/TagTransform/Simple.php';
-require 'HTMLPurifier/Token/Comment.php';
-require 'HTMLPurifier/Token/Tag.php';
-require 'HTMLPurifier/Token/Empty.php';
-require 'HTMLPurifier/Token/End.php';
-require 'HTMLPurifier/Token/Start.php';
-require 'HTMLPurifier/Token/Text.php';
-require 'HTMLPurifier/URIFilter/DisableExternal.php';
-require 'HTMLPurifier/URIFilter/DisableExternalResources.php';
-require 'HTMLPurifier/URIFilter/HostBlacklist.php';
-require 'HTMLPurifier/URIFilter/MakeAbsolute.php';
-require 'HTMLPurifier/URIFilter/Munge.php';
-require 'HTMLPurifier/URIScheme/ftp.php';
-require 'HTMLPurifier/URIScheme/http.php';
-require 'HTMLPurifier/URIScheme/https.php';
-require 'HTMLPurifier/URIScheme/mailto.php';
-require 'HTMLPurifier/URIScheme/news.php';
-require 'HTMLPurifier/URIScheme/nntp.php';
-require 'HTMLPurifier/VarParser/Flexible.php';
-require 'HTMLPurifier/VarParser/Native.php';
diff --git a/lib/php/HTMLPurifier.kses.php b/lib/php/HTMLPurifier.kses.php
deleted file mode 100644
index 3143feb17f2f860cf135f423aaa4c72342fb325a..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier.kses.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * @file
- * Emulation layer for code that used kses(), substituting in HTML Purifier.
- */
-
-require_once dirname(__FILE__) . '/HTMLPurifier.auto.php';
-
-function kses($string, $allowed_html, $allowed_protocols = null) {
-    $config = HTMLPurifier_Config::createDefault();
-    $allowed_elements = array();
-    $allowed_attributes = array();
-    foreach ($allowed_html as $element => $attributes) {
-        $allowed_elements[$element] = true;
-        foreach ($attributes as $attribute => $x) {
-            $allowed_attributes["$element.$attribute"] = true;
-        }
-    }
-    $config->set('HTML.AllowedElements', $allowed_elements);
-    $config->set('HTML.AllowedAttributes', $allowed_attributes);
-    $allowed_schemes = array();
-    if ($allowed_protocols !== null) {
-        $config->set('URI.AllowedSchemes', $allowed_protocols);
-    }
-    $purifier = new HTMLPurifier($config);
-    return $purifier->purify($string);
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier.php b/lib/php/HTMLPurifier.php
deleted file mode 100644
index e3fce9c2a3462a883c2d64009703aeaaef51c48b..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-
-/*! @mainpage
- *
- * HTML Purifier is an HTML filter that will take an arbitrary snippet of
- * HTML and rigorously test, validate and filter it into a version that
- * is safe for output onto webpages. It achieves this by:
- *
- *  -# Lexing (parsing into tokens) the document,
- *  -# Executing various strategies on the tokens:
- *      -# Removing all elements not in the whitelist,
- *      -# Making the tokens well-formed,
- *      -# Fixing the nesting of the nodes, and
- *      -# Validating attributes of the nodes; and
- *  -# Generating HTML from the purified tokens.
- *
- * However, most users will only need to interface with the HTMLPurifier
- * and HTMLPurifier_Config.
- */
-
-/*
-    HTML Purifier 4.0.0 - Standards Compliant HTML Filtering
-    Copyright (C) 2006-2008 Edward Z. Yang
-
-    This library 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 2.1 of the License, or (at your option) any later version.
-
-    This library 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 library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/**
- * Facade that coordinates HTML Purifier's subsystems in order to purify HTML.
- *
- * @note There are several points in which configuration can be specified
- *       for HTML Purifier.  The precedence of these (from lowest to
- *       highest) is as follows:
- *          -# Instance: new HTMLPurifier($config)
- *          -# Invocation: purify($html, $config)
- *       These configurations are entirely independent of each other and
- *       are *not* merged (this behavior may change in the future).
- *
- * @todo We need an easier way to inject strategies using the configuration
- *       object.
- */
-class HTMLPurifier
-{
-
-    /** Version of HTML Purifier */
-    public $version = '4.0.0';
-
-    /** Constant with version of HTML Purifier */
-    const VERSION = '4.0.0';
-
-    /** Global configuration object */
-    public $config;
-
-    /** Array of extra HTMLPurifier_Filter objects to run on HTML, for backwards compatibility */
-    private $filters = array();
-
-    /** Single instance of HTML Purifier */
-    private static $instance;
-
-    protected $strategy, $generator;
-
-    /**
-     * Resultant HTMLPurifier_Context of last run purification. Is an array
-     * of contexts if the last called method was purifyArray().
-     */
-    public $context;
-
-    /**
-     * Initializes the purifier.
-     * @param $config Optional HTMLPurifier_Config object for all instances of
-     *                the purifier, if omitted, a default configuration is
-     *                supplied (which can be overridden on a per-use basis).
-     *                The parameter can also be any type that
-     *                HTMLPurifier_Config::create() supports.
-     */
-    public function __construct($config = null) {
-
-        $this->config = HTMLPurifier_Config::create($config);
-
-        $this->strategy     = new HTMLPurifier_Strategy_Core();
-
-    }
-
-    /**
-     * Adds a filter to process the output. First come first serve
-     * @param $filter HTMLPurifier_Filter object
-     */
-    public function addFilter($filter) {
-        trigger_error('HTMLPurifier->addFilter() is deprecated, use configuration directives in the Filter namespace or Filter.Custom', E_USER_WARNING);
-        $this->filters[] = $filter;
-    }
-
-    /**
-     * Filters an HTML snippet/document to be XSS-free and standards-compliant.
-     *
-     * @param $html String of HTML to purify
-     * @param $config HTMLPurifier_Config object for this operation, if omitted,
-     *                defaults to the config object specified during this
-     *                object's construction. The parameter can also be any type
-     *                that HTMLPurifier_Config::create() supports.
-     * @return Purified HTML
-     */
-    public function purify($html, $config = null) {
-
-        // :TODO: make the config merge in, instead of replace
-        $config = $config ? HTMLPurifier_Config::create($config) : $this->config;
-
-        // implementation is partially environment dependant, partially
-        // configuration dependant
-        $lexer = HTMLPurifier_Lexer::create($config);
-
-        $context = new HTMLPurifier_Context();
-
-        // setup HTML generator
-        $this->generator = new HTMLPurifier_Generator($config, $context);
-        $context->register('Generator', $this->generator);
-
-        // set up global context variables
-        if ($config->get('Core.CollectErrors')) {
-            // may get moved out if other facilities use it
-            $language_factory = HTMLPurifier_LanguageFactory::instance();
-            $language = $language_factory->create($config, $context);
-            $context->register('Locale', $language);
-
-            $error_collector = new HTMLPurifier_ErrorCollector($context);
-            $context->register('ErrorCollector', $error_collector);
-        }
-
-        // setup id_accumulator context, necessary due to the fact that
-        // AttrValidator can be called from many places
-        $id_accumulator = HTMLPurifier_IDAccumulator::build($config, $context);
-        $context->register('IDAccumulator', $id_accumulator);
-
-        $html = HTMLPurifier_Encoder::convertToUTF8($html, $config, $context);
-
-        // setup filters
-        $filter_flags = $config->getBatch('Filter');
-        $custom_filters = $filter_flags['Custom'];
-        unset($filter_flags['Custom']);
-        $filters = array();
-        foreach ($filter_flags as $filter => $flag) {
-            if (!$flag) continue;
-            if (strpos($filter, '.') !== false) continue;
-            $class = "HTMLPurifier_Filter_$filter";
-            $filters[] = new $class;
-        }
-        foreach ($custom_filters as $filter) {
-            // maybe "HTMLPurifier_Filter_$filter", but be consistent with AutoFormat
-            $filters[] = $filter;
-        }
-        $filters = array_merge($filters, $this->filters);
-        // maybe prepare(), but later
-
-        for ($i = 0, $filter_size = count($filters); $i < $filter_size; $i++) {
-            $html = $filters[$i]->preFilter($html, $config, $context);
-        }
-
-        // purified HTML
-        $html =
-            $this->generator->generateFromTokens(
-                // list of tokens
-                $this->strategy->execute(
-                    // list of un-purified tokens
-                    $lexer->tokenizeHTML(
-                        // un-purified HTML
-                        $html, $config, $context
-                    ),
-                    $config, $context
-                )
-            );
-
-        for ($i = $filter_size - 1; $i >= 0; $i--) {
-            $html = $filters[$i]->postFilter($html, $config, $context);
-        }
-
-        $html = HTMLPurifier_Encoder::convertFromUTF8($html, $config, $context);
-        $this->context =& $context;
-        return $html;
-    }
-
-    /**
-     * Filters an array of HTML snippets
-     * @param $config Optional HTMLPurifier_Config object for this operation.
-     *                See HTMLPurifier::purify() for more details.
-     * @return Array of purified HTML
-     */
-    public function purifyArray($array_of_html, $config = null) {
-        $context_array = array();
-        foreach ($array_of_html as $key => $html) {
-            $array_of_html[$key] = $this->purify($html, $config);
-            $context_array[$key] = $this->context;
-        }
-        $this->context = $context_array;
-        return $array_of_html;
-    }
-
-    /**
-     * Singleton for enforcing just one HTML Purifier in your system
-     * @param $prototype Optional prototype HTMLPurifier instance to
-     *                   overload singleton with, or HTMLPurifier_Config
-     *                   instance to configure the generated version with.
-     */
-    public static function instance($prototype = null) {
-        if (!self::$instance || $prototype) {
-            if ($prototype instanceof HTMLPurifier) {
-                self::$instance = $prototype;
-            } elseif ($prototype) {
-                self::$instance = new HTMLPurifier($prototype);
-            } else {
-                self::$instance = new HTMLPurifier();
-            }
-        }
-        return self::$instance;
-    }
-
-    /**
-     * @note Backwards compatibility, see instance()
-     */
-    public static function getInstance($prototype = null) {
-        return HTMLPurifier::instance($prototype);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier.safe-includes.php b/lib/php/HTMLPurifier.safe-includes.php
deleted file mode 100644
index cf2c1d617a4d2e402b877de907991d39e9c5f7ef..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier.safe-includes.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-
-/**
- * @file
- * This file was auto-generated by generate-includes.php and includes all of
- * the core files required by HTML Purifier. This is a convenience stub that
- * includes all files using dirname(__FILE__) and require_once. PLEASE DO NOT
- * EDIT THIS FILE, changes will be overwritten the next time the script is run.
- *
- * Changes to include_path are not necessary.
- */
-
-$__dir = dirname(__FILE__);
-
-require_once $__dir . '/HTMLPurifier.php';
-require_once $__dir . '/HTMLPurifier/AttrCollections.php';
-require_once $__dir . '/HTMLPurifier/AttrDef.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform.php';
-require_once $__dir . '/HTMLPurifier/AttrTypes.php';
-require_once $__dir . '/HTMLPurifier/AttrValidator.php';
-require_once $__dir . '/HTMLPurifier/Bootstrap.php';
-require_once $__dir . '/HTMLPurifier/Definition.php';
-require_once $__dir . '/HTMLPurifier/CSSDefinition.php';
-require_once $__dir . '/HTMLPurifier/ChildDef.php';
-require_once $__dir . '/HTMLPurifier/Config.php';
-require_once $__dir . '/HTMLPurifier/ConfigSchema.php';
-require_once $__dir . '/HTMLPurifier/ContentSets.php';
-require_once $__dir . '/HTMLPurifier/Context.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCacheFactory.php';
-require_once $__dir . '/HTMLPurifier/Doctype.php';
-require_once $__dir . '/HTMLPurifier/DoctypeRegistry.php';
-require_once $__dir . '/HTMLPurifier/ElementDef.php';
-require_once $__dir . '/HTMLPurifier/Encoder.php';
-require_once $__dir . '/HTMLPurifier/EntityLookup.php';
-require_once $__dir . '/HTMLPurifier/EntityParser.php';
-require_once $__dir . '/HTMLPurifier/ErrorCollector.php';
-require_once $__dir . '/HTMLPurifier/ErrorStruct.php';
-require_once $__dir . '/HTMLPurifier/Exception.php';
-require_once $__dir . '/HTMLPurifier/Filter.php';
-require_once $__dir . '/HTMLPurifier/Generator.php';
-require_once $__dir . '/HTMLPurifier/HTMLDefinition.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule.php';
-require_once $__dir . '/HTMLPurifier/HTMLModuleManager.php';
-require_once $__dir . '/HTMLPurifier/IDAccumulator.php';
-require_once $__dir . '/HTMLPurifier/Injector.php';
-require_once $__dir . '/HTMLPurifier/Language.php';
-require_once $__dir . '/HTMLPurifier/LanguageFactory.php';
-require_once $__dir . '/HTMLPurifier/Length.php';
-require_once $__dir . '/HTMLPurifier/Lexer.php';
-require_once $__dir . '/HTMLPurifier/PercentEncoder.php';
-require_once $__dir . '/HTMLPurifier/PropertyList.php';
-require_once $__dir . '/HTMLPurifier/PropertyListIterator.php';
-require_once $__dir . '/HTMLPurifier/Strategy.php';
-require_once $__dir . '/HTMLPurifier/StringHash.php';
-require_once $__dir . '/HTMLPurifier/StringHashParser.php';
-require_once $__dir . '/HTMLPurifier/TagTransform.php';
-require_once $__dir . '/HTMLPurifier/Token.php';
-require_once $__dir . '/HTMLPurifier/TokenFactory.php';
-require_once $__dir . '/HTMLPurifier/URI.php';
-require_once $__dir . '/HTMLPurifier/URIDefinition.php';
-require_once $__dir . '/HTMLPurifier/URIFilter.php';
-require_once $__dir . '/HTMLPurifier/URIParser.php';
-require_once $__dir . '/HTMLPurifier/URIScheme.php';
-require_once $__dir . '/HTMLPurifier/URISchemeRegistry.php';
-require_once $__dir . '/HTMLPurifier/UnitConverter.php';
-require_once $__dir . '/HTMLPurifier/VarParser.php';
-require_once $__dir . '/HTMLPurifier/VarParserException.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Enum.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Integer.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Lang.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Switch.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/Text.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Number.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/AlphaValue.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Background.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Border.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Color.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Composite.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Filter.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Font.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/FontFamily.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Length.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/ListStyle.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Multiple.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Percentage.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/TextDecoration.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/CSS/URI.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Bool.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Nmtokens.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Class.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Color.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/FrameTarget.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/ID.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Pixels.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Length.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/LinkTypes.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/HTML/MultiLength.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/Email.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/Host.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/IPv4.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/IPv6.php';
-require_once $__dir . '/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Background.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/BdoDir.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/BgColor.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/BoolToCSS.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Border.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/EnumToCSS.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/ImgRequired.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/ImgSpace.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Input.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Lang.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Length.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Name.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/NameSync.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/SafeEmbed.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/SafeObject.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/SafeParam.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/ScriptRequired.php';
-require_once $__dir . '/HTMLPurifier/AttrTransform/Textarea.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Chameleon.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Custom.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Empty.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Required.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Optional.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/StrictBlockquote.php';
-require_once $__dir . '/HTMLPurifier/ChildDef/Table.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Null.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Serializer.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
-require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator/Memory.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Bdo.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/CommonAttributes.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Edit.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Forms.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Hypertext.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Image.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Legacy.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/List.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Name.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Object.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Presentation.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Proprietary.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Ruby.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/SafeEmbed.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/SafeObject.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Scripting.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/StyleAttribute.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tables.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Target.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Text.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/XMLCommonAttributes.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Name.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Proprietary.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Strict.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Transitional.php';
-require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/XHTML.php';
-require_once $__dir . '/HTMLPurifier/Injector/AutoParagraph.php';
-require_once $__dir . '/HTMLPurifier/Injector/DisplayLinkURI.php';
-require_once $__dir . '/HTMLPurifier/Injector/Linkify.php';
-require_once $__dir . '/HTMLPurifier/Injector/PurifierLinkify.php';
-require_once $__dir . '/HTMLPurifier/Injector/RemoveEmpty.php';
-require_once $__dir . '/HTMLPurifier/Injector/SafeObject.php';
-require_once $__dir . '/HTMLPurifier/Lexer/DOMLex.php';
-require_once $__dir . '/HTMLPurifier/Lexer/DirectLex.php';
-require_once $__dir . '/HTMLPurifier/Strategy/Composite.php';
-require_once $__dir . '/HTMLPurifier/Strategy/Core.php';
-require_once $__dir . '/HTMLPurifier/Strategy/FixNesting.php';
-require_once $__dir . '/HTMLPurifier/Strategy/MakeWellFormed.php';
-require_once $__dir . '/HTMLPurifier/Strategy/RemoveForeignElements.php';
-require_once $__dir . '/HTMLPurifier/Strategy/ValidateAttributes.php';
-require_once $__dir . '/HTMLPurifier/TagTransform/Font.php';
-require_once $__dir . '/HTMLPurifier/TagTransform/Simple.php';
-require_once $__dir . '/HTMLPurifier/Token/Comment.php';
-require_once $__dir . '/HTMLPurifier/Token/Tag.php';
-require_once $__dir . '/HTMLPurifier/Token/Empty.php';
-require_once $__dir . '/HTMLPurifier/Token/End.php';
-require_once $__dir . '/HTMLPurifier/Token/Start.php';
-require_once $__dir . '/HTMLPurifier/Token/Text.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternal.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternalResources.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/HostBlacklist.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/MakeAbsolute.php';
-require_once $__dir . '/HTMLPurifier/URIFilter/Munge.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/ftp.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/http.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/https.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/mailto.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/news.php';
-require_once $__dir . '/HTMLPurifier/URIScheme/nntp.php';
-require_once $__dir . '/HTMLPurifier/VarParser/Flexible.php';
-require_once $__dir . '/HTMLPurifier/VarParser/Native.php';
diff --git a/lib/php/HTMLPurifier/AttrCollections.php b/lib/php/HTMLPurifier/AttrCollections.php
deleted file mode 100644
index 555b86d0428d7e3770ea58d1745d80d0bd2f73cf..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrCollections.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-/**
- * Defines common attribute collections that modules reference
- */
-
-class HTMLPurifier_AttrCollections
-{
-
-    /**
-     * Associative array of attribute collections, indexed by name
-     */
-    public $info = array();
-
-    /**
-     * Performs all expansions on internal data for use by other inclusions
-     * It also collects all attribute collection extensions from
-     * modules
-     * @param $attr_types HTMLPurifier_AttrTypes instance
-     * @param $modules Hash array of HTMLPurifier_HTMLModule members
-     */
-    public function __construct($attr_types, $modules) {
-        // load extensions from the modules
-        foreach ($modules as $module) {
-            foreach ($module->attr_collections as $coll_i => $coll) {
-                if (!isset($this->info[$coll_i])) {
-                    $this->info[$coll_i] = array();
-                }
-                foreach ($coll as $attr_i => $attr) {
-                    if ($attr_i === 0 && isset($this->info[$coll_i][$attr_i])) {
-                        // merge in includes
-                        $this->info[$coll_i][$attr_i] = array_merge(
-                            $this->info[$coll_i][$attr_i], $attr);
-                        continue;
-                    }
-                    $this->info[$coll_i][$attr_i] = $attr;
-                }
-            }
-        }
-        // perform internal expansions and inclusions
-        foreach ($this->info as $name => $attr) {
-            // merge attribute collections that include others
-            $this->performInclusions($this->info[$name]);
-            // replace string identifiers with actual attribute objects
-            $this->expandIdentifiers($this->info[$name], $attr_types);
-        }
-    }
-
-    /**
-     * Takes a reference to an attribute associative array and performs
-     * all inclusions specified by the zero index.
-     * @param &$attr Reference to attribute array
-     */
-    public function performInclusions(&$attr) {
-        if (!isset($attr[0])) return;
-        $merge = $attr[0];
-        $seen  = array(); // recursion guard
-        // loop through all the inclusions
-        for ($i = 0; isset($merge[$i]); $i++) {
-            if (isset($seen[$merge[$i]])) continue;
-            $seen[$merge[$i]] = true;
-            // foreach attribute of the inclusion, copy it over
-            if (!isset($this->info[$merge[$i]])) continue;
-            foreach ($this->info[$merge[$i]] as $key => $value) {
-                if (isset($attr[$key])) continue; // also catches more inclusions
-                $attr[$key] = $value;
-            }
-            if (isset($this->info[$merge[$i]][0])) {
-                // recursion
-                $merge = array_merge($merge, $this->info[$merge[$i]][0]);
-            }
-        }
-        unset($attr[0]);
-    }
-
-    /**
-     * Expands all string identifiers in an attribute array by replacing
-     * them with the appropriate values inside HTMLPurifier_AttrTypes
-     * @param &$attr Reference to attribute array
-     * @param $attr_types HTMLPurifier_AttrTypes instance
-     */
-    public function expandIdentifiers(&$attr, $attr_types) {
-
-        // because foreach will process new elements we add, make sure we
-        // skip duplicates
-        $processed = array();
-
-        foreach ($attr as $def_i => $def) {
-            // skip inclusions
-            if ($def_i === 0) continue;
-
-            if (isset($processed[$def_i])) continue;
-
-            // determine whether or not attribute is required
-            if ($required = (strpos($def_i, '*') !== false)) {
-                // rename the definition
-                unset($attr[$def_i]);
-                $def_i = trim($def_i, '*');
-                $attr[$def_i] = $def;
-            }
-
-            $processed[$def_i] = true;
-
-            // if we've already got a literal object, move on
-            if (is_object($def)) {
-                // preserve previous required
-                $attr[$def_i]->required = ($required || $attr[$def_i]->required);
-                continue;
-            }
-
-            if ($def === false) {
-                unset($attr[$def_i]);
-                continue;
-            }
-
-            if ($t = $attr_types->get($def)) {
-                $attr[$def_i] = $t;
-                $attr[$def_i]->required = $required;
-            } else {
-                unset($attr[$def_i]);
-            }
-        }
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef.php b/lib/php/HTMLPurifier/AttrDef.php
deleted file mode 100644
index d32fa62d6ad98b54c5915b3d96e2f1fbf7bb1a9f..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Base class for all validating attribute definitions.
- *
- * This family of classes forms the core for not only HTML attribute validation,
- * but also any sort of string that needs to be validated or cleaned (which
- * means CSS properties and composite definitions are defined here too).
- * Besides defining (through code) what precisely makes the string valid,
- * subclasses are also responsible for cleaning the code if possible.
- */
-
-abstract class HTMLPurifier_AttrDef
-{
-
-    /**
-     * Tells us whether or not an HTML attribute is minimized. Has no
-     * meaning in other contexts.
-     */
-    public $minimized = false;
-
-    /**
-     * Tells us whether or not an HTML attribute is required. Has no
-     * meaning in other contexts
-     */
-    public $required = false;
-
-    /**
-     * Validates and cleans passed string according to a definition.
-     *
-     * @param $string String to be validated and cleaned.
-     * @param $config Mandatory HTMLPurifier_Config object.
-     * @param $context Mandatory HTMLPurifier_AttrContext object.
-     */
-    abstract public function validate($string, $config, $context);
-
-    /**
-     * Convenience method that parses a string as if it were CDATA.
-     *
-     * This method process a string in the manner specified at
-     * <http://www.w3.org/TR/html4/types.html#h-6.2> by removing
-     * leading and trailing whitespace, ignoring line feeds, and replacing
-     * carriage returns and tabs with spaces.  While most useful for HTML
-     * attributes specified as CDATA, it can also be applied to most CSS
-     * values.
-     *
-     * @note This method is not entirely standards compliant, as trim() removes
-     *       more types of whitespace than specified in the spec. In practice,
-     *       this is rarely a problem, as those extra characters usually have
-     *       already been removed by HTMLPurifier_Encoder.
-     *
-     * @warning This processing is inconsistent with XML's whitespace handling
-     *          as specified by section 3.3.3 and referenced XHTML 1.0 section
-     *          4.7.  However, note that we are NOT necessarily
-     *          parsing XML, thus, this behavior may still be correct. We
-     *          assume that newlines have been normalized.
-     */
-    public function parseCDATA($string) {
-        $string = trim($string);
-        $string = str_replace(array("\n", "\t", "\r"), ' ', $string);
-        return $string;
-    }
-
-    /**
-     * Factory method for creating this class from a string.
-     * @param $string String construction info
-     * @return Created AttrDef object corresponding to $string
-     */
-    public function make($string) {
-        // default implementation, return a flyweight of this object.
-        // If $string has an effect on the returned object (i.e. you
-        // need to overload this method), it is best
-        // to clone or instantiate new copies. (Instantiation is safer.)
-        return $this;
-    }
-
-    /**
-     * Removes spaces from rgb(0, 0, 0) so that shorthand CSS properties work
-     * properly. THIS IS A HACK!
-     */
-    protected function mungeRgb($string) {
-        return preg_replace('/rgb\((\d+)\s*,\s*(\d+)\s*,\s*(\d+)\)/', 'rgb(\1,\2,\3)', $string);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS.php b/lib/php/HTMLPurifier/AttrDef/CSS.php
deleted file mode 100644
index 953e70675556b1074fcf18e946605b46efbd3052..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Validates the HTML attribute style, otherwise known as CSS.
- * @note We don't implement the whole CSS specification, so it might be
- *       difficult to reuse this component in the context of validating
- *       actual stylesheet declarations.
- * @note If we were really serious about validating the CSS, we would
- *       tokenize the styles and then parse the tokens. Obviously, we
- *       are not doing that. Doing that could seriously harm performance,
- *       but would make these components a lot more viable for a CSS
- *       filtering solution.
- */
-class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef
-{
-
-    public function validate($css, $config, $context) {
-
-        $css = $this->parseCDATA($css);
-
-        $definition = $config->getCSSDefinition();
-
-        // we're going to break the spec and explode by semicolons.
-        // This is because semicolon rarely appears in escaped form
-        // Doing this is generally flaky but fast
-        // IT MIGHT APPEAR IN URIs, see HTMLPurifier_AttrDef_CSSURI
-        // for details
-
-        $declarations = explode(';', $css);
-        $propvalues = array();
-
-        /**
-         * Name of the current CSS property being validated.
-         */
-        $property = false;
-        $context->register('CurrentCSSProperty', $property);
-
-        foreach ($declarations as $declaration) {
-            if (!$declaration) continue;
-            if (!strpos($declaration, ':')) continue;
-            list($property, $value) = explode(':', $declaration, 2);
-            $property = trim($property);
-            $value    = trim($value);
-            $ok = false;
-            do {
-                if (isset($definition->info[$property])) {
-                    $ok = true;
-                    break;
-                }
-                if (ctype_lower($property)) break;
-                $property = strtolower($property);
-                if (isset($definition->info[$property])) {
-                    $ok = true;
-                    break;
-                }
-            } while(0);
-            if (!$ok) continue;
-            // inefficient call, since the validator will do this again
-            if (strtolower(trim($value)) !== 'inherit') {
-                // inherit works for everything (but only on the base property)
-                $result = $definition->info[$property]->validate(
-                    $value, $config, $context );
-            } else {
-                $result = 'inherit';
-            }
-            if ($result === false) continue;
-            $propvalues[$property] = $result;
-        }
-
-        $context->destroy('CurrentCSSProperty');
-
-        // procedure does not write the new CSS simultaneously, so it's
-        // slightly inefficient, but it's the only way of getting rid of
-        // duplicates. Perhaps config to optimize it, but not now.
-
-        $new_declarations = '';
-        foreach ($propvalues as $prop => $value) {
-            $new_declarations .= "$prop:$value;";
-        }
-
-        return $new_declarations ? $new_declarations : false;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS/AlphaValue.php b/lib/php/HTMLPurifier/AttrDef/CSS/AlphaValue.php
deleted file mode 100644
index 292c040d4bd525f708add43159301302eb717ff1..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS/AlphaValue.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-class HTMLPurifier_AttrDef_CSS_AlphaValue extends HTMLPurifier_AttrDef_CSS_Number
-{
-
-    public function __construct() {
-        parent::__construct(false); // opacity is non-negative, but we will clamp it
-    }
-
-    public function validate($number, $config, $context) {
-        $result = parent::validate($number, $config, $context);
-        if ($result === false) return $result;
-        $float = (float) $result;
-        if ($float < 0.0) $result = '0';
-        if ($float > 1.0) $result = '1';
-        return $result;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS/Background.php b/lib/php/HTMLPurifier/AttrDef/CSS/Background.php
deleted file mode 100644
index 3a3d20cd6a7cb830204d2b1f8cfce3f05a5f8a9c..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS/Background.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Validates shorthand CSS property background.
- * @warning Does not support url tokens that have internal spaces.
- */
-class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Local copy of component validators.
-     * @note See HTMLPurifier_AttrDef_Font::$info for a similar impl.
-     */
-    protected $info;
-
-    public function __construct($config) {
-        $def = $config->getCSSDefinition();
-        $this->info['background-color'] = $def->info['background-color'];
-        $this->info['background-image'] = $def->info['background-image'];
-        $this->info['background-repeat'] = $def->info['background-repeat'];
-        $this->info['background-attachment'] = $def->info['background-attachment'];
-        $this->info['background-position'] = $def->info['background-position'];
-    }
-
-    public function validate($string, $config, $context) {
-
-        // regular pre-processing
-        $string = $this->parseCDATA($string);
-        if ($string === '') return false;
-
-        // munge rgb() decl if necessary
-        $string = $this->mungeRgb($string);
-
-        // assumes URI doesn't have spaces in it
-        $bits = explode(' ', strtolower($string)); // bits to process
-
-        $caught = array();
-        $caught['color']    = false;
-        $caught['image']    = false;
-        $caught['repeat']   = false;
-        $caught['attachment'] = false;
-        $caught['position'] = false;
-
-        $i = 0; // number of catches
-        $none = false;
-
-        foreach ($bits as $bit) {
-            if ($bit === '') continue;
-            foreach ($caught as $key => $status) {
-                if ($key != 'position') {
-                    if ($status !== false) continue;
-                    $r = $this->info['background-' . $key]->validate($bit, $config, $context);
-                } else {
-                    $r = $bit;
-                }
-                if ($r === false) continue;
-                if ($key == 'position') {
-                    if ($caught[$key] === false) $caught[$key] = '';
-                    $caught[$key] .= $r . ' ';
-                } else {
-                    $caught[$key] = $r;
-                }
-                $i++;
-                break;
-            }
-        }
-
-        if (!$i) return false;
-        if ($caught['position'] !== false) {
-            $caught['position'] = $this->info['background-position']->
-                validate($caught['position'], $config, $context);
-        }
-
-        $ret = array();
-        foreach ($caught as $value) {
-            if ($value === false) continue;
-            $ret[] = $value;
-        }
-
-        if (empty($ret)) return false;
-        return implode(' ', $ret);
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php b/lib/php/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
deleted file mode 100644
index 35df3985e23dbb8a347334b1a92ad37b5996c255..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-/* W3C says:
-    [ // adjective and number must be in correct order, even if
-      // you could switch them without introducing ambiguity.
-      // some browsers support that syntax
-        [
-            <percentage> | <length> | left | center | right
-        ]
-        [
-            <percentage> | <length> | top | center | bottom
-        ]?
-    ] |
-    [ // this signifies that the vertical and horizontal adjectives
-      // can be arbitrarily ordered, however, there can only be two,
-      // one of each, or none at all
-        [
-            left | center | right
-        ] ||
-        [
-            top | center | bottom
-        ]
-    ]
-    top, left = 0%
-    center, (none) = 50%
-    bottom, right = 100%
-*/
-
-/* QuirksMode says:
-    keyword + length/percentage must be ordered correctly, as per W3C
-
-    Internet Explorer and Opera, however, support arbitrary ordering. We
-    should fix it up.
-
-    Minor issue though, not strictly necessary.
-*/
-
-// control freaks may appreciate the ability to convert these to
-// percentages or something, but it's not necessary
-
-/**
- * Validates the value of background-position.
- */
-class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
-{
-
-    protected $length;
-    protected $percentage;
-
-    public function __construct() {
-        $this->length     = new HTMLPurifier_AttrDef_CSS_Length();
-        $this->percentage = new HTMLPurifier_AttrDef_CSS_Percentage();
-    }
-
-    public function validate($string, $config, $context) {
-        $string = $this->parseCDATA($string);
-        $bits = explode(' ', $string);
-
-        $keywords = array();
-        $keywords['h'] = false; // left, right
-        $keywords['v'] = false; // top, bottom
-        $keywords['c'] = false; // center
-        $measures = array();
-
-        $i = 0;
-
-        $lookup = array(
-            'top' => 'v',
-            'bottom' => 'v',
-            'left' => 'h',
-            'right' => 'h',
-            'center' => 'c'
-        );
-
-        foreach ($bits as $bit) {
-            if ($bit === '') continue;
-
-            // test for keyword
-            $lbit = ctype_lower($bit) ? $bit : strtolower($bit);
-            if (isset($lookup[$lbit])) {
-                $status = $lookup[$lbit];
-                $keywords[$status] = $lbit;
-                $i++;
-            }
-
-            // test for length
-            $r = $this->length->validate($bit, $config, $context);
-            if ($r !== false) {
-                $measures[] = $r;
-                $i++;
-            }
-
-            // test for percentage
-            $r = $this->percentage->validate($bit, $config, $context);
-            if ($r !== false) {
-                $measures[] = $r;
-                $i++;
-            }
-
-        }
-
-        if (!$i) return false; // no valid values were caught
-
-
-        $ret = array();
-
-        // first keyword
-        if     ($keywords['h'])     $ret[] = $keywords['h'];
-        elseif (count($measures))   $ret[] = array_shift($measures);
-        elseif ($keywords['c']) {
-            $ret[] = $keywords['c'];
-            $keywords['c'] = false; // prevent re-use: center = center center
-        }
-
-        if     ($keywords['v'])     $ret[] = $keywords['v'];
-        elseif (count($measures))   $ret[] = array_shift($measures);
-        elseif ($keywords['c'])     $ret[] = $keywords['c'];
-
-        if (empty($ret)) return false;
-        return implode(' ', $ret);
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS/Border.php b/lib/php/HTMLPurifier/AttrDef/CSS/Border.php
deleted file mode 100644
index 42a1d1b4ae36290be99d29a24d7ee2c67a01abdc..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS/Border.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Validates the border property as defined by CSS.
- */
-class HTMLPurifier_AttrDef_CSS_Border extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Local copy of properties this property is shorthand for.
-     */
-    protected $info = array();
-
-    public function __construct($config) {
-        $def = $config->getCSSDefinition();
-        $this->info['border-width'] = $def->info['border-width'];
-        $this->info['border-style'] = $def->info['border-style'];
-        $this->info['border-top-color'] = $def->info['border-top-color'];
-    }
-
-    public function validate($string, $config, $context) {
-        $string = $this->parseCDATA($string);
-        $string = $this->mungeRgb($string);
-        $bits = explode(' ', $string);
-        $done = array(); // segments we've finished
-        $ret = ''; // return value
-        foreach ($bits as $bit) {
-            foreach ($this->info as $propname => $validator) {
-                if (isset($done[$propname])) continue;
-                $r = $validator->validate($bit, $config, $context);
-                if ($r !== false) {
-                    $ret .= $r . ' ';
-                    $done[$propname] = true;
-                    break;
-                }
-            }
-        }
-        return rtrim($ret);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS/Color.php b/lib/php/HTMLPurifier/AttrDef/CSS/Color.php
deleted file mode 100644
index 07f95a6719149ca6919d8143c80ead8f24bd54aa..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS/Color.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * Validates Color as defined by CSS.
- */
-class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef
-{
-
-    public function validate($color, $config, $context) {
-
-        static $colors = null;
-        if ($colors === null) $colors = $config->get('Core.ColorKeywords');
-
-        $color = trim($color);
-        if ($color === '') return false;
-
-        $lower = strtolower($color);
-        if (isset($colors[$lower])) return $colors[$lower];
-
-        if (strpos($color, 'rgb(') !== false) {
-            // rgb literal handling
-            $length = strlen($color);
-            if (strpos($color, ')') !== $length - 1) return false;
-            $triad = substr($color, 4, $length - 4 - 1);
-            $parts = explode(',', $triad);
-            if (count($parts) !== 3) return false;
-            $type = false; // to ensure that they're all the same type
-            $new_parts = array();
-            foreach ($parts as $part) {
-                $part = trim($part);
-                if ($part === '') return false;
-                $length = strlen($part);
-                if ($part[$length - 1] === '%') {
-                    // handle percents
-                    if (!$type) {
-                        $type = 'percentage';
-                    } elseif ($type !== 'percentage') {
-                        return false;
-                    }
-                    $num = (float) substr($part, 0, $length - 1);
-                    if ($num < 0) $num = 0;
-                    if ($num > 100) $num = 100;
-                    $new_parts[] = "$num%";
-                } else {
-                    // handle integers
-                    if (!$type) {
-                        $type = 'integer';
-                    } elseif ($type !== 'integer') {
-                        return false;
-                    }
-                    $num = (int) $part;
-                    if ($num < 0) $num = 0;
-                    if ($num > 255) $num = 255;
-                    $new_parts[] = (string) $num;
-                }
-            }
-            $new_triad = implode(',', $new_parts);
-            $color = "rgb($new_triad)";
-        } else {
-            // hexadecimal handling
-            if ($color[0] === '#') {
-                $hex = substr($color, 1);
-            } else {
-                $hex = $color;
-                $color = '#' . $color;
-            }
-            $length = strlen($hex);
-            if ($length !== 3 && $length !== 6) return false;
-            if (!ctype_xdigit($hex)) return false;
-        }
-
-        return $color;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS/Composite.php b/lib/php/HTMLPurifier/AttrDef/CSS/Composite.php
deleted file mode 100644
index de1289cba8af47101e3ae09e0fc92de2fd061f95..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS/Composite.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * Allows multiple validators to attempt to validate attribute.
- *
- * Composite is just what it sounds like: a composite of many validators.
- * This means that multiple HTMLPurifier_AttrDef objects will have a whack
- * at the string.  If one of them passes, that's what is returned.  This is
- * especially useful for CSS values, which often are a choice between
- * an enumerated set of predefined values or a flexible data type.
- */
-class HTMLPurifier_AttrDef_CSS_Composite extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * List of HTMLPurifier_AttrDef objects that may process strings
-     * @todo Make protected
-     */
-    public $defs;
-
-    /**
-     * @param $defs List of HTMLPurifier_AttrDef objects
-     */
-    public function __construct($defs) {
-        $this->defs = $defs;
-    }
-
-    public function validate($string, $config, $context) {
-        foreach ($this->defs as $i => $def) {
-            $result = $this->defs[$i]->validate($string, $config, $context);
-            if ($result !== false) return $result;
-        }
-        return false;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php b/lib/php/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
deleted file mode 100644
index 6599c5b2ddcee7afbfb9935027b2559e22845e05..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Decorator which enables CSS properties to be disabled for specific elements.
- */
-class HTMLPurifier_AttrDef_CSS_DenyElementDecorator extends HTMLPurifier_AttrDef
-{
-    public $def, $element;
-
-    /**
-     * @param $def Definition to wrap
-     * @param $element Element to deny
-     */
-    public function __construct($def, $element) {
-        $this->def = $def;
-        $this->element = $element;
-    }
-    /**
-     * Checks if CurrentToken is set and equal to $this->element
-     */
-    public function validate($string, $config, $context) {
-        $token = $context->get('CurrentToken', true);
-        if ($token && $token->name == $this->element) return false;
-        return $this->def->validate($string, $config, $context);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS/Filter.php b/lib/php/HTMLPurifier/AttrDef/CSS/Filter.php
deleted file mode 100644
index 147894b8619719ada179523f30371b871292d2b7..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS/Filter.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * Microsoft's proprietary filter: CSS property
- * @note Currently supports the alpha filter. In the future, this will
- *       probably need an extensible framework
- */
-class HTMLPurifier_AttrDef_CSS_Filter extends HTMLPurifier_AttrDef
-{
-
-    protected $intValidator;
-
-    public function __construct() {
-        $this->intValidator = new HTMLPurifier_AttrDef_Integer();
-    }
-
-    public function validate($value, $config, $context) {
-        $value = $this->parseCDATA($value);
-        if ($value === 'none') return $value;
-        // if we looped this we could support multiple filters
-        $function_length = strcspn($value, '(');
-        $function = trim(substr($value, 0, $function_length));
-        if ($function !== 'alpha' &&
-            $function !== 'Alpha' &&
-            $function !== 'progid:DXImageTransform.Microsoft.Alpha'
-            ) return false;
-        $cursor = $function_length + 1;
-        $parameters_length = strcspn($value, ')', $cursor);
-        $parameters = substr($value, $cursor, $parameters_length);
-        $params = explode(',', $parameters);
-        $ret_params = array();
-        $lookup = array();
-        foreach ($params as $param) {
-            list($key, $value) = explode('=', $param);
-            $key   = trim($key);
-            $value = trim($value);
-            if (isset($lookup[$key])) continue;
-            if ($key !== 'opacity') continue;
-            $value = $this->intValidator->validate($value, $config, $context);
-            if ($value === false) continue;
-            $int = (int) $value;
-            if ($int > 100) $value = '100';
-            if ($int < 0) $value = '0';
-            $ret_params[] = "$key=$value";
-            $lookup[$key] = true;
-        }
-        $ret_parameters = implode(',', $ret_params);
-        $ret_function = "$function($ret_parameters)";
-        return $ret_function;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS/Font.php b/lib/php/HTMLPurifier/AttrDef/CSS/Font.php
deleted file mode 100644
index 699ee0b7012a6d1a5d951d7598ab528247b579b8..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS/Font.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-/**
- * Validates shorthand CSS property font.
- */
-class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Local copy of component validators.
-     *
-     * @note If we moved specific CSS property definitions to their own
-     *       classes instead of having them be assembled at run time by
-     *       CSSDefinition, this wouldn't be necessary.  We'd instantiate
-     *       our own copies.
-     */
-    protected $info = array();
-
-    public function __construct($config) {
-        $def = $config->getCSSDefinition();
-        $this->info['font-style']   = $def->info['font-style'];
-        $this->info['font-variant'] = $def->info['font-variant'];
-        $this->info['font-weight']  = $def->info['font-weight'];
-        $this->info['font-size']    = $def->info['font-size'];
-        $this->info['line-height']  = $def->info['line-height'];
-        $this->info['font-family']  = $def->info['font-family'];
-    }
-
-    public function validate($string, $config, $context) {
-
-        static $system_fonts = array(
-            'caption' => true,
-            'icon' => true,
-            'menu' => true,
-            'message-box' => true,
-            'small-caption' => true,
-            'status-bar' => true
-        );
-
-        // regular pre-processing
-        $string = $this->parseCDATA($string);
-        if ($string === '') return false;
-
-        // check if it's one of the keywords
-        $lowercase_string = strtolower($string);
-        if (isset($system_fonts[$lowercase_string])) {
-            return $lowercase_string;
-        }
-
-        $bits = explode(' ', $string); // bits to process
-        $stage = 0; // this indicates what we're looking for
-        $caught = array(); // which stage 0 properties have we caught?
-        $stage_1 = array('font-style', 'font-variant', 'font-weight');
-        $final = ''; // output
-
-        for ($i = 0, $size = count($bits); $i < $size; $i++) {
-            if ($bits[$i] === '') continue;
-            switch ($stage) {
-
-                // attempting to catch font-style, font-variant or font-weight
-                case 0:
-                    foreach ($stage_1 as $validator_name) {
-                        if (isset($caught[$validator_name])) continue;
-                        $r = $this->info[$validator_name]->validate(
-                                                $bits[$i], $config, $context);
-                        if ($r !== false) {
-                            $final .= $r . ' ';
-                            $caught[$validator_name] = true;
-                            break;
-                        }
-                    }
-                    // all three caught, continue on
-                    if (count($caught) >= 3) $stage = 1;
-                    if ($r !== false) break;
-
-                // attempting to catch font-size and perhaps line-height
-                case 1:
-                    $found_slash = false;
-                    if (strpos($bits[$i], '/') !== false) {
-                        list($font_size, $line_height) =
-                                                    explode('/', $bits[$i]);
-                        if ($line_height === '') {
-                            // ooh, there's a space after the slash!
-                            $line_height = false;
-                            $found_slash = true;
-                        }
-                    } else {
-                        $font_size = $bits[$i];
-                        $line_height = false;
-                    }
-                    $r = $this->info['font-size']->validate(
-                                              $font_size, $config, $context);
-                    if ($r !== false) {
-                        $final .= $r;
-                        // attempt to catch line-height
-                        if ($line_height === false) {
-                            // we need to scroll forward
-                            for ($j = $i + 1; $j < $size; $j++) {
-                                if ($bits[$j] === '') continue;
-                                if ($bits[$j] === '/') {
-                                    if ($found_slash) {
-                                        return false;
-                                    } else {
-                                        $found_slash = true;
-                                        continue;
-                                    }
-                                }
-                                $line_height = $bits[$j];
-                                break;
-                            }
-                        } else {
-                            // slash already found
-                            $found_slash = true;
-                            $j = $i;
-                        }
-                        if ($found_slash) {
-                            $i = $j;
-                            $r = $this->info['line-height']->validate(
-                                              $line_height, $config, $context);
-                            if ($r !== false) {
-                                $final .= '/' . $r;
-                            }
-                        }
-                        $final .= ' ';
-                        $stage = 2;
-                        break;
-                    }
-                    return false;
-
-                // attempting to catch font-family
-                case 2:
-                    $font_family =
-                        implode(' ', array_slice($bits, $i, $size - $i));
-                    $r = $this->info['font-family']->validate(
-                                              $font_family, $config, $context);
-                    if ($r !== false) {
-                        $final .= $r . ' ';
-                        // processing completed successfully
-                        return rtrim($final);
-                    }
-                    return false;
-            }
-        }
-        return false;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS/FontFamily.php b/lib/php/HTMLPurifier/AttrDef/CSS/FontFamily.php
deleted file mode 100644
index 705ac893d1be4ffa6512730a076ada9401c6e2a6..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS/FontFamily.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * Validates a font family list according to CSS spec
- * @todo whitelisting allowed fonts would be nice
- */
-class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
-{
-
-    public function validate($string, $config, $context) {
-        static $generic_names = array(
-            'serif' => true,
-            'sans-serif' => true,
-            'monospace' => true,
-            'fantasy' => true,
-            'cursive' => true
-        );
-
-        // assume that no font names contain commas in them
-        $fonts = explode(',', $string);
-        $final = '';
-        foreach($fonts as $font) {
-            $font = trim($font);
-            if ($font === '') continue;
-            // match a generic name
-            if (isset($generic_names[$font])) {
-                $final .= $font . ', ';
-                continue;
-            }
-            // match a quoted name
-            if ($font[0] === '"' || $font[0] === "'") {
-                $length = strlen($font);
-                if ($length <= 2) continue;
-                $quote = $font[0];
-                if ($font[$length - 1] !== $quote) continue;
-                $font = substr($font, 1, $length - 2);
-
-                $new_font = '';
-                for ($i = 0, $c = strlen($font); $i < $c; $i++) {
-                    if ($font[$i] === '\\') {
-                        $i++;
-                        if ($i >= $c) {
-                            $new_font .= '\\';
-                            break;
-                        }
-                        if (ctype_xdigit($font[$i])) {
-                            $code = $font[$i];
-                            for ($a = 1, $i++; $i < $c && $a < 6; $i++, $a++) {
-                                if (!ctype_xdigit($font[$i])) break;
-                                $code .= $font[$i];
-                            }
-                            // We have to be extremely careful when adding
-                            // new characters, to make sure we're not breaking
-                            // the encoding.
-                            $char = HTMLPurifier_Encoder::unichr(hexdec($code));
-                            if (HTMLPurifier_Encoder::cleanUTF8($char) === '') continue;
-                            $new_font .= $char;
-                            if ($i < $c && trim($font[$i]) !== '') $i--;
-                            continue;
-                        }
-                        if ($font[$i] === "\n") continue;
-                    }
-                    $new_font .= $font[$i];
-                }
-
-                $font = $new_font;
-            }
-            // $font is a pure representation of the font name
-
-            if (ctype_alnum($font) && $font !== '') {
-                // very simple font, allow it in unharmed
-                $final .= $font . ', ';
-                continue;
-            }
-
-            // complicated font, requires quoting
-
-            // armor single quotes and new lines
-            $font = str_replace("\\", "\\\\", $font);
-            $font = str_replace("'", "\\'", $font);
-            $final .= "'$font', ";
-        }
-        $final = rtrim($final, ', ');
-        if ($final === '') return false;
-        return $final;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php b/lib/php/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
deleted file mode 100644
index 4e6b35e5a0dffd031b35963945e71d6dee00ca41..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Decorator which enables !important to be used in CSS values.
- */
-class HTMLPurifier_AttrDef_CSS_ImportantDecorator extends HTMLPurifier_AttrDef
-{
-    public $def, $allow;
-
-    /**
-     * @param $def Definition to wrap
-     * @param $allow Whether or not to allow !important
-     */
-    public function __construct($def, $allow = false) {
-        $this->def = $def;
-        $this->allow = $allow;
-    }
-    /**
-     * Intercepts and removes !important if necessary
-     */
-    public function validate($string, $config, $context) {
-        // test for ! and important tokens
-        $string = trim($string);
-        $is_important = false;
-        // :TODO: optimization: test directly for !important and ! important
-        if (strlen($string) >= 9 && substr($string, -9) === 'important') {
-            $temp = rtrim(substr($string, 0, -9));
-            // use a temp, because we might want to restore important
-            if (strlen($temp) >= 1 && substr($temp, -1) === '!') {
-                $string = rtrim(substr($temp, 0, -1));
-                $is_important = true;
-            }
-        }
-        $string = $this->def->validate($string, $config, $context);
-        if ($this->allow && $is_important) $string .= ' !important';
-        return $string;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS/Length.php b/lib/php/HTMLPurifier/AttrDef/CSS/Length.php
deleted file mode 100644
index a07ec58135c05525b6a66489574ef2463993d161..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS/Length.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * Represents a Length as defined by CSS.
- */
-class HTMLPurifier_AttrDef_CSS_Length extends HTMLPurifier_AttrDef
-{
-
-    protected $min, $max;
-
-    /**
-     * @param HTMLPurifier_Length $max Minimum length, or null for no bound. String is also acceptable.
-     * @param HTMLPurifier_Length $max Maximum length, or null for no bound. String is also acceptable.
-     */
-    public function __construct($min = null, $max = null) {
-        $this->min = $min !== null ? HTMLPurifier_Length::make($min) : null;
-        $this->max = $max !== null ? HTMLPurifier_Length::make($max) : null;
-    }
-
-    public function validate($string, $config, $context) {
-        $string = $this->parseCDATA($string);
-
-        // Optimizations
-        if ($string === '') return false;
-        if ($string === '0') return '0';
-        if (strlen($string) === 1) return false;
-
-        $length = HTMLPurifier_Length::make($string);
-        if (!$length->isValid()) return false;
-
-        if ($this->min) {
-            $c = $length->compareTo($this->min);
-            if ($c === false) return false;
-            if ($c < 0) return false;
-        }
-        if ($this->max) {
-            $c = $length->compareTo($this->max);
-            if ($c === false) return false;
-            if ($c > 0) return false;
-        }
-
-        return $length->toString();
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS/ListStyle.php b/lib/php/HTMLPurifier/AttrDef/CSS/ListStyle.php
deleted file mode 100644
index 4406868c08b0b2d1e497ac4c1cd9694ca996a6b5..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS/ListStyle.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * Validates shorthand CSS property list-style.
- * @warning Does not support url tokens that have internal spaces.
- */
-class HTMLPurifier_AttrDef_CSS_ListStyle extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Local copy of component validators.
-     * @note See HTMLPurifier_AttrDef_CSS_Font::$info for a similar impl.
-     */
-    protected $info;
-
-    public function __construct($config) {
-        $def = $config->getCSSDefinition();
-        $this->info['list-style-type']     = $def->info['list-style-type'];
-        $this->info['list-style-position'] = $def->info['list-style-position'];
-        $this->info['list-style-image'] = $def->info['list-style-image'];
-    }
-
-    public function validate($string, $config, $context) {
-
-        // regular pre-processing
-        $string = $this->parseCDATA($string);
-        if ($string === '') return false;
-
-        // assumes URI doesn't have spaces in it
-        $bits = explode(' ', strtolower($string)); // bits to process
-
-        $caught = array();
-        $caught['type']     = false;
-        $caught['position'] = false;
-        $caught['image']    = false;
-
-        $i = 0; // number of catches
-        $none = false;
-
-        foreach ($bits as $bit) {
-            if ($i >= 3) return; // optimization bit
-            if ($bit === '') continue;
-            foreach ($caught as $key => $status) {
-                if ($status !== false) continue;
-                $r = $this->info['list-style-' . $key]->validate($bit, $config, $context);
-                if ($r === false) continue;
-                if ($r === 'none') {
-                    if ($none) continue;
-                    else $none = true;
-                    if ($key == 'image') continue;
-                }
-                $caught[$key] = $r;
-                $i++;
-                break;
-            }
-        }
-
-        if (!$i) return false;
-
-        $ret = array();
-
-        // construct type
-        if ($caught['type']) $ret[] = $caught['type'];
-
-        // construct image
-        if ($caught['image']) $ret[] = $caught['image'];
-
-        // construct position
-        if ($caught['position']) $ret[] = $caught['position'];
-
-        if (empty($ret)) return false;
-        return implode(' ', $ret);
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS/Multiple.php b/lib/php/HTMLPurifier/AttrDef/CSS/Multiple.php
deleted file mode 100644
index 4d62a40d7fc6a6abb3a834e3f80139deb39a8ada..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS/Multiple.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Framework class for strings that involve multiple values.
- *
- * Certain CSS properties such as border-width and margin allow multiple
- * lengths to be specified.  This class can take a vanilla border-width
- * definition and multiply it, usually into a max of four.
- *
- * @note Even though the CSS specification isn't clear about it, inherit
- *       can only be used alone: it will never manifest as part of a multi
- *       shorthand declaration.  Thus, this class does not allow inherit.
- */
-class HTMLPurifier_AttrDef_CSS_Multiple extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Instance of component definition to defer validation to.
-     * @todo Make protected
-     */
-    public $single;
-
-    /**
-     * Max number of values allowed.
-     * @todo Make protected
-     */
-    public $max;
-
-    /**
-     * @param $single HTMLPurifier_AttrDef to multiply
-     * @param $max Max number of values allowed (usually four)
-     */
-    public function __construct($single, $max = 4) {
-        $this->single = $single;
-        $this->max = $max;
-    }
-
-    public function validate($string, $config, $context) {
-        $string = $this->parseCDATA($string);
-        if ($string === '') return false;
-        $parts = explode(' ', $string); // parseCDATA replaced \r, \t and \n
-        $length = count($parts);
-        $final = '';
-        for ($i = 0, $num = 0; $i < $length && $num < $this->max; $i++) {
-            if (ctype_space($parts[$i])) continue;
-            $result = $this->single->validate($parts[$i], $config, $context);
-            if ($result !== false) {
-                $final .= $result . ' ';
-                $num++;
-            }
-        }
-        if ($final === '') return false;
-        return rtrim($final);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS/Number.php b/lib/php/HTMLPurifier/AttrDef/CSS/Number.php
deleted file mode 100644
index 3f99e12ec26f8a35cb79b942a74a20021c1b0007..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS/Number.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * Validates a number as defined by the CSS spec.
- */
-class HTMLPurifier_AttrDef_CSS_Number extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Bool indicating whether or not only positive values allowed.
-     */
-    protected $non_negative = false;
-
-    /**
-     * @param $non_negative Bool indicating whether negatives are forbidden
-     */
-    public function __construct($non_negative = false) {
-        $this->non_negative = $non_negative;
-    }
-
-    /**
-     * @warning Some contexts do not pass $config, $context. These
-     *          variables should not be used without checking HTMLPurifier_Length
-     */
-    public function validate($number, $config, $context) {
-
-        $number = $this->parseCDATA($number);
-
-        if ($number === '') return false;
-        if ($number === '0') return '0';
-
-        $sign = '';
-        switch ($number[0]) {
-            case '-':
-                if ($this->non_negative) return false;
-                $sign = '-';
-            case '+':
-                $number = substr($number, 1);
-        }
-
-        if (ctype_digit($number)) {
-            $number = ltrim($number, '0');
-            return $number ? $sign . $number : '0';
-        }
-
-        // Period is the only non-numeric character allowed
-        if (strpos($number, '.') === false) return false;
-
-        list($left, $right) = explode('.', $number, 2);
-
-        if ($left === '' && $right === '') return false;
-        if ($left !== '' && !ctype_digit($left)) return false;
-
-        $left  = ltrim($left,  '0');
-        $right = rtrim($right, '0');
-
-        if ($right === '') {
-            return $left ? $sign . $left : '0';
-        } elseif (!ctype_digit($right)) {
-            return false;
-        }
-
-        return $sign . $left . '.' . $right;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS/Percentage.php b/lib/php/HTMLPurifier/AttrDef/CSS/Percentage.php
deleted file mode 100644
index c34b8fc3c392b90fa09652d6af38742937948c41..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS/Percentage.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Validates a Percentage as defined by the CSS spec.
- */
-class HTMLPurifier_AttrDef_CSS_Percentage extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Instance of HTMLPurifier_AttrDef_CSS_Number to defer number validation
-     */
-    protected $number_def;
-
-    /**
-     * @param Bool indicating whether to forbid negative values
-     */
-    public function __construct($non_negative = false) {
-        $this->number_def = new HTMLPurifier_AttrDef_CSS_Number($non_negative);
-    }
-
-    public function validate($string, $config, $context) {
-
-        $string = $this->parseCDATA($string);
-
-        if ($string === '') return false;
-        $length = strlen($string);
-        if ($length === 1) return false;
-        if ($string[$length - 1] !== '%') return false;
-
-        $number = substr($string, 0, $length - 1);
-        $number = $this->number_def->validate($number, $config, $context);
-
-        if ($number === false) return false;
-        return "$number%";
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS/TextDecoration.php b/lib/php/HTMLPurifier/AttrDef/CSS/TextDecoration.php
deleted file mode 100644
index 772c922d80bde9e3ca6f24db8ebef6b20132adf5..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS/TextDecoration.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * Validates the value for the CSS property text-decoration
- * @note This class could be generalized into a version that acts sort of
- *       like Enum except you can compound the allowed values.
- */
-class HTMLPurifier_AttrDef_CSS_TextDecoration extends HTMLPurifier_AttrDef
-{
-
-    public function validate($string, $config, $context) {
-
-        static $allowed_values = array(
-            'line-through' => true,
-            'overline' => true,
-            'underline' => true,
-        );
-
-        $string = strtolower($this->parseCDATA($string));
-
-        if ($string === 'none') return $string;
-
-        $parts = explode(' ', $string);
-        $final = '';
-        foreach ($parts as $part) {
-            if (isset($allowed_values[$part])) {
-                $final .= $part . ' ';
-            }
-        }
-        $final = rtrim($final);
-        if ($final === '') return false;
-        return $final;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/CSS/URI.php b/lib/php/HTMLPurifier/AttrDef/CSS/URI.php
deleted file mode 100644
index 435d7930bb0a378dbf4459806ee01ad34aca4c2c..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/CSS/URI.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Validates a URI in CSS syntax, which uses url('http://example.com')
- * @note While theoretically speaking a URI in a CSS document could
- *       be non-embedded, as of CSS2 there is no such usage so we're
- *       generalizing it. This may need to be changed in the future.
- * @warning Since HTMLPurifier_AttrDef_CSS blindly uses semicolons as
- *          the separator, you cannot put a literal semicolon in
- *          in the URI. Try percent encoding it, in that case.
- */
-class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI
-{
-
-    public function __construct() {
-        parent::__construct(true); // always embedded
-    }
-
-    public function validate($uri_string, $config, $context) {
-        // parse the URI out of the string and then pass it onto
-        // the parent object
-
-        $uri_string = $this->parseCDATA($uri_string);
-        if (strpos($uri_string, 'url(') !== 0) return false;
-        $uri_string = substr($uri_string, 4);
-        $new_length = strlen($uri_string) - 1;
-        if ($uri_string[$new_length] != ')') return false;
-        $uri = trim(substr($uri_string, 0, $new_length));
-
-        if (!empty($uri) && ($uri[0] == "'" || $uri[0] == '"')) {
-            $quote = $uri[0];
-            $new_length = strlen($uri) - 1;
-            if ($uri[$new_length] !== $quote) return false;
-            $uri = substr($uri, 1, $new_length - 1);
-        }
-
-        $keys   = array(  '(',   ')',   ',',   ' ',   '"',   "'");
-        $values = array('\\(', '\\)', '\\,', '\\ ', '\\"', "\\'");
-        $uri = str_replace($values, $keys, $uri);
-
-        $result = parent::validate($uri, $config, $context);
-
-        if ($result === false) return false;
-
-        // escape necessary characters according to CSS spec
-        // except for the comma, none of these should appear in the
-        // URI at all
-        $result = str_replace($keys, $values, $result);
-
-        return "url($result)";
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/Enum.php b/lib/php/HTMLPurifier/AttrDef/Enum.php
deleted file mode 100644
index 5d603ebcc67d51ddad1eb47010d702b157f7fa85..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/Enum.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-// Enum = Enumerated
-/**
- * Validates a keyword against a list of valid values.
- * @warning The case-insensitive compare of this function uses PHP's
- *          built-in strtolower and ctype_lower functions, which may
- *          cause problems with international comparisons
- */
-class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Lookup table of valid values.
-     * @todo Make protected
-     */
-    public $valid_values   = array();
-
-    /**
-     * Bool indicating whether or not enumeration is case sensitive.
-     * @note In general this is always case insensitive.
-     */
-    protected $case_sensitive = false; // values according to W3C spec
-
-    /**
-     * @param $valid_values List of valid values
-     * @param $case_sensitive Bool indicating whether or not case sensitive
-     */
-    public function __construct(
-        $valid_values = array(), $case_sensitive = false
-    ) {
-        $this->valid_values = array_flip($valid_values);
-        $this->case_sensitive = $case_sensitive;
-    }
-
-    public function validate($string, $config, $context) {
-        $string = trim($string);
-        if (!$this->case_sensitive) {
-            // we may want to do full case-insensitive libraries
-            $string = ctype_lower($string) ? $string : strtolower($string);
-        }
-        $result = isset($this->valid_values[$string]);
-
-        return $result ? $string : false;
-    }
-
-    /**
-     * @param $string In form of comma-delimited list of case-insensitive
-     *      valid values. Example: "foo,bar,baz". Prepend "s:" to make
-     *      case sensitive
-     */
-    public function make($string) {
-        if (strlen($string) > 2 && $string[0] == 's' && $string[1] == ':') {
-            $string = substr($string, 2);
-            $sensitive = true;
-        } else {
-            $sensitive = false;
-        }
-        $values = explode(',', $string);
-        return new HTMLPurifier_AttrDef_Enum($values, $sensitive);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/HTML/Bool.php b/lib/php/HTMLPurifier/AttrDef/HTML/Bool.php
deleted file mode 100644
index e06987eb8dbaf10b64b024495ed992fd83e96b35..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/HTML/Bool.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Validates a boolean attribute
- */
-class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef
-{
-
-    protected $name;
-    public $minimized = true;
-
-    public function __construct($name = false) {$this->name = $name;}
-
-    public function validate($string, $config, $context) {
-        if (empty($string)) return false;
-        return $this->name;
-    }
-
-    /**
-     * @param $string Name of attribute
-     */
-    public function make($string) {
-        return new HTMLPurifier_AttrDef_HTML_Bool($string);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/HTML/Class.php b/lib/php/HTMLPurifier/AttrDef/HTML/Class.php
deleted file mode 100644
index 370068d9757755a7396ac165220a094002b9569e..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/HTML/Class.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Implements special behavior for class attribute (normally NMTOKENS)
- */
-class HTMLPurifier_AttrDef_HTML_Class extends HTMLPurifier_AttrDef_HTML_Nmtokens
-{
-    protected function split($string, $config, $context) {
-        // really, this twiddle should be lazy loaded
-        $name = $config->getDefinition('HTML')->doctype->name;
-        if ($name == "XHTML 1.1" || $name == "XHTML 2.0") {
-            return parent::split($string, $config, $context);
-        } else {
-            return preg_split('/\s+/', $string);
-        }
-    }
-    protected function filter($tokens, $config, $context) {
-        $allowed = $config->get('Attr.AllowedClasses');
-        $forbidden = $config->get('Attr.ForbiddenClasses');
-        $ret = array();
-        foreach ($tokens as $token) {
-            if (
-                ($allowed === null || isset($allowed[$token])) &&
-                !isset($forbidden[$token]) &&
-                // We need this O(n) check because of PHP's array
-                // implementation that casts -0 to 0.
-                !in_array($token, $ret, true)
-            ) {
-                $ret[] = $token;
-            }
-        }
-        return $ret;
-    }
-}
diff --git a/lib/php/HTMLPurifier/AttrDef/HTML/Color.php b/lib/php/HTMLPurifier/AttrDef/HTML/Color.php
deleted file mode 100644
index d01e20454ea9f8385160b3acf7c95c7e5ca2b267..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/HTML/Color.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Validates a color according to the HTML spec.
- */
-class HTMLPurifier_AttrDef_HTML_Color extends HTMLPurifier_AttrDef
-{
-
-    public function validate($string, $config, $context) {
-
-        static $colors = null;
-        if ($colors === null) $colors = $config->get('Core.ColorKeywords');
-
-        $string = trim($string);
-
-        if (empty($string)) return false;
-        if (isset($colors[$string])) return $colors[$string];
-        if ($string[0] === '#') $hex = substr($string, 1);
-        else $hex = $string;
-
-        $length = strlen($hex);
-        if ($length !== 3 && $length !== 6) return false;
-        if (!ctype_xdigit($hex)) return false;
-        if ($length === 3) $hex = $hex[0].$hex[0].$hex[1].$hex[1].$hex[2].$hex[2];
-
-        return "#$hex";
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/HTML/FrameTarget.php b/lib/php/HTMLPurifier/AttrDef/HTML/FrameTarget.php
deleted file mode 100644
index ae6ea7c01d55c257c4d93acbc2c5468baaaaa01f..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/HTML/FrameTarget.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Special-case enum attribute definition that lazy loads allowed frame targets
- */
-class HTMLPurifier_AttrDef_HTML_FrameTarget extends HTMLPurifier_AttrDef_Enum
-{
-
-    public $valid_values = false; // uninitialized value
-    protected $case_sensitive = false;
-
-    public function __construct() {}
-
-    public function validate($string, $config, $context) {
-        if ($this->valid_values === false) $this->valid_values = $config->get('Attr.AllowedFrameTargets');
-        return parent::validate($string, $config, $context);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/HTML/ID.php b/lib/php/HTMLPurifier/AttrDef/HTML/ID.php
deleted file mode 100644
index 81d03762dea58956773a19786ebf61b70b7b6b69..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/HTML/ID.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * Validates the HTML attribute ID.
- * @warning Even though this is the id processor, it
- *          will ignore the directive Attr:IDBlacklist, since it will only
- *          go according to the ID accumulator. Since the accumulator is
- *          automatically generated, it will have already absorbed the
- *          blacklist. If you're hacking around, make sure you use load()!
- */
-
-class HTMLPurifier_AttrDef_HTML_ID extends HTMLPurifier_AttrDef
-{
-
-    // ref functionality disabled, since we also have to verify
-    // whether or not the ID it refers to exists
-
-    public function validate($id, $config, $context) {
-
-        if (!$config->get('Attr.EnableID')) return false;
-
-        $id = trim($id); // trim it first
-
-        if ($id === '') return false;
-
-        $prefix = $config->get('Attr.IDPrefix');
-        if ($prefix !== '') {
-            $prefix .= $config->get('Attr.IDPrefixLocal');
-            // prevent re-appending the prefix
-            if (strpos($id, $prefix) !== 0) $id = $prefix . $id;
-        } elseif ($config->get('Attr.IDPrefixLocal') !== '') {
-            trigger_error('%Attr.IDPrefixLocal cannot be used unless '.
-                '%Attr.IDPrefix is set', E_USER_WARNING);
-        }
-
-        //if (!$this->ref) {
-            $id_accumulator =& $context->get('IDAccumulator');
-            if (isset($id_accumulator->ids[$id])) return false;
-        //}
-
-        // we purposely avoid using regex, hopefully this is faster
-
-        if (ctype_alpha($id)) {
-            $result = true;
-        } else {
-            if (!ctype_alpha(@$id[0])) return false;
-            $trim = trim( // primitive style of regexps, I suppose
-                $id,
-                'A..Za..z0..9:-._'
-              );
-            $result = ($trim === '');
-        }
-
-        $regexp = $config->get('Attr.IDBlacklistRegexp');
-        if ($regexp && preg_match($regexp, $id)) {
-            return false;
-        }
-
-        if (/*!$this->ref && */$result) $id_accumulator->add($id);
-
-        // if no change was made to the ID, return the result
-        // else, return the new id if stripping whitespace made it
-        //     valid, or return false.
-        return $result ? $id : false;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/HTML/Length.php b/lib/php/HTMLPurifier/AttrDef/HTML/Length.php
deleted file mode 100644
index a242f9c238ea2108e059598eac16f8b6e5bf6eb0..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/HTML/Length.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * Validates the HTML type length (not to be confused with CSS's length).
- *
- * This accepts integer pixels or percentages as lengths for certain
- * HTML attributes.
- */
-
-class HTMLPurifier_AttrDef_HTML_Length extends HTMLPurifier_AttrDef_HTML_Pixels
-{
-
-    public function validate($string, $config, $context) {
-
-        $string = trim($string);
-        if ($string === '') return false;
-
-        $parent_result = parent::validate($string, $config, $context);
-        if ($parent_result !== false) return $parent_result;
-
-        $length = strlen($string);
-        $last_char = $string[$length - 1];
-
-        if ($last_char !== '%') return false;
-
-        $points = substr($string, 0, $length - 1);
-
-        if (!is_numeric($points)) return false;
-
-        $points = (int) $points;
-
-        if ($points < 0) return '0%';
-        if ($points > 100) return '100%';
-
-        return ((string) $points) . '%';
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/HTML/LinkTypes.php b/lib/php/HTMLPurifier/AttrDef/HTML/LinkTypes.php
deleted file mode 100644
index 76d25ed088ace93cf386867f74491e5b3cf73477..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/HTML/LinkTypes.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Validates a rel/rev link attribute against a directive of allowed values
- * @note We cannot use Enum because link types allow multiple
- *       values.
- * @note Assumes link types are ASCII text
- */
-class HTMLPurifier_AttrDef_HTML_LinkTypes extends HTMLPurifier_AttrDef
-{
-
-    /** Name config attribute to pull. */
-    protected $name;
-
-    public function __construct($name) {
-        $configLookup = array(
-            'rel' => 'AllowedRel',
-            'rev' => 'AllowedRev'
-        );
-        if (!isset($configLookup[$name])) {
-            trigger_error('Unrecognized attribute name for link '.
-                'relationship.', E_USER_ERROR);
-            return;
-        }
-        $this->name = $configLookup[$name];
-    }
-
-    public function validate($string, $config, $context) {
-
-        $allowed = $config->get('Attr.' . $this->name);
-        if (empty($allowed)) return false;
-
-        $string = $this->parseCDATA($string);
-        $parts = explode(' ', $string);
-
-        // lookup to prevent duplicates
-        $ret_lookup = array();
-        foreach ($parts as $part) {
-            $part = strtolower(trim($part));
-            if (!isset($allowed[$part])) continue;
-            $ret_lookup[$part] = true;
-        }
-
-        if (empty($ret_lookup)) return false;
-        $string = implode(' ', array_keys($ret_lookup));
-
-        return $string;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/HTML/MultiLength.php b/lib/php/HTMLPurifier/AttrDef/HTML/MultiLength.php
deleted file mode 100644
index c72fc76e4d99fab93084d1912753c9d07b64b239..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/HTML/MultiLength.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * Validates a MultiLength as defined by the HTML spec.
- *
- * A multilength is either a integer (pixel count), a percentage, or
- * a relative number.
- */
-class HTMLPurifier_AttrDef_HTML_MultiLength extends HTMLPurifier_AttrDef_HTML_Length
-{
-
-    public function validate($string, $config, $context) {
-
-        $string = trim($string);
-        if ($string === '') return false;
-
-        $parent_result = parent::validate($string, $config, $context);
-        if ($parent_result !== false) return $parent_result;
-
-        $length = strlen($string);
-        $last_char = $string[$length - 1];
-
-        if ($last_char !== '*') return false;
-
-        $int = substr($string, 0, $length - 1);
-
-        if ($int == '') return '*';
-        if (!is_numeric($int)) return false;
-
-        $int = (int) $int;
-
-        if ($int < 0) return false;
-        if ($int == 0) return '0';
-        if ($int == 1) return '*';
-        return ((string) $int) . '*';
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/HTML/Nmtokens.php b/lib/php/HTMLPurifier/AttrDef/HTML/Nmtokens.php
deleted file mode 100644
index aa34120bd289543d1b7adbd4f42f8b2ab51f973e..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/HTML/Nmtokens.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * Validates contents based on NMTOKENS attribute type.
- */
-class HTMLPurifier_AttrDef_HTML_Nmtokens extends HTMLPurifier_AttrDef
-{
-
-    public function validate($string, $config, $context) {
-
-        $string = trim($string);
-
-        // early abort: '' and '0' (strings that convert to false) are invalid
-        if (!$string) return false;
-
-        $tokens = $this->split($string, $config, $context);
-        $tokens = $this->filter($tokens, $config, $context);
-        if (empty($tokens)) return false;
-        return implode(' ', $tokens);
-
-    }
-
-    /**
-     * Splits a space separated list of tokens into its constituent parts.
-     */
-    protected function split($string, $config, $context) {
-        // OPTIMIZABLE!
-        // do the preg_match, capture all subpatterns for reformulation
-
-        // we don't support U+00A1 and up codepoints or
-        // escaping because I don't know how to do that with regexps
-        // and plus it would complicate optimization efforts (you never
-        // see that anyway).
-        $pattern = '/(?:(?<=\s)|\A)'. // look behind for space or string start
-                   '((?:--|-?[A-Za-z_])[A-Za-z_\-0-9]*)'.
-                   '(?:(?=\s)|\z)/'; // look ahead for space or string end
-        preg_match_all($pattern, $string, $matches);
-        return $matches[1];
-    }
-
-    /**
-     * Template method for removing certain tokens based on arbitrary criteria.
-     * @note If we wanted to be really functional, we'd do an array_filter
-     *       with a callback. But... we're not.
-     */
-    protected function filter($tokens, $config, $context) {
-        return $tokens;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/HTML/Pixels.php b/lib/php/HTMLPurifier/AttrDef/HTML/Pixels.php
deleted file mode 100644
index 4cb2c1b8579b51cd22ccd140e6f6880fc2627faf..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/HTML/Pixels.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Validates an integer representation of pixels according to the HTML spec.
- */
-class HTMLPurifier_AttrDef_HTML_Pixels extends HTMLPurifier_AttrDef
-{
-
-    protected $max;
-
-    public function __construct($max = null) {
-        $this->max = $max;
-    }
-
-    public function validate($string, $config, $context) {
-
-        $string = trim($string);
-        if ($string === '0') return $string;
-        if ($string === '')  return false;
-        $length = strlen($string);
-        if (substr($string, $length - 2) == 'px') {
-            $string = substr($string, 0, $length - 2);
-        }
-        if (!is_numeric($string)) return false;
-        $int = (int) $string;
-
-        if ($int < 0) return '0';
-
-        // upper-bound value, extremely high values can
-        // crash operating systems, see <http://ha.ckers.org/imagecrash.html>
-        // WARNING, above link WILL crash you if you're using Windows
-
-        if ($this->max !== null && $int > $this->max) return (string) $this->max;
-
-        return (string) $int;
-
-    }
-
-    public function make($string) {
-        if ($string === '') $max = null;
-        else $max = (int) $string;
-        $class = get_class($this);
-        return new $class($max);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/Integer.php b/lib/php/HTMLPurifier/AttrDef/Integer.php
deleted file mode 100644
index d59738d2a2b772d876cc0529e52b14a2ac680198..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/Integer.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * Validates an integer.
- * @note While this class was modeled off the CSS definition, no currently
- *       allowed CSS uses this type.  The properties that do are: widows,
- *       orphans, z-index, counter-increment, counter-reset.  Some of the
- *       HTML attributes, however, find use for a non-negative version of this.
- */
-class HTMLPurifier_AttrDef_Integer extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Bool indicating whether or not negative values are allowed
-     */
-    protected $negative = true;
-
-    /**
-     * Bool indicating whether or not zero is allowed
-     */
-    protected $zero = true;
-
-    /**
-     * Bool indicating whether or not positive values are allowed
-     */
-    protected $positive = true;
-
-    /**
-     * @param $negative Bool indicating whether or not negative values are allowed
-     * @param $zero Bool indicating whether or not zero is allowed
-     * @param $positive Bool indicating whether or not positive values are allowed
-     */
-    public function __construct(
-        $negative = true, $zero = true, $positive = true
-    ) {
-        $this->negative = $negative;
-        $this->zero     = $zero;
-        $this->positive = $positive;
-    }
-
-    public function validate($integer, $config, $context) {
-
-        $integer = $this->parseCDATA($integer);
-        if ($integer === '') return false;
-
-        // we could possibly simply typecast it to integer, but there are
-        // certain fringe cases that must not return an integer.
-
-        // clip leading sign
-        if ( $this->negative && $integer[0] === '-' ) {
-            $digits = substr($integer, 1);
-            if ($digits === '0') $integer = '0'; // rm minus sign for zero
-        } elseif( $this->positive && $integer[0] === '+' ) {
-            $digits = $integer = substr($integer, 1); // rm unnecessary plus
-        } else {
-            $digits = $integer;
-        }
-
-        // test if it's numeric
-        if (!ctype_digit($digits)) return false;
-
-        // perform scope tests
-        if (!$this->zero     && $integer == 0) return false;
-        if (!$this->positive && $integer > 0) return false;
-        if (!$this->negative && $integer < 0) return false;
-
-        return $integer;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/Lang.php b/lib/php/HTMLPurifier/AttrDef/Lang.php
deleted file mode 100644
index 10e6da56db190fdf4c2e28b0da8aa36d3172e04e..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/Lang.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * Validates the HTML attribute lang, effectively a language code.
- * @note Built according to RFC 3066, which obsoleted RFC 1766
- */
-class HTMLPurifier_AttrDef_Lang extends HTMLPurifier_AttrDef
-{
-
-    public function validate($string, $config, $context) {
-
-        $string = trim($string);
-        if (!$string) return false;
-
-        $subtags = explode('-', $string);
-        $num_subtags = count($subtags);
-
-        if ($num_subtags == 0) return false; // sanity check
-
-        // process primary subtag : $subtags[0]
-        $length = strlen($subtags[0]);
-        switch ($length) {
-            case 0:
-                return false;
-            case 1:
-                if (! ($subtags[0] == 'x' || $subtags[0] == 'i') ) {
-                    return false;
-                }
-                break;
-            case 2:
-            case 3:
-                if (! ctype_alpha($subtags[0]) ) {
-                    return false;
-                } elseif (! ctype_lower($subtags[0]) ) {
-                    $subtags[0] = strtolower($subtags[0]);
-                }
-                break;
-            default:
-                return false;
-        }
-
-        $new_string = $subtags[0];
-        if ($num_subtags == 1) return $new_string;
-
-        // process second subtag : $subtags[1]
-        $length = strlen($subtags[1]);
-        if ($length == 0 || ($length == 1 && $subtags[1] != 'x') || $length > 8 || !ctype_alnum($subtags[1])) {
-            return $new_string;
-        }
-        if (!ctype_lower($subtags[1])) $subtags[1] = strtolower($subtags[1]);
-
-        $new_string .= '-' . $subtags[1];
-        if ($num_subtags == 2) return $new_string;
-
-        // process all other subtags, index 2 and up
-        for ($i = 2; $i < $num_subtags; $i++) {
-            $length = strlen($subtags[$i]);
-            if ($length == 0 || $length > 8 || !ctype_alnum($subtags[$i])) {
-                return $new_string;
-            }
-            if (!ctype_lower($subtags[$i])) {
-                $subtags[$i] = strtolower($subtags[$i]);
-            }
-            $new_string .= '-' . $subtags[$i];
-        }
-
-        return $new_string;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/Switch.php b/lib/php/HTMLPurifier/AttrDef/Switch.php
deleted file mode 100644
index c9e3ed193e77d0cbeac150d02105b81173eb37c0..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/Switch.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Decorator that, depending on a token, switches between two definitions.
- */
-class HTMLPurifier_AttrDef_Switch
-{
-
-    protected $tag;
-    protected $withTag, $withoutTag;
-
-    /**
-     * @param string $tag Tag name to switch upon
-     * @param HTMLPurifier_AttrDef $with_tag Call if token matches tag
-     * @param HTMLPurifier_AttrDef $without_tag Call if token doesn't match, or there is no token
-     */
-    public function __construct($tag, $with_tag, $without_tag) {
-        $this->tag = $tag;
-        $this->withTag = $with_tag;
-        $this->withoutTag = $without_tag;
-    }
-
-    public function validate($string, $config, $context) {
-        $token = $context->get('CurrentToken', true);
-        if (!$token || $token->name !== $this->tag) {
-            return $this->withoutTag->validate($string, $config, $context);
-        } else {
-            return $this->withTag->validate($string, $config, $context);
-        }
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/Text.php b/lib/php/HTMLPurifier/AttrDef/Text.php
deleted file mode 100644
index c6216cc531d4b351799ea7b9764d88f578c9c26a..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/Text.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Validates arbitrary text according to the HTML spec.
- */
-class HTMLPurifier_AttrDef_Text extends HTMLPurifier_AttrDef
-{
-
-    public function validate($string, $config, $context) {
-        return $this->parseCDATA($string);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/URI.php b/lib/php/HTMLPurifier/AttrDef/URI.php
deleted file mode 100644
index 01a6d83e9526f81e3983863f04f8505d39ae2b36..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/URI.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * Validates a URI as defined by RFC 3986.
- * @note Scheme-specific mechanics deferred to HTMLPurifier_URIScheme
- */
-class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef
-{
-
-    protected $parser;
-    protected $embedsResource;
-
-    /**
-     * @param $embeds_resource_resource Does the URI here result in an extra HTTP request?
-     */
-    public function __construct($embeds_resource = false) {
-        $this->parser = new HTMLPurifier_URIParser();
-        $this->embedsResource = (bool) $embeds_resource;
-    }
-
-    public function make($string) {
-        $embeds = (bool) $string;
-        return new HTMLPurifier_AttrDef_URI($embeds);
-    }
-
-    public function validate($uri, $config, $context) {
-
-        if ($config->get('URI.Disable')) return false;
-
-        $uri = $this->parseCDATA($uri);
-
-        // parse the URI
-        $uri = $this->parser->parse($uri);
-        if ($uri === false) return false;
-
-        // add embedded flag to context for validators
-        $context->register('EmbeddedURI', $this->embedsResource);
-
-        $ok = false;
-        do {
-
-            // generic validation
-            $result = $uri->validate($config, $context);
-            if (!$result) break;
-
-            // chained filtering
-            $uri_def = $config->getDefinition('URI');
-            $result = $uri_def->filter($uri, $config, $context);
-            if (!$result) break;
-
-            // scheme-specific validation
-            $scheme_obj = $uri->getSchemeObj($config, $context);
-            if (!$scheme_obj) break;
-            if ($this->embedsResource && !$scheme_obj->browsable) break;
-            $result = $scheme_obj->validate($uri, $config, $context);
-            if (!$result) break;
-
-            // Post chained filtering
-            $result = $uri_def->postFilter($uri, $config, $context);
-            if (!$result) break;
-
-            // survived gauntlet
-            $ok = true;
-
-        } while (false);
-
-        $context->destroy('EmbeddedURI');
-        if (!$ok) return false;
-
-        // back to string
-        return $uri->toString();
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/URI/Email.php b/lib/php/HTMLPurifier/AttrDef/URI/Email.php
deleted file mode 100644
index bfee9d166c82ee6c0df47636afa4ea0948e8ba09..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/URI/Email.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-abstract class HTMLPurifier_AttrDef_URI_Email extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Unpacks a mailbox into its display-name and address
-     */
-    function unpack($string) {
-        // needs to be implemented
-    }
-
-}
-
-// sub-implementations
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php b/lib/php/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
deleted file mode 100644
index 94c715ab43258b923f89f300a853438ccce2da49..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Primitive email validation class based on the regexp found at
- * http://www.regular-expressions.info/email.html
- */
-class HTMLPurifier_AttrDef_URI_Email_SimpleCheck extends HTMLPurifier_AttrDef_URI_Email
-{
-
-    public function validate($string, $config, $context) {
-        // no support for named mailboxes i.e. "Bob <bob@example.com>"
-        // that needs more percent encoding to be done
-        if ($string == '') return false;
-        $string = trim($string);
-        $result = preg_match('/^[A-Z0-9._%-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i', $string);
-        return $result ? $string : false;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/URI/Host.php b/lib/php/HTMLPurifier/AttrDef/URI/Host.php
deleted file mode 100644
index 2156c10c660e502bbfa8530a3425b9017aadedbd..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/URI/Host.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Validates a host according to the IPv4, IPv6 and DNS (future) specifications.
- */
-class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * Instance of HTMLPurifier_AttrDef_URI_IPv4 sub-validator
-     */
-    protected $ipv4;
-
-    /**
-     * Instance of HTMLPurifier_AttrDef_URI_IPv6 sub-validator
-     */
-    protected $ipv6;
-
-    public function __construct() {
-        $this->ipv4 = new HTMLPurifier_AttrDef_URI_IPv4();
-        $this->ipv6 = new HTMLPurifier_AttrDef_URI_IPv6();
-    }
-
-    public function validate($string, $config, $context) {
-        $length = strlen($string);
-        if ($string === '') return '';
-        if ($length > 1 && $string[0] === '[' && $string[$length-1] === ']') {
-            //IPv6
-            $ip = substr($string, 1, $length - 2);
-            $valid = $this->ipv6->validate($ip, $config, $context);
-            if ($valid === false) return false;
-            return '['. $valid . ']';
-        }
-
-        // need to do checks on unusual encodings too
-        $ipv4 = $this->ipv4->validate($string, $config, $context);
-        if ($ipv4 !== false) return $ipv4;
-
-        // A regular domain name.
-
-        // This breaks I18N domain names, but we don't have proper IRI support,
-        // so force users to insert Punycode. If there's complaining we'll
-        // try to fix things into an international friendly form.
-
-        // The productions describing this are:
-        $a   = '[a-z]';     // alpha
-        $an  = '[a-z0-9]';  // alphanum
-        $and = '[a-z0-9-]'; // alphanum | "-"
-        // domainlabel = alphanum | alphanum *( alphanum | "-" ) alphanum
-        $domainlabel   = "$an($and*$an)?";
-        // toplabel    = alpha | alpha *( alphanum | "-" ) alphanum
-        $toplabel      = "$a($and*$an)?";
-        // hostname    = *( domainlabel "." ) toplabel [ "." ]
-        $match = preg_match("/^($domainlabel\.)*$toplabel\.?$/i", $string);
-        if (!$match) return false;
-
-        return $string;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/URI/IPv4.php b/lib/php/HTMLPurifier/AttrDef/URI/IPv4.php
deleted file mode 100644
index ec4cf591b82b7d4bcd054d8556707a83a410568e..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/URI/IPv4.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Validates an IPv4 address
- * @author Feyd @ forums.devnetwork.net (public domain)
- */
-class HTMLPurifier_AttrDef_URI_IPv4 extends HTMLPurifier_AttrDef
-{
-
-    /**
-     * IPv4 regex, protected so that IPv6 can reuse it
-     */
-    protected $ip4;
-
-    public function validate($aIP, $config, $context) {
-
-        if (!$this->ip4) $this->_loadRegex();
-
-        if (preg_match('#^' . $this->ip4 . '$#s', $aIP))
-        {
-                return $aIP;
-        }
-
-        return false;
-
-    }
-
-    /**
-     * Lazy load function to prevent regex from being stuffed in
-     * cache.
-     */
-    protected function _loadRegex() {
-        $oct = '(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])'; // 0-255
-        $this->ip4 = "(?:{$oct}\\.{$oct}\\.{$oct}\\.{$oct})";
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrDef/URI/IPv6.php b/lib/php/HTMLPurifier/AttrDef/URI/IPv6.php
deleted file mode 100644
index 9454e9be50eb96970d1eed77a61fd4976ff60911..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrDef/URI/IPv6.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
- * Validates an IPv6 address.
- * @author Feyd @ forums.devnetwork.net (public domain)
- * @note This function requires brackets to have been removed from address
- *       in URI.
- */
-class HTMLPurifier_AttrDef_URI_IPv6 extends HTMLPurifier_AttrDef_URI_IPv4
-{
-
-    public function validate($aIP, $config, $context) {
-
-        if (!$this->ip4) $this->_loadRegex();
-
-        $original = $aIP;
-
-        $hex = '[0-9a-fA-F]';
-        $blk = '(?:' . $hex . '{1,4})';
-        $pre = '(?:/(?:12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))';   // /0 - /128
-
-        //      prefix check
-        if (strpos($aIP, '/') !== false)
-        {
-                if (preg_match('#' . $pre . '$#s', $aIP, $find))
-                {
-                        $aIP = substr($aIP, 0, 0-strlen($find[0]));
-                        unset($find);
-                }
-                else
-                {
-                        return false;
-                }
-        }
-
-        //      IPv4-compatiblity check
-        if (preg_match('#(?<=:'.')' . $this->ip4 . '$#s', $aIP, $find))
-        {
-                $aIP = substr($aIP, 0, 0-strlen($find[0]));
-                $ip = explode('.', $find[0]);
-                $ip = array_map('dechex', $ip);
-                $aIP .= $ip[0] . $ip[1] . ':' . $ip[2] . $ip[3];
-                unset($find, $ip);
-        }
-
-        //      compression check
-        $aIP = explode('::', $aIP);
-        $c = count($aIP);
-        if ($c > 2)
-        {
-                return false;
-        }
-        elseif ($c == 2)
-        {
-                list($first, $second) = $aIP;
-                $first = explode(':', $first);
-                $second = explode(':', $second);
-
-                if (count($first) + count($second) > 8)
-                {
-                        return false;
-                }
-
-                while(count($first) < 8)
-                {
-                        array_push($first, '0');
-                }
-
-                array_splice($first, 8 - count($second), 8, $second);
-                $aIP = $first;
-                unset($first,$second);
-        }
-        else
-        {
-                $aIP = explode(':', $aIP[0]);
-        }
-        $c = count($aIP);
-
-        if ($c != 8)
-        {
-                return false;
-        }
-
-        //      All the pieces should be 16-bit hex strings. Are they?
-        foreach ($aIP as $piece)
-        {
-                if (!preg_match('#^[0-9a-fA-F]{4}$#s', sprintf('%04s', $piece)))
-                {
-                        return false;
-                }
-        }
-
-        return $original;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform.php b/lib/php/HTMLPurifier/AttrTransform.php
deleted file mode 100644
index e61d3e01b6d55f3f83b42d2e3d82a21f83492c52..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Processes an entire attribute array for corrections needing multiple values.
- *
- * Occasionally, a certain attribute will need to be removed and popped onto
- * another value.  Instead of creating a complex return syntax for
- * HTMLPurifier_AttrDef, we just pass the whole attribute array to a
- * specialized object and have that do the special work.  That is the
- * family of HTMLPurifier_AttrTransform.
- *
- * An attribute transformation can be assigned to run before or after
- * HTMLPurifier_AttrDef validation.  See HTMLPurifier_HTMLDefinition for
- * more details.
- */
-
-abstract class HTMLPurifier_AttrTransform
-{
-
-    /**
-     * Abstract: makes changes to the attributes dependent on multiple values.
-     *
-     * @param $attr Assoc array of attributes, usually from
-     *              HTMLPurifier_Token_Tag::$attr
-     * @param $config Mandatory HTMLPurifier_Config object.
-     * @param $context Mandatory HTMLPurifier_Context object
-     * @returns Processed attribute array.
-     */
-    abstract public function transform($attr, $config, $context);
-
-    /**
-     * Prepends CSS properties to the style attribute, creating the
-     * attribute if it doesn't exist.
-     * @param $attr Attribute array to process (passed by reference)
-     * @param $css CSS to prepend
-     */
-    public function prependCSS(&$attr, $css) {
-        $attr['style'] = isset($attr['style']) ? $attr['style'] : '';
-        $attr['style'] = $css . $attr['style'];
-    }
-
-    /**
-     * Retrieves and removes an attribute
-     * @param $attr Attribute array to process (passed by reference)
-     * @param $key Key of attribute to confiscate
-     */
-    public function confiscateAttr(&$attr, $key) {
-        if (!isset($attr[$key])) return null;
-        $value = $attr[$key];
-        unset($attr[$key]);
-        return $value;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform/Background.php b/lib/php/HTMLPurifier/AttrTransform/Background.php
deleted file mode 100644
index 0e1ff24a3ed8ed6758118ba293f40d5783150f1c..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform/Background.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Pre-transform that changes proprietary background attribute to CSS.
- */
-class HTMLPurifier_AttrTransform_Background extends HTMLPurifier_AttrTransform {
-
-    public function transform($attr, $config, $context) {
-
-        if (!isset($attr['background'])) return $attr;
-
-        $background = $this->confiscateAttr($attr, 'background');
-        // some validation should happen here
-
-        $this->prependCSS($attr, "background-image:url($background);");
-
-        return $attr;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform/BdoDir.php b/lib/php/HTMLPurifier/AttrTransform/BdoDir.php
deleted file mode 100644
index 4d1a05665e46e35e8be54465d61afcada111cedb..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform/BdoDir.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-// this MUST be placed in post, as it assumes that any value in dir is valid
-
-/**
- * Post-trasnform that ensures that bdo tags have the dir attribute set.
- */
-class HTMLPurifier_AttrTransform_BdoDir extends HTMLPurifier_AttrTransform
-{
-
-    public function transform($attr, $config, $context) {
-        if (isset($attr['dir'])) return $attr;
-        $attr['dir'] = $config->get('Attr.DefaultTextDir');
-        return $attr;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform/BgColor.php b/lib/php/HTMLPurifier/AttrTransform/BgColor.php
deleted file mode 100644
index ad3916bb9676a482104027657545a8a8e616c177..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform/BgColor.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Pre-transform that changes deprecated bgcolor attribute to CSS.
- */
-class HTMLPurifier_AttrTransform_BgColor extends HTMLPurifier_AttrTransform {
-
-    public function transform($attr, $config, $context) {
-
-        if (!isset($attr['bgcolor'])) return $attr;
-
-        $bgcolor = $this->confiscateAttr($attr, 'bgcolor');
-        // some validation should happen here
-
-        $this->prependCSS($attr, "background-color:$bgcolor;");
-
-        return $attr;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform/BoolToCSS.php b/lib/php/HTMLPurifier/AttrTransform/BoolToCSS.php
deleted file mode 100644
index 51159b67157de07846eb9f0b9af3486817ab5d69..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform/BoolToCSS.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Pre-transform that changes converts a boolean attribute to fixed CSS
- */
-class HTMLPurifier_AttrTransform_BoolToCSS extends HTMLPurifier_AttrTransform {
-
-    /**
-     * Name of boolean attribute that is trigger
-     */
-    protected $attr;
-
-    /**
-     * CSS declarations to add to style, needs trailing semicolon
-     */
-    protected $css;
-
-    /**
-     * @param $attr string attribute name to convert from
-     * @param $css string CSS declarations to add to style (needs semicolon)
-     */
-    public function __construct($attr, $css) {
-        $this->attr = $attr;
-        $this->css  = $css;
-    }
-
-    public function transform($attr, $config, $context) {
-        if (!isset($attr[$this->attr])) return $attr;
-        unset($attr[$this->attr]);
-        $this->prependCSS($attr, $this->css);
-        return $attr;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform/Border.php b/lib/php/HTMLPurifier/AttrTransform/Border.php
deleted file mode 100644
index 476b0b079b11074ce4e26f5ba163ed9849b7a161..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform/Border.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Pre-transform that changes deprecated border attribute to CSS.
- */
-class HTMLPurifier_AttrTransform_Border extends HTMLPurifier_AttrTransform {
-
-    public function transform($attr, $config, $context) {
-        if (!isset($attr['border'])) return $attr;
-        $border_width = $this->confiscateAttr($attr, 'border');
-        // some validation should happen here
-        $this->prependCSS($attr, "border:{$border_width}px solid;");
-        return $attr;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform/EnumToCSS.php b/lib/php/HTMLPurifier/AttrTransform/EnumToCSS.php
deleted file mode 100644
index 2a5b4514ab430df6d01a7e1b0bcbb3e26ac9baa5..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform/EnumToCSS.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Generic pre-transform that converts an attribute with a fixed number of
- * values (enumerated) to CSS.
- */
-class HTMLPurifier_AttrTransform_EnumToCSS extends HTMLPurifier_AttrTransform {
-
-    /**
-     * Name of attribute to transform from
-     */
-    protected $attr;
-
-    /**
-     * Lookup array of attribute values to CSS
-     */
-    protected $enumToCSS = array();
-
-    /**
-     * Case sensitivity of the matching
-     * @warning Currently can only be guaranteed to work with ASCII
-     *          values.
-     */
-    protected $caseSensitive = false;
-
-    /**
-     * @param $attr String attribute name to transform from
-     * @param $enumToCSS Lookup array of attribute values to CSS
-     * @param $case_sensitive Boolean case sensitivity indicator, default false
-     */
-    public function __construct($attr, $enum_to_css, $case_sensitive = false) {
-        $this->attr = $attr;
-        $this->enumToCSS = $enum_to_css;
-        $this->caseSensitive = (bool) $case_sensitive;
-    }
-
-    public function transform($attr, $config, $context) {
-
-        if (!isset($attr[$this->attr])) return $attr;
-
-        $value = trim($attr[$this->attr]);
-        unset($attr[$this->attr]);
-
-        if (!$this->caseSensitive) $value = strtolower($value);
-
-        if (!isset($this->enumToCSS[$value])) {
-            return $attr;
-        }
-
-        $this->prependCSS($attr, $this->enumToCSS[$value]);
-
-        return $attr;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform/ImgRequired.php b/lib/php/HTMLPurifier/AttrTransform/ImgRequired.php
deleted file mode 100644
index a219479a029d52b4ef4bd7b29c41c1ea7930420c..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform/ImgRequired.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-// must be called POST validation
-
-/**
- * Transform that supplies default values for the src and alt attributes
- * in img tags, as well as prevents the img tag from being removed
- * because of a missing alt tag. This needs to be registered as both
- * a pre and post attribute transform.
- */
-class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier_AttrTransform
-{
-
-    public function transform($attr, $config, $context) {
-
-        $src = true;
-        if (!isset($attr['src'])) {
-            if ($config->get('Core.RemoveInvalidImg')) return $attr;
-            $attr['src'] = $config->get('Attr.DefaultInvalidImage');
-            $src = false;
-        }
-
-        if (!isset($attr['alt'])) {
-            if ($src) {
-                $alt = $config->get('Attr.DefaultImageAlt');
-                if ($alt === null) {
-                    $attr['alt'] = basename($attr['src']);
-                } else {
-                    $attr['alt'] = $alt;
-                }
-            } else {
-                $attr['alt'] = $config->get('Attr.DefaultInvalidImageAlt');
-            }
-        }
-
-        return $attr;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform/ImgSpace.php b/lib/php/HTMLPurifier/AttrTransform/ImgSpace.php
deleted file mode 100644
index fd84c10c3618fb4642282ae307cf731e9e042490..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform/ImgSpace.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Pre-transform that changes deprecated hspace and vspace attributes to CSS
- */
-class HTMLPurifier_AttrTransform_ImgSpace extends HTMLPurifier_AttrTransform {
-
-    protected $attr;
-    protected $css = array(
-        'hspace' => array('left', 'right'),
-        'vspace' => array('top', 'bottom')
-    );
-
-    public function __construct($attr) {
-        $this->attr = $attr;
-        if (!isset($this->css[$attr])) {
-            trigger_error(htmlspecialchars($attr) . ' is not valid space attribute');
-        }
-    }
-
-    public function transform($attr, $config, $context) {
-
-        if (!isset($attr[$this->attr])) return $attr;
-
-        $width = $this->confiscateAttr($attr, $this->attr);
-        // some validation could happen here
-
-        if (!isset($this->css[$this->attr])) return $attr;
-
-        $style = '';
-        foreach ($this->css[$this->attr] as $suffix) {
-            $property = "margin-$suffix";
-            $style .= "$property:{$width}px;";
-        }
-
-        $this->prependCSS($attr, $style);
-
-        return $attr;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform/Input.php b/lib/php/HTMLPurifier/AttrTransform/Input.php
deleted file mode 100644
index 16829552d14d2a82502661ad530186a8c9e21cc9..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform/Input.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Performs miscellaneous cross attribute validation and filtering for
- * input elements. This is meant to be a post-transform.
- */
-class HTMLPurifier_AttrTransform_Input extends HTMLPurifier_AttrTransform {
-
-    protected $pixels;
-
-    public function __construct() {
-        $this->pixels = new HTMLPurifier_AttrDef_HTML_Pixels();
-    }
-
-    public function transform($attr, $config, $context) {
-        if (!isset($attr['type'])) $t = 'text';
-        else $t = strtolower($attr['type']);
-        if (isset($attr['checked']) && $t !== 'radio' && $t !== 'checkbox') {
-            unset($attr['checked']);
-        }
-        if (isset($attr['maxlength']) && $t !== 'text' && $t !== 'password') {
-            unset($attr['maxlength']);
-        }
-        if (isset($attr['size']) && $t !== 'text' && $t !== 'password') {
-            $result = $this->pixels->validate($attr['size'], $config, $context);
-            if ($result === false) unset($attr['size']);
-            else $attr['size'] = $result;
-        }
-        if (isset($attr['src']) && $t !== 'image') {
-            unset($attr['src']);
-        }
-        if (!isset($attr['value']) && ($t === 'radio' || $t === 'checkbox')) {
-            $attr['value'] = '';
-        }
-        return $attr;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform/Lang.php b/lib/php/HTMLPurifier/AttrTransform/Lang.php
deleted file mode 100644
index 5869e7f82037c5a38b9ea55789735181e4980160..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform/Lang.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Post-transform that copies lang's value to xml:lang (and vice-versa)
- * @note Theoretically speaking, this could be a pre-transform, but putting
- *       post is more efficient.
- */
-class HTMLPurifier_AttrTransform_Lang extends HTMLPurifier_AttrTransform
-{
-
-    public function transform($attr, $config, $context) {
-
-        $lang     = isset($attr['lang']) ? $attr['lang'] : false;
-        $xml_lang = isset($attr['xml:lang']) ? $attr['xml:lang'] : false;
-
-        if ($lang !== false && $xml_lang === false) {
-            $attr['xml:lang'] = $lang;
-        } elseif ($xml_lang !== false) {
-            $attr['lang'] = $xml_lang;
-        }
-
-        return $attr;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform/Length.php b/lib/php/HTMLPurifier/AttrTransform/Length.php
deleted file mode 100644
index ea2f30473d6d14a7e77cff3a16f0fcd80712e3b5..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform/Length.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Class for handling width/height length attribute transformations to CSS
- */
-class HTMLPurifier_AttrTransform_Length extends HTMLPurifier_AttrTransform
-{
-
-    protected $name;
-    protected $cssName;
-
-    public function __construct($name, $css_name = null) {
-        $this->name = $name;
-        $this->cssName = $css_name ? $css_name : $name;
-    }
-
-    public function transform($attr, $config, $context) {
-        if (!isset($attr[$this->name])) return $attr;
-        $length = $this->confiscateAttr($attr, $this->name);
-        if(ctype_digit($length)) $length .= 'px';
-        $this->prependCSS($attr, $this->cssName . ":$length;");
-        return $attr;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform/Name.php b/lib/php/HTMLPurifier/AttrTransform/Name.php
deleted file mode 100644
index 15315bc7353a4ef8801a53671654b2a3dde1d4b1..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform/Name.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Pre-transform that changes deprecated name attribute to ID if necessary
- */
-class HTMLPurifier_AttrTransform_Name extends HTMLPurifier_AttrTransform
-{
-
-    public function transform($attr, $config, $context) {
-        // Abort early if we're using relaxed definition of name
-        if ($config->get('HTML.Attr.Name.UseCDATA')) return $attr;
-        if (!isset($attr['name'])) return $attr;
-        $id = $this->confiscateAttr($attr, 'name');
-        if ( isset($attr['id']))   return $attr;
-        $attr['id'] = $id;
-        return $attr;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform/NameSync.php b/lib/php/HTMLPurifier/AttrTransform/NameSync.php
deleted file mode 100644
index a95638c140e724774ce5217576d33f097dd92787..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform/NameSync.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Post-transform that performs validation to the name attribute; if
- * it is present with an equivalent id attribute, it is passed through;
- * otherwise validation is performed.
- */
-class HTMLPurifier_AttrTransform_NameSync extends HTMLPurifier_AttrTransform
-{
-
-    public function __construct() {
-        $this->idDef = new HTMLPurifier_AttrDef_HTML_ID();
-    }
-
-    public function transform($attr, $config, $context) {
-        if (!isset($attr['name'])) return $attr;
-        $name = $attr['name'];
-        if (isset($attr['id']) && $attr['id'] === $name) return $attr;
-        $result = $this->idDef->validate($name, $config, $context);
-        if ($result === false) unset($attr['name']);
-        else $attr['name'] = $result;
-        return $attr;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform/SafeEmbed.php b/lib/php/HTMLPurifier/AttrTransform/SafeEmbed.php
deleted file mode 100644
index 4da449981fbd4b8f23992e317309ee46baaa347c..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform/SafeEmbed.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class HTMLPurifier_AttrTransform_SafeEmbed extends HTMLPurifier_AttrTransform
-{
-    public $name = "SafeEmbed";
-
-    public function transform($attr, $config, $context) {
-        $attr['allowscriptaccess'] = 'never';
-        $attr['allownetworking'] = 'internal';
-        $attr['type'] = 'application/x-shockwave-flash';
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform/SafeObject.php b/lib/php/HTMLPurifier/AttrTransform/SafeObject.php
deleted file mode 100644
index 1ed74898bae41dbe0102ff8065a355fd016227a7..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform/SafeObject.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Writes default type for all objects. Currently only supports flash.
- */
-class HTMLPurifier_AttrTransform_SafeObject extends HTMLPurifier_AttrTransform
-{
-    public $name = "SafeObject";
-
-    function transform($attr, $config, $context) {
-        if (!isset($attr['type'])) $attr['type'] = 'application/x-shockwave-flash';
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform/SafeParam.php b/lib/php/HTMLPurifier/AttrTransform/SafeParam.php
deleted file mode 100644
index 94e8052a9d09f3d71575a6a1d21176031d4a9013..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform/SafeParam.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * Validates name/value pairs in param tags to be used in safe objects. This
- * will only allow name values it recognizes, and pre-fill certain attributes
- * with required values.
- *
- * @note
- *      This class only supports Flash. In the future, Quicktime support
- *      may be added.
- *
- * @warning
- *      This class expects an injector to add the necessary parameters tags.
- */
-class HTMLPurifier_AttrTransform_SafeParam extends HTMLPurifier_AttrTransform
-{
-    public $name = "SafeParam";
-    private $uri;
-
-    public function __construct() {
-        $this->uri = new HTMLPurifier_AttrDef_URI(true); // embedded
-    }
-
-    public function transform($attr, $config, $context) {
-        // If we add support for other objects, we'll need to alter the
-        // transforms.
-        switch ($attr['name']) {
-            // application/x-shockwave-flash
-            // Keep this synchronized with Injector/SafeObject.php
-            case 'allowScriptAccess':
-                $attr['value'] = 'never';
-                break;
-            case 'allowNetworking':
-                $attr['value'] = 'internal';
-                break;
-            case 'wmode':
-                $attr['value'] = 'window';
-                break;
-            case 'movie':
-                $attr['value'] = $this->uri->validate($attr['value'], $config, $context);
-                break;
-            // add other cases to support other param name/value pairs
-            default:
-                $attr['name'] = $attr['value'] = null;
-        }
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform/ScriptRequired.php b/lib/php/HTMLPurifier/AttrTransform/ScriptRequired.php
deleted file mode 100644
index 4499050a22ac7fbb0012459ecbd04fe615560f47..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform/ScriptRequired.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Implements required attribute stipulation for <script>
- */
-class HTMLPurifier_AttrTransform_ScriptRequired extends HTMLPurifier_AttrTransform
-{
-    public function transform($attr, $config, $context) {
-        if (!isset($attr['type'])) {
-            $attr['type'] = 'text/javascript';
-        }
-        return $attr;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTransform/Textarea.php b/lib/php/HTMLPurifier/AttrTransform/Textarea.php
deleted file mode 100644
index 81ac3488ba87520621ec1a42131a9cc0131f2027..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTransform/Textarea.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Sets height/width defaults for <textarea>
- */
-class HTMLPurifier_AttrTransform_Textarea extends HTMLPurifier_AttrTransform
-{
-
-    public function transform($attr, $config, $context) {
-        // Calculated from Firefox
-        if (!isset($attr['cols'])) $attr['cols'] = '22';
-        if (!isset($attr['rows'])) $attr['rows'] = '3';
-        return $attr;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrTypes.php b/lib/php/HTMLPurifier/AttrTypes.php
deleted file mode 100644
index fc2ea4e5881bfc301db5fc7fcd9cd1aae9082932..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrTypes.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * Provides lookup array of attribute types to HTMLPurifier_AttrDef objects
- */
-class HTMLPurifier_AttrTypes
-{
-    /**
-     * Lookup array of attribute string identifiers to concrete implementations
-     */
-    protected $info = array();
-
-    /**
-     * Constructs the info array, supplying default implementations for attribute
-     * types.
-     */
-    public function __construct() {
-        // pseudo-types, must be instantiated via shorthand
-        $this->info['Enum']    = new HTMLPurifier_AttrDef_Enum();
-        $this->info['Bool']    = new HTMLPurifier_AttrDef_HTML_Bool();
-
-        $this->info['CDATA']    = new HTMLPurifier_AttrDef_Text();
-        $this->info['ID']       = new HTMLPurifier_AttrDef_HTML_ID();
-        $this->info['Length']   = new HTMLPurifier_AttrDef_HTML_Length();
-        $this->info['MultiLength'] = new HTMLPurifier_AttrDef_HTML_MultiLength();
-        $this->info['NMTOKENS'] = new HTMLPurifier_AttrDef_HTML_Nmtokens();
-        $this->info['Pixels']   = new HTMLPurifier_AttrDef_HTML_Pixels();
-        $this->info['Text']     = new HTMLPurifier_AttrDef_Text();
-        $this->info['URI']      = new HTMLPurifier_AttrDef_URI();
-        $this->info['LanguageCode'] = new HTMLPurifier_AttrDef_Lang();
-        $this->info['Color']    = new HTMLPurifier_AttrDef_HTML_Color();
-
-        // unimplemented aliases
-        $this->info['ContentType'] = new HTMLPurifier_AttrDef_Text();
-        $this->info['ContentTypes'] = new HTMLPurifier_AttrDef_Text();
-        $this->info['Charsets'] = new HTMLPurifier_AttrDef_Text();
-        $this->info['Character'] = new HTMLPurifier_AttrDef_Text();
-
-        // "proprietary" types
-        $this->info['Class'] = new HTMLPurifier_AttrDef_HTML_Class();
-
-        // number is really a positive integer (one or more digits)
-        // FIXME: ^^ not always, see start and value of list items
-        $this->info['Number']   = new HTMLPurifier_AttrDef_Integer(false, false, true);
-    }
-
-    /**
-     * Retrieves a type
-     * @param $type String type name
-     * @return Object AttrDef for type
-     */
-    public function get($type) {
-
-        // determine if there is any extra info tacked on
-        if (strpos($type, '#') !== false) list($type, $string) = explode('#', $type, 2);
-        else $string = '';
-
-        if (!isset($this->info[$type])) {
-            trigger_error('Cannot retrieve undefined attribute type ' . $type, E_USER_ERROR);
-            return;
-        }
-
-        return $this->info[$type]->make($string);
-
-    }
-
-    /**
-     * Sets a new implementation for a type
-     * @param $type String type name
-     * @param $impl Object AttrDef for type
-     */
-    public function set($type, $impl) {
-        $this->info[$type] = $impl;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/AttrValidator.php b/lib/php/HTMLPurifier/AttrValidator.php
deleted file mode 100644
index 829a0f8f225e5f56125c2daafc8ad835d694065a..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/AttrValidator.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-/**
- * Validates the attributes of a token. Doesn't manage required attributes
- * very well. The only reason we factored this out was because RemoveForeignElements
- * also needed it besides ValidateAttributes.
- */
-class HTMLPurifier_AttrValidator
-{
-
-    /**
-     * Validates the attributes of a token, returning a modified token
-     * that has valid tokens
-     * @param $token Reference to token to validate. We require a reference
-     *     because the operation this class performs on the token are
-     *     not atomic, so the context CurrentToken to be updated
-     *     throughout
-     * @param $config Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     */
-    public function validateToken(&$token, &$config, $context) {
-
-        $definition = $config->getHTMLDefinition();
-        $e =& $context->get('ErrorCollector', true);
-
-        // initialize IDAccumulator if necessary
-        $ok =& $context->get('IDAccumulator', true);
-        if (!$ok) {
-            $id_accumulator = HTMLPurifier_IDAccumulator::build($config, $context);
-            $context->register('IDAccumulator', $id_accumulator);
-        }
-
-        // initialize CurrentToken if necessary
-        $current_token =& $context->get('CurrentToken', true);
-        if (!$current_token) $context->register('CurrentToken', $token);
-
-        if (
-            !$token instanceof HTMLPurifier_Token_Start &&
-            !$token instanceof HTMLPurifier_Token_Empty
-        ) return $token;
-
-        // create alias to global definition array, see also $defs
-        // DEFINITION CALL
-        $d_defs = $definition->info_global_attr;
-
-        // don't update token until the very end, to ensure an atomic update
-        $attr = $token->attr;
-
-        // do global transformations (pre)
-        // nothing currently utilizes this
-        foreach ($definition->info_attr_transform_pre as $transform) {
-            $attr = $transform->transform($o = $attr, $config, $context);
-            if ($e) {
-                if ($attr != $o) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
-            }
-        }
-
-        // do local transformations only applicable to this element (pre)
-        // ex. <p align="right"> to <p style="text-align:right;">
-        foreach ($definition->info[$token->name]->attr_transform_pre as $transform) {
-            $attr = $transform->transform($o = $attr, $config, $context);
-            if ($e) {
-                if ($attr != $o) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
-            }
-        }
-
-        // create alias to this element's attribute definition array, see
-        // also $d_defs (global attribute definition array)
-        // DEFINITION CALL
-        $defs = $definition->info[$token->name]->attr;
-
-        $attr_key = false;
-        $context->register('CurrentAttr', $attr_key);
-
-        // iterate through all the attribute keypairs
-        // Watch out for name collisions: $key has previously been used
-        foreach ($attr as $attr_key => $value) {
-
-            // call the definition
-            if ( isset($defs[$attr_key]) ) {
-                // there is a local definition defined
-                if ($defs[$attr_key] === false) {
-                    // We've explicitly been told not to allow this element.
-                    // This is usually when there's a global definition
-                    // that must be overridden.
-                    // Theoretically speaking, we could have a
-                    // AttrDef_DenyAll, but this is faster!
-                    $result = false;
-                } else {
-                    // validate according to the element's definition
-                    $result = $defs[$attr_key]->validate(
-                                    $value, $config, $context
-                               );
-                }
-            } elseif ( isset($d_defs[$attr_key]) ) {
-                // there is a global definition defined, validate according
-                // to the global definition
-                $result = $d_defs[$attr_key]->validate(
-                                $value, $config, $context
-                           );
-            } else {
-                // system never heard of the attribute? DELETE!
-                $result = false;
-            }
-
-            // put the results into effect
-            if ($result === false || $result === null) {
-                // this is a generic error message that should replaced
-                // with more specific ones when possible
-                if ($e) $e->send(E_ERROR, 'AttrValidator: Attribute removed');
-
-                // remove the attribute
-                unset($attr[$attr_key]);
-            } elseif (is_string($result)) {
-                // generally, if a substitution is happening, there
-                // was some sort of implicit correction going on. We'll
-                // delegate it to the attribute classes to say exactly what.
-
-                // simple substitution
-                $attr[$attr_key] = $result;
-            } else {
-                // nothing happens
-            }
-
-            // we'd also want slightly more complicated substitution
-            // involving an array as the return value,
-            // although we're not sure how colliding attributes would
-            // resolve (certain ones would be completely overriden,
-            // others would prepend themselves).
-        }
-
-        $context->destroy('CurrentAttr');
-
-        // post transforms
-
-        // global (error reporting untested)
-        foreach ($definition->info_attr_transform_post as $transform) {
-            $attr = $transform->transform($o = $attr, $config, $context);
-            if ($e) {
-                if ($attr != $o) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
-            }
-        }
-
-        // local (error reporting untested)
-        foreach ($definition->info[$token->name]->attr_transform_post as $transform) {
-            $attr = $transform->transform($o = $attr, $config, $context);
-            if ($e) {
-                if ($attr != $o) $e->send(E_NOTICE, 'AttrValidator: Attributes transformed', $o, $attr);
-            }
-        }
-
-        $token->attr = $attr;
-
-        // destroy CurrentToken if we made it ourselves
-        if (!$current_token) $context->destroy('CurrentToken');
-
-    }
-
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Bootstrap.php b/lib/php/HTMLPurifier/Bootstrap.php
deleted file mode 100644
index 559f61a232024524fbf2b193f081cc93c245b434..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Bootstrap.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-// constants are slow, so we use as few as possible
-if (!defined('HTMLPURIFIER_PREFIX')) {
-    define('HTMLPURIFIER_PREFIX', realpath(dirname(__FILE__) . '/..'));
-}
-
-// accomodations for versions earlier than 5.0.2
-// borrowed from PHP_Compat, LGPL licensed, by Aidan Lister <aidan@php.net>
-if (!defined('PHP_EOL')) {
-    switch (strtoupper(substr(PHP_OS, 0, 3))) {
-        case 'WIN':
-            define('PHP_EOL', "\r\n");
-            break;
-        case 'DAR':
-            define('PHP_EOL', "\r");
-            break;
-        default:
-            define('PHP_EOL', "\n");
-    }
-}
-
-/**
- * Bootstrap class that contains meta-functionality for HTML Purifier such as
- * the autoload function.
- *
- * @note
- *      This class may be used without any other files from HTML Purifier.
- */
-class HTMLPurifier_Bootstrap
-{
-
-    /**
-     * Autoload function for HTML Purifier
-     * @param $class Class to load
-     */
-    public static function autoload($class) {
-        $file = HTMLPurifier_Bootstrap::getPath($class);
-        if (!$file) return false;
-        require HTMLPURIFIER_PREFIX . '/' . $file;
-        return true;
-    }
-
-    /**
-     * Returns the path for a specific class.
-     */
-    public static function getPath($class) {
-        if (strncmp('HTMLPurifier', $class, 12) !== 0) return false;
-        // Custom implementations
-        if (strncmp('HTMLPurifier_Language_', $class, 22) === 0) {
-            $code = str_replace('_', '-', substr($class, 22));
-            $file = 'HTMLPurifier/Language/classes/' . $code . '.php';
-        } else {
-            $file = str_replace('_', '/', $class) . '.php';
-        }
-        if (!file_exists(HTMLPURIFIER_PREFIX . '/' . $file)) return false;
-        return $file;
-    }
-
-    /**
-     * "Pre-registers" our autoloader on the SPL stack.
-     */
-    public static function registerAutoload() {
-        $autoload = array('HTMLPurifier_Bootstrap', 'autoload');
-        if ( ($funcs = spl_autoload_functions()) === false ) {
-            spl_autoload_register($autoload);
-        } elseif (function_exists('spl_autoload_unregister')) {
-            $compat = version_compare(PHP_VERSION, '5.1.2', '<=') &&
-                      version_compare(PHP_VERSION, '5.1.0', '>=');
-            foreach ($funcs as $func) {
-                if (is_array($func)) {
-                    // :TRICKY: There are some compatibility issues and some
-                    // places where we need to error out
-                    $reflector = new ReflectionMethod($func[0], $func[1]);
-                    if (!$reflector->isStatic()) {
-                        throw new Exception('
-                            HTML Purifier autoloader registrar is not compatible
-                            with non-static object methods due to PHP Bug #44144;
-                            Please do not use HTMLPurifier.autoload.php (or any
-                            file that includes this file); instead, place the code:
-                            spl_autoload_register(array(\'HTMLPurifier_Bootstrap\', \'autoload\'))
-                            after your own autoloaders.
-                        ');
-                    }
-                    // Suprisingly, spl_autoload_register supports the
-                    // Class::staticMethod callback format, although call_user_func doesn't
-                    if ($compat) $func = implode('::', $func);
-                }
-                spl_autoload_unregister($func);
-            }
-            spl_autoload_register($autoload);
-            foreach ($funcs as $func) spl_autoload_register($func);
-        }
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/CSSDefinition.php b/lib/php/HTMLPurifier/CSSDefinition.php
deleted file mode 100644
index 6a2e6f56d99472283e575b05f54820cb1c88baba..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/CSSDefinition.php
+++ /dev/null
@@ -1,292 +0,0 @@
-<?php
-
-/**
- * Defines allowed CSS attributes and what their values are.
- * @see HTMLPurifier_HTMLDefinition
- */
-class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition
-{
-
-    public $type = 'CSS';
-
-    /**
-     * Assoc array of attribute name to definition object.
-     */
-    public $info = array();
-
-    /**
-     * Constructs the info array.  The meat of this class.
-     */
-    protected function doSetup($config) {
-
-        $this->info['text-align'] = new HTMLPurifier_AttrDef_Enum(
-            array('left', 'right', 'center', 'justify'), false);
-
-        $border_style =
-        $this->info['border-bottom-style'] =
-        $this->info['border-right-style'] =
-        $this->info['border-left-style'] =
-        $this->info['border-top-style'] =  new HTMLPurifier_AttrDef_Enum(
-            array('none', 'hidden', 'dotted', 'dashed', 'solid', 'double',
-            'groove', 'ridge', 'inset', 'outset'), false);
-
-        $this->info['border-style'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_style);
-
-        $this->info['clear'] = new HTMLPurifier_AttrDef_Enum(
-            array('none', 'left', 'right', 'both'), false);
-        $this->info['float'] = new HTMLPurifier_AttrDef_Enum(
-            array('none', 'left', 'right'), false);
-        $this->info['font-style'] = new HTMLPurifier_AttrDef_Enum(
-            array('normal', 'italic', 'oblique'), false);
-        $this->info['font-variant'] = new HTMLPurifier_AttrDef_Enum(
-            array('normal', 'small-caps'), false);
-
-        $uri_or_none = new HTMLPurifier_AttrDef_CSS_Composite(
-            array(
-                new HTMLPurifier_AttrDef_Enum(array('none')),
-                new HTMLPurifier_AttrDef_CSS_URI()
-            )
-        );
-
-        $this->info['list-style-position'] = new HTMLPurifier_AttrDef_Enum(
-            array('inside', 'outside'), false);
-        $this->info['list-style-type'] = new HTMLPurifier_AttrDef_Enum(
-            array('disc', 'circle', 'square', 'decimal', 'lower-roman',
-            'upper-roman', 'lower-alpha', 'upper-alpha', 'none'), false);
-        $this->info['list-style-image'] = $uri_or_none;
-
-        $this->info['list-style'] = new HTMLPurifier_AttrDef_CSS_ListStyle($config);
-
-        $this->info['text-transform'] = new HTMLPurifier_AttrDef_Enum(
-            array('capitalize', 'uppercase', 'lowercase', 'none'), false);
-        $this->info['color'] = new HTMLPurifier_AttrDef_CSS_Color();
-
-        $this->info['background-image'] = $uri_or_none;
-        $this->info['background-repeat'] = new HTMLPurifier_AttrDef_Enum(
-            array('repeat', 'repeat-x', 'repeat-y', 'no-repeat')
-        );
-        $this->info['background-attachment'] = new HTMLPurifier_AttrDef_Enum(
-            array('scroll', 'fixed')
-        );
-        $this->info['background-position'] = new HTMLPurifier_AttrDef_CSS_BackgroundPosition();
-
-        $border_color =
-        $this->info['border-top-color'] =
-        $this->info['border-bottom-color'] =
-        $this->info['border-left-color'] =
-        $this->info['border-right-color'] =
-        $this->info['background-color'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
-            new HTMLPurifier_AttrDef_Enum(array('transparent')),
-            new HTMLPurifier_AttrDef_CSS_Color()
-        ));
-
-        $this->info['background'] = new HTMLPurifier_AttrDef_CSS_Background($config);
-
-        $this->info['border-color'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_color);
-
-        $border_width =
-        $this->info['border-top-width'] =
-        $this->info['border-bottom-width'] =
-        $this->info['border-left-width'] =
-        $this->info['border-right-width'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
-            new HTMLPurifier_AttrDef_Enum(array('thin', 'medium', 'thick')),
-            new HTMLPurifier_AttrDef_CSS_Length('0') //disallow negative
-        ));
-
-        $this->info['border-width'] = new HTMLPurifier_AttrDef_CSS_Multiple($border_width);
-
-        $this->info['letter-spacing'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
-            new HTMLPurifier_AttrDef_Enum(array('normal')),
-            new HTMLPurifier_AttrDef_CSS_Length()
-        ));
-
-        $this->info['word-spacing'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
-            new HTMLPurifier_AttrDef_Enum(array('normal')),
-            new HTMLPurifier_AttrDef_CSS_Length()
-        ));
-
-        $this->info['font-size'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
-            new HTMLPurifier_AttrDef_Enum(array('xx-small', 'x-small',
-                'small', 'medium', 'large', 'x-large', 'xx-large',
-                'larger', 'smaller')),
-            new HTMLPurifier_AttrDef_CSS_Percentage(),
-            new HTMLPurifier_AttrDef_CSS_Length()
-        ));
-
-        $this->info['line-height'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
-            new HTMLPurifier_AttrDef_Enum(array('normal')),
-            new HTMLPurifier_AttrDef_CSS_Number(true), // no negatives
-            new HTMLPurifier_AttrDef_CSS_Length('0'),
-            new HTMLPurifier_AttrDef_CSS_Percentage(true)
-        ));
-
-        $margin =
-        $this->info['margin-top'] =
-        $this->info['margin-bottom'] =
-        $this->info['margin-left'] =
-        $this->info['margin-right'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
-            new HTMLPurifier_AttrDef_CSS_Length(),
-            new HTMLPurifier_AttrDef_CSS_Percentage(),
-            new HTMLPurifier_AttrDef_Enum(array('auto'))
-        ));
-
-        $this->info['margin'] = new HTMLPurifier_AttrDef_CSS_Multiple($margin);
-
-        // non-negative
-        $padding =
-        $this->info['padding-top'] =
-        $this->info['padding-bottom'] =
-        $this->info['padding-left'] =
-        $this->info['padding-right'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
-            new HTMLPurifier_AttrDef_CSS_Length('0'),
-            new HTMLPurifier_AttrDef_CSS_Percentage(true)
-        ));
-
-        $this->info['padding'] = new HTMLPurifier_AttrDef_CSS_Multiple($padding);
-
-        $this->info['text-indent'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
-            new HTMLPurifier_AttrDef_CSS_Length(),
-            new HTMLPurifier_AttrDef_CSS_Percentage()
-        ));
-
-        $trusted_wh = new HTMLPurifier_AttrDef_CSS_Composite(array(
-            new HTMLPurifier_AttrDef_CSS_Length('0'),
-            new HTMLPurifier_AttrDef_CSS_Percentage(true),
-            new HTMLPurifier_AttrDef_Enum(array('auto'))
-        ));
-        $max = $config->get('CSS.MaxImgLength');
-
-        $this->info['width'] =
-        $this->info['height'] =
-            $max === null ?
-            $trusted_wh :
-            new HTMLPurifier_AttrDef_Switch('img',
-                // For img tags:
-                new HTMLPurifier_AttrDef_CSS_Composite(array(
-                    new HTMLPurifier_AttrDef_CSS_Length('0', $max),
-                    new HTMLPurifier_AttrDef_Enum(array('auto'))
-                )),
-                // For everyone else:
-                $trusted_wh
-            );
-
-        $this->info['text-decoration'] = new HTMLPurifier_AttrDef_CSS_TextDecoration();
-
-        $this->info['font-family'] = new HTMLPurifier_AttrDef_CSS_FontFamily();
-
-        // this could use specialized code
-        $this->info['font-weight'] = new HTMLPurifier_AttrDef_Enum(
-            array('normal', 'bold', 'bolder', 'lighter', '100', '200', '300',
-            '400', '500', '600', '700', '800', '900'), false);
-
-        // MUST be called after other font properties, as it references
-        // a CSSDefinition object
-        $this->info['font'] = new HTMLPurifier_AttrDef_CSS_Font($config);
-
-        // same here
-        $this->info['border'] =
-        $this->info['border-bottom'] =
-        $this->info['border-top'] =
-        $this->info['border-left'] =
-        $this->info['border-right'] = new HTMLPurifier_AttrDef_CSS_Border($config);
-
-        $this->info['border-collapse'] = new HTMLPurifier_AttrDef_Enum(array(
-            'collapse', 'separate'));
-
-        $this->info['caption-side'] = new HTMLPurifier_AttrDef_Enum(array(
-            'top', 'bottom'));
-
-        $this->info['table-layout'] = new HTMLPurifier_AttrDef_Enum(array(
-            'auto', 'fixed'));
-
-        $this->info['vertical-align'] = new HTMLPurifier_AttrDef_CSS_Composite(array(
-            new HTMLPurifier_AttrDef_Enum(array('baseline', 'sub', 'super',
-                'top', 'text-top', 'middle', 'bottom', 'text-bottom')),
-            new HTMLPurifier_AttrDef_CSS_Length(),
-            new HTMLPurifier_AttrDef_CSS_Percentage()
-        ));
-
-        $this->info['border-spacing'] = new HTMLPurifier_AttrDef_CSS_Multiple(new HTMLPurifier_AttrDef_CSS_Length(), 2);
-
-        // partial support
-        $this->info['white-space'] = new HTMLPurifier_AttrDef_Enum(array('nowrap'));
-
-        if ($config->get('CSS.Proprietary')) {
-            $this->doSetupProprietary($config);
-        }
-
-        if ($config->get('CSS.AllowTricky')) {
-            $this->doSetupTricky($config);
-        }
-
-        $allow_important = $config->get('CSS.AllowImportant');
-        // wrap all attr-defs with decorator that handles !important
-        foreach ($this->info as $k => $v) {
-            $this->info[$k] = new HTMLPurifier_AttrDef_CSS_ImportantDecorator($v, $allow_important);
-        }
-
-        $this->setupConfigStuff($config);
-    }
-
-    protected function doSetupProprietary($config) {
-        // Internet Explorer only scrollbar colors
-        $this->info['scrollbar-arrow-color']        = new HTMLPurifier_AttrDef_CSS_Color();
-        $this->info['scrollbar-base-color']         = new HTMLPurifier_AttrDef_CSS_Color();
-        $this->info['scrollbar-darkshadow-color']   = new HTMLPurifier_AttrDef_CSS_Color();
-        $this->info['scrollbar-face-color']         = new HTMLPurifier_AttrDef_CSS_Color();
-        $this->info['scrollbar-highlight-color']    = new HTMLPurifier_AttrDef_CSS_Color();
-        $this->info['scrollbar-shadow-color']       = new HTMLPurifier_AttrDef_CSS_Color();
-
-        // technically not proprietary, but CSS3, and no one supports it
-        $this->info['opacity']          = new HTMLPurifier_AttrDef_CSS_AlphaValue();
-        $this->info['-moz-opacity']     = new HTMLPurifier_AttrDef_CSS_AlphaValue();
-        $this->info['-khtml-opacity']   = new HTMLPurifier_AttrDef_CSS_AlphaValue();
-
-        // only opacity, for now
-        $this->info['filter'] = new HTMLPurifier_AttrDef_CSS_Filter();
-
-    }
-
-    protected function doSetupTricky($config) {
-        $this->info['display'] = new HTMLPurifier_AttrDef_Enum(array(
-            'inline', 'block', 'list-item', 'run-in', 'compact',
-            'marker', 'table', 'inline-table', 'table-row-group',
-            'table-header-group', 'table-footer-group', 'table-row',
-            'table-column-group', 'table-column', 'table-cell', 'table-caption', 'none'
-        ));
-        $this->info['visibility'] = new HTMLPurifier_AttrDef_Enum(array(
-            'visible', 'hidden', 'collapse'
-        ));
-        $this->info['overflow'] = new HTMLPurifier_AttrDef_Enum(array('visible', 'hidden', 'auto', 'scroll'));
-    }
-
-
-    /**
-     * Performs extra config-based processing. Based off of
-     * HTMLPurifier_HTMLDefinition.
-     * @todo Refactor duplicate elements into common class (probably using
-     *       composition, not inheritance).
-     */
-    protected function setupConfigStuff($config) {
-
-        // setup allowed elements
-        $support = "(for information on implementing this, see the ".
-                   "support forums) ";
-        $allowed_attributes = $config->get('CSS.AllowedProperties');
-        if ($allowed_attributes !== null) {
-            foreach ($this->info as $name => $d) {
-                if(!isset($allowed_attributes[$name])) unset($this->info[$name]);
-                unset($allowed_attributes[$name]);
-            }
-            // emit errors
-            foreach ($allowed_attributes as $name => $d) {
-                // :TODO: Is this htmlspecialchars() call really necessary?
-                $name = htmlspecialchars($name);
-                trigger_error("Style attribute '$name' is not supported $support", E_USER_WARNING);
-            }
-        }
-
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ChildDef.php b/lib/php/HTMLPurifier/ChildDef.php
deleted file mode 100644
index c5d5216dab2d2c29b3b1d6be417a550dbf5b2345..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ChildDef.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Defines allowed child nodes and validates tokens against it.
- */
-abstract class HTMLPurifier_ChildDef
-{
-    /**
-     * Type of child definition, usually right-most part of class name lowercase.
-     * Used occasionally in terms of context.
-     */
-    public $type;
-
-    /**
-     * Bool that indicates whether or not an empty array of children is okay
-     *
-     * This is necessary for redundant checking when changes affecting
-     * a child node may cause a parent node to now be disallowed.
-     */
-    public $allow_empty;
-
-    /**
-     * Lookup array of all elements that this definition could possibly allow
-     */
-    public $elements = array();
-
-    /**
-     * Get lookup of tag names that should not close this element automatically.
-     * All other elements will do so.
-     */
-    public function getAllowedElements($config) {
-        return $this->elements;
-    }
-
-    /**
-     * Validates nodes according to definition and returns modification.
-     *
-     * @param $tokens_of_children Array of HTMLPurifier_Token
-     * @param $config HTMLPurifier_Config object
-     * @param $context HTMLPurifier_Context object
-     * @return bool true to leave nodes as is
-     * @return bool false to remove parent node
-     * @return array of replacement child tokens
-     */
-    abstract public function validateChildren($tokens_of_children, $config, $context);
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ChildDef/Chameleon.php b/lib/php/HTMLPurifier/ChildDef/Chameleon.php
deleted file mode 100644
index 15c364ee33c53bc36a0fddeb77bbb2eae0903d84..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ChildDef/Chameleon.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Definition that uses different definitions depending on context.
- *
- * The del and ins tags are notable because they allow different types of
- * elements depending on whether or not they're in a block or inline context.
- * Chameleon allows this behavior to happen by using two different
- * definitions depending on context.  While this somewhat generalized,
- * it is specifically intended for those two tags.
- */
-class HTMLPurifier_ChildDef_Chameleon extends HTMLPurifier_ChildDef
-{
-
-    /**
-     * Instance of the definition object to use when inline. Usually stricter.
-     */
-    public $inline;
-
-    /**
-     * Instance of the definition object to use when block.
-     */
-    public $block;
-
-    public $type = 'chameleon';
-
-    /**
-     * @param $inline List of elements to allow when inline.
-     * @param $block List of elements to allow when block.
-     */
-    public function __construct($inline, $block) {
-        $this->inline = new HTMLPurifier_ChildDef_Optional($inline);
-        $this->block  = new HTMLPurifier_ChildDef_Optional($block);
-        $this->elements = $this->block->elements;
-    }
-
-    public function validateChildren($tokens_of_children, $config, $context) {
-        if ($context->get('IsInline') === false) {
-            return $this->block->validateChildren(
-                $tokens_of_children, $config, $context);
-        } else {
-            return $this->inline->validateChildren(
-                $tokens_of_children, $config, $context);
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ChildDef/Custom.php b/lib/php/HTMLPurifier/ChildDef/Custom.php
deleted file mode 100644
index b68047b4b55f9f6e3564f06e11b038c6a154fe94..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ChildDef/Custom.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * Custom validation class, accepts DTD child definitions
- *
- * @warning Currently this class is an all or nothing proposition, that is,
- *          it will only give a bool return value.
- */
-class HTMLPurifier_ChildDef_Custom extends HTMLPurifier_ChildDef
-{
-    public $type = 'custom';
-    public $allow_empty = false;
-    /**
-     * Allowed child pattern as defined by the DTD
-     */
-    public $dtd_regex;
-    /**
-     * PCRE regex derived from $dtd_regex
-     * @private
-     */
-    private $_pcre_regex;
-    /**
-     * @param $dtd_regex Allowed child pattern from the DTD
-     */
-    public function __construct($dtd_regex) {
-        $this->dtd_regex = $dtd_regex;
-        $this->_compileRegex();
-    }
-    /**
-     * Compiles the PCRE regex from a DTD regex ($dtd_regex to $_pcre_regex)
-     */
-    protected function _compileRegex() {
-        $raw = str_replace(' ', '', $this->dtd_regex);
-        if ($raw{0} != '(') {
-            $raw = "($raw)";
-        }
-        $el = '[#a-zA-Z0-9_.-]+';
-        $reg = $raw;
-
-        // COMPLICATED! AND MIGHT BE BUGGY! I HAVE NO CLUE WHAT I'M
-        // DOING! Seriously: if there's problems, please report them.
-
-        // collect all elements into the $elements array
-        preg_match_all("/$el/", $reg, $matches);
-        foreach ($matches[0] as $match) {
-            $this->elements[$match] = true;
-        }
-
-        // setup all elements as parentheticals with leading commas
-        $reg = preg_replace("/$el/", '(,\\0)', $reg);
-
-        // remove commas when they were not solicited
-        $reg = preg_replace("/([^,(|]\(+),/", '\\1', $reg);
-
-        // remove all non-paranthetical commas: they are handled by first regex
-        $reg = preg_replace("/,\(/", '(', $reg);
-
-        $this->_pcre_regex = $reg;
-    }
-    public function validateChildren($tokens_of_children, $config, $context) {
-        $list_of_children = '';
-        $nesting = 0; // depth into the nest
-        foreach ($tokens_of_children as $token) {
-            if (!empty($token->is_whitespace)) continue;
-
-            $is_child = ($nesting == 0); // direct
-
-            if ($token instanceof HTMLPurifier_Token_Start) {
-                $nesting++;
-            } elseif ($token instanceof HTMLPurifier_Token_End) {
-                $nesting--;
-            }
-
-            if ($is_child) {
-                $list_of_children .= $token->name . ',';
-            }
-        }
-        // add leading comma to deal with stray comma declarations
-        $list_of_children = ',' . rtrim($list_of_children, ',');
-        $okay =
-            preg_match(
-                '/^,?'.$this->_pcre_regex.'$/',
-                $list_of_children
-            );
-
-        return (bool) $okay;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ChildDef/Empty.php b/lib/php/HTMLPurifier/ChildDef/Empty.php
deleted file mode 100644
index 13171f6651dc87ff98353d66454162cdf6392574..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ChildDef/Empty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * Definition that disallows all elements.
- * @warning validateChildren() in this class is actually never called, because
- *          empty elements are corrected in HTMLPurifier_Strategy_MakeWellFormed
- *          before child definitions are parsed in earnest by
- *          HTMLPurifier_Strategy_FixNesting.
- */
-class HTMLPurifier_ChildDef_Empty extends HTMLPurifier_ChildDef
-{
-    public $allow_empty = true;
-    public $type = 'empty';
-    public function __construct() {}
-    public function validateChildren($tokens_of_children, $config, $context) {
-        return array();
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ChildDef/Optional.php b/lib/php/HTMLPurifier/ChildDef/Optional.php
deleted file mode 100644
index 32bcb9898eac9ea6fff386e1617ad332b5c19971..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ChildDef/Optional.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Definition that allows a set of elements, and allows no children.
- * @note This is a hack to reuse code from HTMLPurifier_ChildDef_Required,
- *       really, one shouldn't inherit from the other.  Only altered behavior
- *       is to overload a returned false with an array.  Thus, it will never
- *       return false.
- */
-class HTMLPurifier_ChildDef_Optional extends HTMLPurifier_ChildDef_Required
-{
-    public $allow_empty = true;
-    public $type = 'optional';
-    public function validateChildren($tokens_of_children, $config, $context) {
-        $result = parent::validateChildren($tokens_of_children, $config, $context);
-        // we assume that $tokens_of_children is not modified
-        if ($result === false) {
-            if (empty($tokens_of_children)) return true;
-            elseif ($this->whitespace) return $tokens_of_children;
-            else return array();
-        }
-        return $result;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ChildDef/Required.php b/lib/php/HTMLPurifier/ChildDef/Required.php
deleted file mode 100644
index 4889f249b8629fc71460f344e4fa8deb30d1d22f..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ChildDef/Required.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-/**
- * Definition that allows a set of elements, but disallows empty children.
- */
-class HTMLPurifier_ChildDef_Required extends HTMLPurifier_ChildDef
-{
-    /**
-     * Lookup table of allowed elements.
-     * @public
-     */
-    public $elements = array();
-    /**
-     * Whether or not the last passed node was all whitespace.
-     */
-    protected $whitespace = false;
-    /**
-     * @param $elements List of allowed element names (lowercase).
-     */
-    public function __construct($elements) {
-        if (is_string($elements)) {
-            $elements = str_replace(' ', '', $elements);
-            $elements = explode('|', $elements);
-        }
-        $keys = array_keys($elements);
-        if ($keys == array_keys($keys)) {
-            $elements = array_flip($elements);
-            foreach ($elements as $i => $x) {
-                $elements[$i] = true;
-                if (empty($i)) unset($elements[$i]); // remove blank
-            }
-        }
-        $this->elements = $elements;
-    }
-    public $allow_empty = false;
-    public $type = 'required';
-    public function validateChildren($tokens_of_children, $config, $context) {
-        // Flag for subclasses
-        $this->whitespace = false;
-
-        // if there are no tokens, delete parent node
-        if (empty($tokens_of_children)) return false;
-
-        // the new set of children
-        $result = array();
-
-        // current depth into the nest
-        $nesting = 0;
-
-        // whether or not we're deleting a node
-        $is_deleting = false;
-
-        // whether or not parsed character data is allowed
-        // this controls whether or not we silently drop a tag
-        // or generate escaped HTML from it
-        $pcdata_allowed = isset($this->elements['#PCDATA']);
-
-        // a little sanity check to make sure it's not ALL whitespace
-        $all_whitespace = true;
-
-        // some configuration
-        $escape_invalid_children = $config->get('Core.EscapeInvalidChildren');
-
-        // generator
-        $gen = new HTMLPurifier_Generator($config, $context);
-
-        foreach ($tokens_of_children as $token) {
-            if (!empty($token->is_whitespace)) {
-                $result[] = $token;
-                continue;
-            }
-            $all_whitespace = false; // phew, we're not talking about whitespace
-
-            $is_child = ($nesting == 0);
-
-            if ($token instanceof HTMLPurifier_Token_Start) {
-                $nesting++;
-            } elseif ($token instanceof HTMLPurifier_Token_End) {
-                $nesting--;
-            }
-
-            if ($is_child) {
-                $is_deleting = false;
-                if (!isset($this->elements[$token->name])) {
-                    $is_deleting = true;
-                    if ($pcdata_allowed && $token instanceof HTMLPurifier_Token_Text) {
-                        $result[] = $token;
-                    } elseif ($pcdata_allowed && $escape_invalid_children) {
-                        $result[] = new HTMLPurifier_Token_Text(
-                            $gen->generateFromToken($token)
-                        );
-                    }
-                    continue;
-                }
-            }
-            if (!$is_deleting || ($pcdata_allowed && $token instanceof HTMLPurifier_Token_Text)) {
-                $result[] = $token;
-            } elseif ($pcdata_allowed && $escape_invalid_children) {
-                $result[] =
-                    new HTMLPurifier_Token_Text(
-                        $gen->generateFromToken($token)
-                    );
-            } else {
-                // drop silently
-            }
-        }
-        if (empty($result)) return false;
-        if ($all_whitespace) {
-            $this->whitespace = true;
-            return false;
-        }
-        if ($tokens_of_children == $result) return true;
-        return $result;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ChildDef/StrictBlockquote.php b/lib/php/HTMLPurifier/ChildDef/StrictBlockquote.php
deleted file mode 100644
index dfae8a6e5e1d28f81b7484bcf81d941e4bf6dfab..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ChildDef/StrictBlockquote.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/**
- * Takes the contents of blockquote when in strict and reformats for validation.
- */
-class HTMLPurifier_ChildDef_StrictBlockquote extends HTMLPurifier_ChildDef_Required
-{
-    protected $real_elements;
-    protected $fake_elements;
-    public $allow_empty = true;
-    public $type = 'strictblockquote';
-    protected $init = false;
-
-    /**
-     * @note We don't want MakeWellFormed to auto-close inline elements since
-     *       they might be allowed.
-     */
-    public function getAllowedElements($config) {
-        $this->init($config);
-        return $this->fake_elements;
-    }
-
-    public function validateChildren($tokens_of_children, $config, $context) {
-
-        $this->init($config);
-
-        // trick the parent class into thinking it allows more
-        $this->elements = $this->fake_elements;
-        $result = parent::validateChildren($tokens_of_children, $config, $context);
-        $this->elements = $this->real_elements;
-
-        if ($result === false) return array();
-        if ($result === true) $result = $tokens_of_children;
-
-        $def = $config->getHTMLDefinition();
-        $block_wrap_start = new HTMLPurifier_Token_Start($def->info_block_wrapper);
-        $block_wrap_end   = new HTMLPurifier_Token_End(  $def->info_block_wrapper);
-        $is_inline = false;
-        $depth = 0;
-        $ret = array();
-
-        // assuming that there are no comment tokens
-        foreach ($result as $i => $token) {
-            $token = $result[$i];
-            // ifs are nested for readability
-            if (!$is_inline) {
-                if (!$depth) {
-                     if (
-                        ($token instanceof HTMLPurifier_Token_Text && !$token->is_whitespace) ||
-                        (!$token instanceof HTMLPurifier_Token_Text && !isset($this->elements[$token->name]))
-                     ) {
-                        $is_inline = true;
-                        $ret[] = $block_wrap_start;
-                     }
-                }
-            } else {
-                if (!$depth) {
-                    // starting tokens have been inline text / empty
-                    if ($token instanceof HTMLPurifier_Token_Start || $token instanceof HTMLPurifier_Token_Empty) {
-                        if (isset($this->elements[$token->name])) {
-                            // ended
-                            $ret[] = $block_wrap_end;
-                            $is_inline = false;
-                        }
-                    }
-                }
-            }
-            $ret[] = $token;
-            if ($token instanceof HTMLPurifier_Token_Start) $depth++;
-            if ($token instanceof HTMLPurifier_Token_End)   $depth--;
-        }
-        if ($is_inline) $ret[] = $block_wrap_end;
-        return $ret;
-    }
-
-    private function init($config) {
-        if (!$this->init) {
-            $def = $config->getHTMLDefinition();
-            // allow all inline elements
-            $this->real_elements = $this->elements;
-            $this->fake_elements = $def->info_content_sets['Flow'];
-            $this->fake_elements['#PCDATA'] = true;
-            $this->init = true;
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ChildDef/Table.php b/lib/php/HTMLPurifier/ChildDef/Table.php
deleted file mode 100644
index 34f0227dd2cc549f4dacef4efd9d6ae8b43680d9..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ChildDef/Table.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-/**
- * Definition for tables
- */
-class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
-{
-    public $allow_empty = false;
-    public $type = 'table';
-    public $elements = array('tr' => true, 'tbody' => true, 'thead' => true,
-        'tfoot' => true, 'caption' => true, 'colgroup' => true, 'col' => true);
-    public function __construct() {}
-    public function validateChildren($tokens_of_children, $config, $context) {
-        if (empty($tokens_of_children)) return false;
-
-        // this ensures that the loop gets run one last time before closing
-        // up. It's a little bit of a hack, but it works! Just make sure you
-        // get rid of the token later.
-        $tokens_of_children[] = false;
-
-        // only one of these elements is allowed in a table
-        $caption = false;
-        $thead   = false;
-        $tfoot   = false;
-
-        // as many of these as you want
-        $cols    = array();
-        $content = array();
-
-        $nesting = 0; // current depth so we can determine nodes
-        $is_collecting = false; // are we globbing together tokens to package
-                                // into one of the collectors?
-        $collection = array(); // collected nodes
-        $tag_index = 0; // the first node might be whitespace,
-                            // so this tells us where the start tag is
-
-        foreach ($tokens_of_children as $token) {
-            $is_child = ($nesting == 0);
-
-            if ($token === false) {
-                // terminating sequence started
-            } elseif ($token instanceof HTMLPurifier_Token_Start) {
-                $nesting++;
-            } elseif ($token instanceof HTMLPurifier_Token_End) {
-                $nesting--;
-            }
-
-            // handle node collection
-            if ($is_collecting) {
-                if ($is_child) {
-                    // okay, let's stash the tokens away
-                    // first token tells us the type of the collection
-                    switch ($collection[$tag_index]->name) {
-                        case 'tr':
-                        case 'tbody':
-                            $content[] = $collection;
-                            break;
-                        case 'caption':
-                            if ($caption !== false) break;
-                            $caption = $collection;
-                            break;
-                        case 'thead':
-                        case 'tfoot':
-                            // access the appropriate variable, $thead or $tfoot
-                            $var = $collection[$tag_index]->name;
-                            if ($$var === false) {
-                                $$var = $collection;
-                            } else {
-                                // transmutate the first and less entries into
-                                // tbody tags, and then put into content
-                                $collection[$tag_index]->name = 'tbody';
-                                $collection[count($collection)-1]->name = 'tbody';
-                                $content[] = $collection;
-                            }
-                            break;
-                         case 'colgroup':
-                            $cols[] = $collection;
-                            break;
-                    }
-                    $collection = array();
-                    $is_collecting = false;
-                    $tag_index = 0;
-                } else {
-                    // add the node to the collection
-                    $collection[] = $token;
-                }
-            }
-
-            // terminate
-            if ($token === false) break;
-
-            if ($is_child) {
-                // determine what we're dealing with
-                if ($token->name == 'col') {
-                    // the only empty tag in the possie, we can handle it
-                    // immediately
-                    $cols[] = array_merge($collection, array($token));
-                    $collection = array();
-                    $tag_index = 0;
-                    continue;
-                }
-                switch($token->name) {
-                    case 'caption':
-                    case 'colgroup':
-                    case 'thead':
-                    case 'tfoot':
-                    case 'tbody':
-                    case 'tr':
-                        $is_collecting = true;
-                        $collection[] = $token;
-                        continue;
-                    default:
-                        if (!empty($token->is_whitespace)) {
-                            $collection[] = $token;
-                            $tag_index++;
-                        }
-                        continue;
-                }
-            }
-        }
-
-        if (empty($content)) return false;
-
-        $ret = array();
-        if ($caption !== false) $ret = array_merge($ret, $caption);
-        if ($cols !== false)    foreach ($cols as $token_array) $ret = array_merge($ret, $token_array);
-        if ($thead !== false)   $ret = array_merge($ret, $thead);
-        if ($tfoot !== false)   $ret = array_merge($ret, $tfoot);
-        foreach ($content as $token_array) $ret = array_merge($ret, $token_array);
-        if (!empty($collection) && $is_collecting == false){
-            // grab the trailing space
-            $ret = array_merge($ret, $collection);
-        }
-
-        array_pop($tokens_of_children); // remove phantom token
-
-        return ($ret === $tokens_of_children) ? true : $ret;
-
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Config.php b/lib/php/HTMLPurifier/Config.php
deleted file mode 100644
index a01706043adf8a2d471a27ad480ce46eee8101d9..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Config.php
+++ /dev/null
@@ -1,580 +0,0 @@
-<?php
-
-/**
- * Configuration object that triggers customizable behavior.
- *
- * @warning This class is strongly defined: that means that the class
- *          will fail if an undefined directive is retrieved or set.
- *
- * @note Many classes that could (although many times don't) use the
- *       configuration object make it a mandatory parameter.  This is
- *       because a configuration object should always be forwarded,
- *       otherwise, you run the risk of missing a parameter and then
- *       being stumped when a configuration directive doesn't work.
- *
- * @todo Reconsider some of the public member variables
- */
-class HTMLPurifier_Config
-{
-
-    /**
-     * HTML Purifier's version
-     */
-    public $version = '4.0.0';
-
-    /**
-     * Bool indicator whether or not to automatically finalize
-     * the object if a read operation is done
-     */
-    public $autoFinalize = true;
-
-    // protected member variables
-
-    /**
-     * Namespace indexed array of serials for specific namespaces (see
-     * getSerial() for more info).
-     */
-    protected $serials = array();
-
-    /**
-     * Serial for entire configuration object
-     */
-    protected $serial;
-
-    /**
-     * Parser for variables
-     */
-    protected $parser;
-
-    /**
-     * Reference HTMLPurifier_ConfigSchema for value checking
-     * @note This is public for introspective purposes. Please don't
-     *       abuse!
-     */
-    public $def;
-
-    /**
-     * Indexed array of definitions
-     */
-    protected $definitions;
-
-    /**
-     * Bool indicator whether or not config is finalized
-     */
-    protected $finalized = false;
-
-    /**
-     * Property list containing configuration directives.
-     */
-    protected $plist;
-
-    /**
-     * Whether or not a set is taking place due to an
-     * alias lookup.
-     */
-    private $aliasMode;
-
-    /**
-     * Set to false if you do not want line and file numbers in errors
-     * (useful when unit testing)
-     */
-    public $chatty = true;
-
-    /**
-     * Current lock; only gets to this namespace are allowed.
-     */
-    private $lock;
-
-    /**
-     * @param $definition HTMLPurifier_ConfigSchema that defines what directives
-     *                    are allowed.
-     */
-    public function __construct($definition, $parent = null) {
-        $parent = $parent ? $parent : $definition->defaultPlist;
-        $this->plist = new HTMLPurifier_PropertyList($parent);
-        $this->def = $definition; // keep a copy around for checking
-        $this->parser = new HTMLPurifier_VarParser_Flexible();
-    }
-
-    /**
-     * Convenience constructor that creates a config object based on a mixed var
-     * @param mixed $config Variable that defines the state of the config
-     *                      object. Can be: a HTMLPurifier_Config() object,
-     *                      an array of directives based on loadArray(),
-     *                      or a string filename of an ini file.
-     * @param HTMLPurifier_ConfigSchema Schema object
-     * @return Configured HTMLPurifier_Config object
-     */
-    public static function create($config, $schema = null) {
-        if ($config instanceof HTMLPurifier_Config) {
-            // pass-through
-            return $config;
-        }
-        if (!$schema) {
-            $ret = HTMLPurifier_Config::createDefault();
-        } else {
-            $ret = new HTMLPurifier_Config($schema);
-        }
-        if (is_string($config)) $ret->loadIni($config);
-        elseif (is_array($config)) $ret->loadArray($config);
-        return $ret;
-    }
-
-    /**
-     * Creates a new config object that inherits from a previous one.
-     * @param HTMLPurifier_Config $config Configuration object to inherit
-     *        from.
-     * @return HTMLPurifier_Config object with $config as its parent.
-     */
-    public static function inherit(HTMLPurifier_Config $config) {
-        return new HTMLPurifier_Config($config->def, $config->plist);
-    }
-
-    /**
-     * Convenience constructor that creates a default configuration object.
-     * @return Default HTMLPurifier_Config object.
-     */
-    public static function createDefault() {
-        $definition = HTMLPurifier_ConfigSchema::instance();
-        $config = new HTMLPurifier_Config($definition);
-        return $config;
-    }
-
-    /**
-     * Retreives a value from the configuration.
-     * @param $key String key
-     */
-    public function get($key, $a = null) {
-        if ($a !== null) {
-            $this->triggerError("Using deprecated API: use \$config->get('$key.$a') instead", E_USER_WARNING);
-            $key = "$key.$a";
-        }
-        if (!$this->finalized) $this->autoFinalize();
-        if (!isset($this->def->info[$key])) {
-            // can't add % due to SimpleTest bug
-            $this->triggerError('Cannot retrieve value of undefined directive ' . htmlspecialchars($key),
-                E_USER_WARNING);
-            return;
-        }
-        if (isset($this->def->info[$key]->isAlias)) {
-            $d = $this->def->info[$key];
-            $this->triggerError('Cannot get value from aliased directive, use real name ' . $d->key,
-                E_USER_ERROR);
-            return;
-        }
-        if ($this->lock) {
-            list($ns) = explode('.', $key);
-            if ($ns !== $this->lock) {
-                $this->triggerError('Cannot get value of namespace ' . $ns . ' when lock for ' . $this->lock . ' is active, this probably indicates a Definition setup method is accessing directives that are not within its namespace', E_USER_ERROR);
-                return;
-            }
-        }
-        return $this->plist->get($key);
-    }
-
-    /**
-     * Retreives an array of directives to values from a given namespace
-     * @param $namespace String namespace
-     */
-    public function getBatch($namespace) {
-        if (!$this->finalized) $this->autoFinalize();
-        $full = $this->getAll();
-        if (!isset($full[$namespace])) {
-            $this->triggerError('Cannot retrieve undefined namespace ' . htmlspecialchars($namespace),
-                E_USER_WARNING);
-            return;
-        }
-        return $full[$namespace];
-    }
-
-    /**
-     * Returns a md5 signature of a segment of the configuration object
-     * that uniquely identifies that particular configuration
-     * @note Revision is handled specially and is removed from the batch
-     *       before processing!
-     * @param $namespace Namespace to get serial for
-     */
-    public function getBatchSerial($namespace) {
-        if (empty($this->serials[$namespace])) {
-            $batch = $this->getBatch($namespace);
-            unset($batch['DefinitionRev']);
-            $this->serials[$namespace] = md5(serialize($batch));
-        }
-        return $this->serials[$namespace];
-    }
-
-    /**
-     * Returns a md5 signature for the entire configuration object
-     * that uniquely identifies that particular configuration
-     */
-    public function getSerial() {
-        if (empty($this->serial)) {
-            $this->serial = md5(serialize($this->getAll()));
-        }
-        return $this->serial;
-    }
-
-    /**
-     * Retrieves all directives, organized by namespace
-     * @warning This is a pretty inefficient function, avoid if you can
-     */
-    public function getAll() {
-        if (!$this->finalized) $this->autoFinalize();
-        $ret = array();
-        foreach ($this->plist->squash() as $name => $value) {
-            list($ns, $key) = explode('.', $name, 2);
-            $ret[$ns][$key] = $value;
-        }
-        return $ret;
-    }
-
-    /**
-     * Sets a value to configuration.
-     * @param $key String key
-     * @param $value Mixed value
-     */
-    public function set($key, $value, $a = null) {
-        if (strpos($key, '.') === false) {
-            $namespace = $key;
-            $directive = $value;
-            $value = $a;
-            $key = "$key.$directive";
-            $this->triggerError("Using deprecated API: use \$config->set('$key', ...) instead", E_USER_NOTICE);
-        } else {
-            list($namespace) = explode('.', $key);
-        }
-        if ($this->isFinalized('Cannot set directive after finalization')) return;
-        if (!isset($this->def->info[$key])) {
-            $this->triggerError('Cannot set undefined directive ' . htmlspecialchars($key) . ' to value',
-                E_USER_WARNING);
-            return;
-        }
-        $def = $this->def->info[$key];
-
-        if (isset($def->isAlias)) {
-            if ($this->aliasMode) {
-                $this->triggerError('Double-aliases not allowed, please fix '.
-                    'ConfigSchema bug with' . $key, E_USER_ERROR);
-                return;
-            }
-            $this->aliasMode = true;
-            $this->set($def->key, $value);
-            $this->aliasMode = false;
-            $this->triggerError("$key is an alias, preferred directive name is {$def->key}", E_USER_NOTICE);
-            return;
-        }
-
-        // Raw type might be negative when using the fully optimized form
-        // of stdclass, which indicates allow_null == true
-        $rtype = is_int($def) ? $def : $def->type;
-        if ($rtype < 0) {
-            $type = -$rtype;
-            $allow_null = true;
-        } else {
-            $type = $rtype;
-            $allow_null = isset($def->allow_null);
-        }
-
-        try {
-            $value = $this->parser->parse($value, $type, $allow_null);
-        } catch (HTMLPurifier_VarParserException $e) {
-            $this->triggerError('Value for ' . $key . ' is of invalid type, should be ' . HTMLPurifier_VarParser::getTypeName($type), E_USER_WARNING);
-            return;
-        }
-        if (is_string($value) && is_object($def)) {
-            // resolve value alias if defined
-            if (isset($def->aliases[$value])) {
-                $value = $def->aliases[$value];
-            }
-            // check to see if the value is allowed
-            if (isset($def->allowed) && !isset($def->allowed[$value])) {
-                $this->triggerError('Value not supported, valid values are: ' .
-                    $this->_listify($def->allowed), E_USER_WARNING);
-                return;
-            }
-        }
-        $this->plist->set($key, $value);
-
-        // reset definitions if the directives they depend on changed
-        // this is a very costly process, so it's discouraged
-        // with finalization
-        if ($namespace == 'HTML' || $namespace == 'CSS' || $namespace == 'URI') {
-            $this->definitions[$namespace] = null;
-        }
-
-        $this->serials[$namespace] = false;
-    }
-
-    /**
-     * Convenience function for error reporting
-     */
-    private function _listify($lookup) {
-        $list = array();
-        foreach ($lookup as $name => $b) $list[] = $name;
-        return implode(', ', $list);
-    }
-
-    /**
-     * Retrieves object reference to the HTML definition.
-     * @param $raw Return a copy that has not been setup yet. Must be
-     *             called before it's been setup, otherwise won't work.
-     */
-    public function getHTMLDefinition($raw = false) {
-        return $this->getDefinition('HTML', $raw);
-    }
-
-    /**
-     * Retrieves object reference to the CSS definition
-     * @param $raw Return a copy that has not been setup yet. Must be
-     *             called before it's been setup, otherwise won't work.
-     */
-    public function getCSSDefinition($raw = false) {
-        return $this->getDefinition('CSS', $raw);
-    }
-
-    /**
-     * Retrieves a definition
-     * @param $type Type of definition: HTML, CSS, etc
-     * @param $raw  Whether or not definition should be returned raw
-     */
-    public function getDefinition($type, $raw = false) {
-        if (!$this->finalized) $this->autoFinalize();
-        // temporarily suspend locks, so we can handle recursive definition calls
-        $lock = $this->lock;
-        $this->lock = null;
-        $factory = HTMLPurifier_DefinitionCacheFactory::instance();
-        $cache = $factory->create($type, $this);
-        $this->lock = $lock;
-        if (!$raw) {
-            // see if we can quickly supply a definition
-            if (!empty($this->definitions[$type])) {
-                if (!$this->definitions[$type]->setup) {
-                    $this->definitions[$type]->setup($this);
-                    $cache->set($this->definitions[$type], $this);
-                }
-                return $this->definitions[$type];
-            }
-            // memory check missed, try cache
-            $this->definitions[$type] = $cache->get($this);
-            if ($this->definitions[$type]) {
-                // definition in cache, return it
-                return $this->definitions[$type];
-            }
-        } elseif (
-            !empty($this->definitions[$type]) &&
-            !$this->definitions[$type]->setup
-        ) {
-            // raw requested, raw in memory, quick return
-            return $this->definitions[$type];
-        }
-        // quick checks failed, let's create the object
-        if ($type == 'HTML') {
-            $this->definitions[$type] = new HTMLPurifier_HTMLDefinition();
-        } elseif ($type == 'CSS') {
-            $this->definitions[$type] = new HTMLPurifier_CSSDefinition();
-        } elseif ($type == 'URI') {
-            $this->definitions[$type] = new HTMLPurifier_URIDefinition();
-        } else {
-            throw new HTMLPurifier_Exception("Definition of $type type not supported");
-        }
-        // quick abort if raw
-        if ($raw) {
-            if (is_null($this->get($type . '.DefinitionID'))) {
-                // fatally error out if definition ID not set
-                throw new HTMLPurifier_Exception("Cannot retrieve raw version without specifying %$type.DefinitionID");
-            }
-            return $this->definitions[$type];
-        }
-        // set it up
-        $this->lock = $type;
-        $this->definitions[$type]->setup($this);
-        $this->lock = null;
-        // save in cache
-        $cache->set($this->definitions[$type], $this);
-        return $this->definitions[$type];
-    }
-
-    /**
-     * Loads configuration values from an array with the following structure:
-     * Namespace.Directive => Value
-     * @param $config_array Configuration associative array
-     */
-    public function loadArray($config_array) {
-        if ($this->isFinalized('Cannot load directives after finalization')) return;
-        foreach ($config_array as $key => $value) {
-            $key = str_replace('_', '.', $key);
-            if (strpos($key, '.') !== false) {
-                $this->set($key, $value);
-            } else {
-                $namespace = $key;
-                $namespace_values = $value;
-                foreach ($namespace_values as $directive => $value) {
-                    $this->set($namespace .'.'. $directive, $value);
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns a list of array(namespace, directive) for all directives
-     * that are allowed in a web-form context as per an allowed
-     * namespaces/directives list.
-     * @param $allowed List of allowed namespaces/directives
-     */
-    public static function getAllowedDirectivesForForm($allowed, $schema = null) {
-        if (!$schema) {
-            $schema = HTMLPurifier_ConfigSchema::instance();
-        }
-        if ($allowed !== true) {
-             if (is_string($allowed)) $allowed = array($allowed);
-             $allowed_ns = array();
-             $allowed_directives = array();
-             $blacklisted_directives = array();
-             foreach ($allowed as $ns_or_directive) {
-                 if (strpos($ns_or_directive, '.') !== false) {
-                     // directive
-                     if ($ns_or_directive[0] == '-') {
-                         $blacklisted_directives[substr($ns_or_directive, 1)] = true;
-                     } else {
-                         $allowed_directives[$ns_or_directive] = true;
-                     }
-                 } else {
-                     // namespace
-                     $allowed_ns[$ns_or_directive] = true;
-                 }
-             }
-        }
-        $ret = array();
-        foreach ($schema->info as $key => $def) {
-            list($ns, $directive) = explode('.', $key, 2);
-            if ($allowed !== true) {
-                if (isset($blacklisted_directives["$ns.$directive"])) continue;
-                if (!isset($allowed_directives["$ns.$directive"]) && !isset($allowed_ns[$ns])) continue;
-            }
-            if (isset($def->isAlias)) continue;
-            if ($directive == 'DefinitionID' || $directive == 'DefinitionRev') continue;
-            $ret[] = array($ns, $directive);
-        }
-        return $ret;
-    }
-
-    /**
-     * Loads configuration values from $_GET/$_POST that were posted
-     * via ConfigForm
-     * @param $array $_GET or $_POST array to import
-     * @param $index Index/name that the config variables are in
-     * @param $allowed List of allowed namespaces/directives
-     * @param $mq_fix Boolean whether or not to enable magic quotes fix
-     * @param $schema Instance of HTMLPurifier_ConfigSchema to use, if not global copy
-     */
-    public static function loadArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {
-        $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $schema);
-        $config = HTMLPurifier_Config::create($ret, $schema);
-        return $config;
-    }
-
-    /**
-     * Merges in configuration values from $_GET/$_POST to object. NOT STATIC.
-     * @note Same parameters as loadArrayFromForm
-     */
-    public function mergeArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true) {
-         $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $this->def);
-         $this->loadArray($ret);
-    }
-
-    /**
-     * Prepares an array from a form into something usable for the more
-     * strict parts of HTMLPurifier_Config
-     */
-    public static function prepareArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {
-        if ($index !== false) $array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
-        $mq = $mq_fix && function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();
-
-        $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $schema);
-        $ret = array();
-        foreach ($allowed as $key) {
-            list($ns, $directive) = $key;
-            $skey = "$ns.$directive";
-            if (!empty($array["Null_$skey"])) {
-                $ret[$ns][$directive] = null;
-                continue;
-            }
-            if (!isset($array[$skey])) continue;
-            $value = $mq ? stripslashes($array[$skey]) : $array[$skey];
-            $ret[$ns][$directive] = $value;
-        }
-        return $ret;
-    }
-
-    /**
-     * Loads configuration values from an ini file
-     * @param $filename Name of ini file
-     */
-    public function loadIni($filename) {
-        if ($this->isFinalized('Cannot load directives after finalization')) return;
-        $array = parse_ini_file($filename, true);
-        $this->loadArray($array);
-    }
-
-    /**
-     * Checks whether or not the configuration object is finalized.
-     * @param $error String error message, or false for no error
-     */
-    public function isFinalized($error = false) {
-        if ($this->finalized && $error) {
-            $this->triggerError($error, E_USER_ERROR);
-        }
-        return $this->finalized;
-    }
-
-    /**
-     * Finalizes configuration only if auto finalize is on and not
-     * already finalized
-     */
-    public function autoFinalize() {
-        if ($this->autoFinalize) {
-            $this->finalize();
-        } else {
-            $this->plist->squash(true);
-        }
-    }
-
-    /**
-     * Finalizes a configuration object, prohibiting further change
-     */
-    public function finalize() {
-        $this->finalized = true;
-        unset($this->parser);
-    }
-
-    /**
-     * Produces a nicely formatted error message by supplying the
-     * stack frame information from two levels up and OUTSIDE of
-     * HTMLPurifier_Config.
-     */
-    protected function triggerError($msg, $no) {
-        // determine previous stack frame
-        $backtrace = debug_backtrace();
-        if ($this->chatty && isset($backtrace[1])) {
-            $frame = $backtrace[1];
-            $extra = " on line {$frame['line']} in file {$frame['file']}";
-        } else {
-            $extra = '';
-        }
-        trigger_error($msg . $extra, $no);
-    }
-
-    /**
-     * Returns a serialized form of the configuration object that can
-     * be reconstituted.
-     */
-    public function serialize() {
-        $this->getDefinition('HTML');
-        $this->getDefinition('CSS');
-        $this->getDefinition('URI');
-        return serialize($this);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema.php b/lib/php/HTMLPurifier/ConfigSchema.php
deleted file mode 100644
index 67be5c71fd8984451d2fb6dd40aca0695b4daa6d..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-/**
- * Configuration definition, defines directives and their defaults.
- */
-class HTMLPurifier_ConfigSchema {
-
-    /**
-     * Defaults of the directives and namespaces.
-     * @note This shares the exact same structure as HTMLPurifier_Config::$conf
-     */
-    public $defaults = array();
-
-    /**
-     * The default property list. Do not edit this property list.
-     */
-    public $defaultPlist;
-
-    /**
-     * Definition of the directives. The structure of this is:
-     *
-     *  array(
-     *      'Namespace' => array(
-     *          'Directive' => new stdclass(),
-     *      )
-     *  )
-     *
-     * The stdclass may have the following properties:
-     *
-     *  - If isAlias isn't set:
-     *      - type: Integer type of directive, see HTMLPurifier_VarParser for definitions
-     *      - allow_null: If set, this directive allows null values
-     *      - aliases: If set, an associative array of value aliases to real values
-     *      - allowed: If set, a lookup array of allowed (string) values
-     *  - If isAlias is set:
-     *      - namespace: Namespace this directive aliases to
-     *      - name: Directive name this directive aliases to
-     *
-     * In certain degenerate cases, stdclass will actually be an integer. In
-     * that case, the value is equivalent to an stdclass with the type
-     * property set to the integer. If the integer is negative, type is
-     * equal to the absolute value of integer, and allow_null is true.
-     *
-     * This class is friendly with HTMLPurifier_Config. If you need introspection
-     * about the schema, you're better of using the ConfigSchema_Interchange,
-     * which uses more memory but has much richer information.
-     */
-    public $info = array();
-
-    /**
-     * Application-wide singleton
-     */
-    static protected $singleton;
-
-    public function __construct() {
-        $this->defaultPlist = new HTMLPurifier_PropertyList();
-    }
-
-    /**
-     * Unserializes the default ConfigSchema.
-     */
-    public static function makeFromSerial() {
-        return unserialize(file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema.ser'));
-    }
-
-    /**
-     * Retrieves an instance of the application-wide configuration definition.
-     */
-    public static function instance($prototype = null) {
-        if ($prototype !== null) {
-            HTMLPurifier_ConfigSchema::$singleton = $prototype;
-        } elseif (HTMLPurifier_ConfigSchema::$singleton === null || $prototype === true) {
-            HTMLPurifier_ConfigSchema::$singleton = HTMLPurifier_ConfigSchema::makeFromSerial();
-        }
-        return HTMLPurifier_ConfigSchema::$singleton;
-    }
-
-    /**
-     * Defines a directive for configuration
-     * @warning Will fail of directive's namespace is defined.
-     * @warning This method's signature is slightly different from the legacy
-     *          define() static method! Beware!
-     * @param $namespace Namespace the directive is in
-     * @param $name Key of directive
-     * @param $default Default value of directive
-     * @param $type Allowed type of the directive. See
-     *      HTMLPurifier_DirectiveDef::$type for allowed values
-     * @param $allow_null Whether or not to allow null values
-     */
-    public function add($key, $default, $type, $allow_null) {
-        $obj = new stdclass();
-        $obj->type = is_int($type) ? $type : HTMLPurifier_VarParser::$types[$type];
-        if ($allow_null) $obj->allow_null = true;
-        $this->info[$key] = $obj;
-        $this->defaults[$key] = $default;
-        $this->defaultPlist->set($key, $default);
-    }
-
-    /**
-     * Defines a directive value alias.
-     *
-     * Directive value aliases are convenient for developers because it lets
-     * them set a directive to several values and get the same result.
-     * @param $namespace Directive's namespace
-     * @param $name Name of Directive
-     * @param $aliases Hash of aliased values to the real alias
-     */
-    public function addValueAliases($key, $aliases) {
-        if (!isset($this->info[$key]->aliases)) {
-            $this->info[$key]->aliases = array();
-        }
-        foreach ($aliases as $alias => $real) {
-            $this->info[$key]->aliases[$alias] = $real;
-        }
-    }
-
-    /**
-     * Defines a set of allowed values for a directive.
-     * @warning This is slightly different from the corresponding static
-     *          method definition.
-     * @param $namespace Namespace of directive
-     * @param $name Name of directive
-     * @param $allowed Lookup array of allowed values
-     */
-    public function addAllowedValues($key, $allowed) {
-        $this->info[$key]->allowed = $allowed;
-    }
-
-    /**
-     * Defines a directive alias for backwards compatibility
-     * @param $namespace
-     * @param $name Directive that will be aliased
-     * @param $new_namespace
-     * @param $new_name Directive that the alias will be to
-     */
-    public function addAlias($key, $new_key) {
-        $obj = new stdclass;
-        $obj->key = $new_key;
-        $obj->isAlias = true;
-        $this->info[$key] = $obj;
-    }
-
-    /**
-     * Replaces any stdclass that only has the type property with type integer.
-     */
-    public function postProcess() {
-        foreach ($this->info as $key => $v) {
-            if (count((array) $v) == 1) {
-                $this->info[$key] = $v->type;
-            } elseif (count((array) $v) == 2 && isset($v->allow_null)) {
-                $this->info[$key] = -$v->type;
-            }
-        }
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php b/lib/php/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
deleted file mode 100644
index c05668a7060398c870e25b19debe75325de84323..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Converts HTMLPurifier_ConfigSchema_Interchange to our runtime
- * representation used to perform checks on user configuration.
- */
-class HTMLPurifier_ConfigSchema_Builder_ConfigSchema
-{
-
-    public function build($interchange) {
-        $schema = new HTMLPurifier_ConfigSchema();
-        foreach ($interchange->directives as $d) {
-            $schema->add(
-                $d->id->key,
-                $d->default,
-                $d->type,
-                $d->typeAllowsNull
-            );
-            if ($d->allowed !== null) {
-                $schema->addAllowedValues(
-                    $d->id->key,
-                    $d->allowed
-                );
-            }
-            foreach ($d->aliases as $alias) {
-                $schema->addAlias(
-                    $alias->key,
-                    $d->id->key
-                );
-            }
-            if ($d->valueAliases !== null) {
-                $schema->addValueAliases(
-                    $d->id->key,
-                    $d->valueAliases
-                );
-            }
-        }
-        $schema->postProcess();
-        return $schema;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/Builder/Xml.php b/lib/php/HTMLPurifier/ConfigSchema/Builder/Xml.php
deleted file mode 100644
index 244561a3726dc8581ca4e13351f22a261dae29c1..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/Builder/Xml.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * Converts HTMLPurifier_ConfigSchema_Interchange to an XML format,
- * which can be further processed to generate documentation.
- */
-class HTMLPurifier_ConfigSchema_Builder_Xml extends XMLWriter
-{
-
-    protected $interchange;
-    private $namespace;
-
-    protected function writeHTMLDiv($html) {
-        $this->startElement('div');
-
-        $purifier = HTMLPurifier::getInstance();
-        $html = $purifier->purify($html);
-        $this->writeAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
-        $this->writeRaw($html);
-
-        $this->endElement(); // div
-    }
-
-    protected function export($var) {
-        if ($var === array()) return 'array()';
-        return var_export($var, true);
-    }
-
-    public function build($interchange) {
-        // global access, only use as last resort
-        $this->interchange = $interchange;
-
-        $this->setIndent(true);
-        $this->startDocument('1.0', 'UTF-8');
-        $this->startElement('configdoc');
-        $this->writeElement('title', $interchange->name);
-
-        foreach ($interchange->directives as $directive) {
-            $this->buildDirective($directive);
-        }
-
-        if ($this->namespace) $this->endElement(); // namespace
-
-        $this->endElement(); // configdoc
-        $this->flush();
-    }
-
-    public function buildDirective($directive) {
-
-        // Kludge, although I suppose having a notion of a "root namespace"
-        // certainly makes things look nicer when documentation is built.
-        // Depends on things being sorted.
-        if (!$this->namespace || $this->namespace !== $directive->id->getRootNamespace()) {
-            if ($this->namespace) $this->endElement(); // namespace
-            $this->namespace = $directive->id->getRootNamespace();
-            $this->startElement('namespace');
-            $this->writeAttribute('id', $this->namespace);
-            $this->writeElement('name', $this->namespace);
-        }
-
-        $this->startElement('directive');
-        $this->writeAttribute('id', $directive->id->toString());
-
-        $this->writeElement('name', $directive->id->getDirective());
-
-        $this->startElement('aliases');
-            foreach ($directive->aliases as $alias) $this->writeElement('alias', $alias->toString());
-        $this->endElement(); // aliases
-
-        $this->startElement('constraints');
-            if ($directive->version) $this->writeElement('version', $directive->version);
-            $this->startElement('type');
-                if ($directive->typeAllowsNull) $this->writeAttribute('allow-null', 'yes');
-                $this->text($directive->type);
-            $this->endElement(); // type
-            if ($directive->allowed) {
-                $this->startElement('allowed');
-                    foreach ($directive->allowed as $value => $x) $this->writeElement('value', $value);
-                $this->endElement(); // allowed
-            }
-            $this->writeElement('default', $this->export($directive->default));
-            $this->writeAttribute('xml:space', 'preserve');
-            if ($directive->external) {
-                $this->startElement('external');
-                    foreach ($directive->external as $project) $this->writeElement('project', $project);
-                $this->endElement();
-            }
-        $this->endElement(); // constraints
-
-        if ($directive->deprecatedVersion) {
-            $this->startElement('deprecated');
-                $this->writeElement('version', $directive->deprecatedVersion);
-                $this->writeElement('use', $directive->deprecatedUse->toString());
-            $this->endElement(); // deprecated
-        }
-
-        $this->startElement('description');
-            $this->writeHTMLDiv($directive->description);
-        $this->endElement(); // description
-
-        $this->endElement(); // directive
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/Exception.php b/lib/php/HTMLPurifier/ConfigSchema/Exception.php
deleted file mode 100644
index 2671516c58838b9f225b2e253b5f1a183543c60c..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/Exception.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * Exceptions related to configuration schema
- */
-class HTMLPurifier_ConfigSchema_Exception extends HTMLPurifier_Exception
-{
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/Interchange.php b/lib/php/HTMLPurifier/ConfigSchema/Interchange.php
deleted file mode 100644
index 91a5aa7303f0582dc55cd351d36fe241162ce786..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/Interchange.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Generic schema interchange format that can be converted to a runtime
- * representation (HTMLPurifier_ConfigSchema) or HTML documentation. Members
- * are completely validated.
- */
-class HTMLPurifier_ConfigSchema_Interchange
-{
-
-    /**
-     * Name of the application this schema is describing.
-     */
-    public $name;
-
-    /**
-     * Array of Directive ID => array(directive info)
-     */
-    public $directives = array();
-
-    /**
-     * Adds a directive array to $directives
-     */
-    public function addDirective($directive) {
-        if (isset($this->directives[$i = $directive->id->toString()])) {
-            throw new HTMLPurifier_ConfigSchema_Exception("Cannot redefine directive '$i'");
-        }
-        $this->directives[$i] = $directive;
-    }
-
-    /**
-     * Convenience function to perform standard validation. Throws exception
-     * on failed validation.
-     */
-    public function validate() {
-        $validator = new HTMLPurifier_ConfigSchema_Validator();
-        return $validator->validate($this);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/Interchange/Directive.php b/lib/php/HTMLPurifier/ConfigSchema/Interchange/Directive.php
deleted file mode 100644
index ac8be0d9707d5f33b9012a40641411f25b0b5d2d..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/Interchange/Directive.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * Interchange component class describing configuration directives.
- */
-class HTMLPurifier_ConfigSchema_Interchange_Directive
-{
-
-    /**
-     * ID of directive, instance of HTMLPurifier_ConfigSchema_Interchange_Id.
-     */
-    public $id;
-
-    /**
-     * String type, e.g. 'integer' or 'istring'.
-     */
-    public $type;
-
-    /**
-     * Default value, e.g. 3 or 'DefaultVal'.
-     */
-    public $default;
-
-    /**
-     * HTML description.
-     */
-    public $description;
-
-    /**
-     * Boolean whether or not null is allowed as a value.
-     */
-    public $typeAllowsNull = false;
-
-    /**
-     * Lookup table of allowed scalar values, e.g. array('allowed' => true).
-     * Null if all values are allowed.
-     */
-    public $allowed;
-
-    /**
-     * List of aliases for the directive,
-     * e.g. array(new HTMLPurifier_ConfigSchema_Interchange_Id('Ns', 'Dir'))).
-     */
-    public $aliases = array();
-
-    /**
-     * Hash of value aliases, e.g. array('alt' => 'real'). Null if value
-     * aliasing is disabled (necessary for non-scalar types).
-     */
-    public $valueAliases;
-
-    /**
-     * Version of HTML Purifier the directive was introduced, e.g. '1.3.1'.
-     * Null if the directive has always existed.
-     */
-    public $version;
-
-    /**
-     * ID of directive that supercedes this old directive, is an instance
-     * of HTMLPurifier_ConfigSchema_Interchange_Id. Null if not deprecated.
-     */
-    public $deprecatedUse;
-
-    /**
-     * Version of HTML Purifier this directive was deprecated. Null if not
-     * deprecated.
-     */
-    public $deprecatedVersion;
-
-    /**
-     * List of external projects this directive depends on, e.g. array('CSSTidy').
-     */
-    public $external = array();
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/Interchange/Id.php b/lib/php/HTMLPurifier/ConfigSchema/Interchange/Id.php
deleted file mode 100644
index b9b3c6f5cfbdd0819a34579e857f2e724dcb4edc..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/Interchange/Id.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * Represents a directive ID in the interchange format.
- */
-class HTMLPurifier_ConfigSchema_Interchange_Id
-{
-
-    public $key;
-
-    public function __construct($key) {
-        $this->key = $key;
-    }
-
-    /**
-     * @warning This is NOT magic, to ensure that people don't abuse SPL and
-     *          cause problems for PHP 5.0 support.
-     */
-    public function toString() {
-        return $this->key;
-    }
-
-    public function getRootNamespace() {
-        return substr($this->key, 0, strpos($this->key, "."));
-    }
-
-    public function getDirective() {
-        return substr($this->key, strpos($this->key, ".") + 1);
-    }
-
-    public static function make($id) {
-        return new HTMLPurifier_ConfigSchema_Interchange_Id($id);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/InterchangeBuilder.php b/lib/php/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
deleted file mode 100644
index 785b72ce8e93d151465f293b351a4c9455c0e1d4..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-class HTMLPurifier_ConfigSchema_InterchangeBuilder
-{
-
-    /**
-     * Used for processing DEFAULT, nothing else.
-     */
-    protected $varParser;
-
-    public function __construct($varParser = null) {
-        $this->varParser = $varParser ? $varParser : new HTMLPurifier_VarParser_Native();
-    }
-
-    public static function buildFromDirectory($dir = null) {
-        $builder     = new HTMLPurifier_ConfigSchema_InterchangeBuilder();
-        $interchange = new HTMLPurifier_ConfigSchema_Interchange();
-        return $builder->buildDir($interchange, $dir);
-    }
-
-    public function buildDir($interchange, $dir = null) {
-        if (!$dir) $dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema';
-        if (file_exists($dir . '/info.ini')) {
-            $info = parse_ini_file($dir . '/info.ini');
-            $interchange->name = $info['name'];
-        }
-
-        $files = array();
-        $dh = opendir($dir);
-        while (false !== ($file = readdir($dh))) {
-            if (!$file || $file[0] == '.' || strrchr($file, '.') !== '.txt') {
-                continue;
-            }
-            $files[] = $file;
-        }
-        closedir($dh);
-
-        sort($files);
-        foreach ($files as $file) {
-            $this->buildFile($interchange, $dir . '/' . $file);
-        }
-
-        return $interchange;
-    }
-
-    public function buildFile($interchange, $file) {
-        $parser = new HTMLPurifier_StringHashParser();
-        $this->build(
-            $interchange,
-            new HTMLPurifier_StringHash( $parser->parseFile($file) )
-        );
-    }
-
-    /**
-     * Builds an interchange object based on a hash.
-     * @param $interchange HTMLPurifier_ConfigSchema_Interchange object to build
-     * @param $hash HTMLPurifier_ConfigSchema_StringHash source data
-     */
-    public function build($interchange, $hash) {
-        if (!$hash instanceof HTMLPurifier_StringHash) {
-            $hash = new HTMLPurifier_StringHash($hash);
-        }
-        if (!isset($hash['ID'])) {
-            throw new HTMLPurifier_ConfigSchema_Exception('Hash does not have any ID');
-        }
-        if (strpos($hash['ID'], '.') === false) {
-            if (count($hash) == 2 && isset($hash['DESCRIPTION'])) {
-                $hash->offsetGet('DESCRIPTION'); // prevent complaining
-            } else {
-                throw new HTMLPurifier_ConfigSchema_Exception('All directives must have a namespace');
-            }
-        } else {
-            $this->buildDirective($interchange, $hash);
-        }
-        $this->_findUnused($hash);
-    }
-
-    public function buildDirective($interchange, $hash) {
-        $directive = new HTMLPurifier_ConfigSchema_Interchange_Directive();
-
-        // These are required elements:
-        $directive->id = $this->id($hash->offsetGet('ID'));
-        $id = $directive->id->toString(); // convenience
-
-        if (isset($hash['TYPE'])) {
-            $type = explode('/', $hash->offsetGet('TYPE'));
-            if (isset($type[1])) $directive->typeAllowsNull = true;
-            $directive->type = $type[0];
-        } else {
-            throw new HTMLPurifier_ConfigSchema_Exception("TYPE in directive hash '$id' not defined");
-        }
-
-        if (isset($hash['DEFAULT'])) {
-            try {
-                $directive->default = $this->varParser->parse($hash->offsetGet('DEFAULT'), $directive->type, $directive->typeAllowsNull);
-            } catch (HTMLPurifier_VarParserException $e) {
-                throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage() . " in DEFAULT in directive hash '$id'");
-            }
-        }
-
-        if (isset($hash['DESCRIPTION'])) {
-            $directive->description = $hash->offsetGet('DESCRIPTION');
-        }
-
-        if (isset($hash['ALLOWED'])) {
-            $directive->allowed = $this->lookup($this->evalArray($hash->offsetGet('ALLOWED')));
-        }
-
-        if (isset($hash['VALUE-ALIASES'])) {
-            $directive->valueAliases = $this->evalArray($hash->offsetGet('VALUE-ALIASES'));
-        }
-
-        if (isset($hash['ALIASES'])) {
-            $raw_aliases = trim($hash->offsetGet('ALIASES'));
-            $aliases = preg_split('/\s*,\s*/', $raw_aliases);
-            foreach ($aliases as $alias) {
-                $directive->aliases[] = $this->id($alias);
-            }
-        }
-
-        if (isset($hash['VERSION'])) {
-            $directive->version = $hash->offsetGet('VERSION');
-        }
-
-        if (isset($hash['DEPRECATED-USE'])) {
-            $directive->deprecatedUse = $this->id($hash->offsetGet('DEPRECATED-USE'));
-        }
-
-        if (isset($hash['DEPRECATED-VERSION'])) {
-            $directive->deprecatedVersion = $hash->offsetGet('DEPRECATED-VERSION');
-        }
-
-        if (isset($hash['EXTERNAL'])) {
-            $directive->external = preg_split('/\s*,\s*/', trim($hash->offsetGet('EXTERNAL')));
-        }
-
-        $interchange->addDirective($directive);
-    }
-
-    /**
-     * Evaluates an array PHP code string without array() wrapper
-     */
-    protected function evalArray($contents) {
-        return eval('return array('. $contents .');');
-    }
-
-    /**
-     * Converts an array list into a lookup array.
-     */
-    protected function lookup($array) {
-        $ret = array();
-        foreach ($array as $val) $ret[$val] = true;
-        return $ret;
-    }
-
-    /**
-     * Convenience function that creates an HTMLPurifier_ConfigSchema_Interchange_Id
-     * object based on a string Id.
-     */
-    protected function id($id) {
-        return HTMLPurifier_ConfigSchema_Interchange_Id::make($id);
-    }
-
-    /**
-     * Triggers errors for any unused keys passed in the hash; such keys
-     * may indicate typos, missing values, etc.
-     * @param $hash Instance of ConfigSchema_StringHash to check.
-     */
-    protected function _findUnused($hash) {
-        $accessed = $hash->getAccessed();
-        foreach ($hash as $k => $v) {
-            if (!isset($accessed[$k])) {
-                trigger_error("String hash key '$k' not used by builder", E_USER_NOTICE);
-            }
-        }
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/Validator.php b/lib/php/HTMLPurifier/ConfigSchema/Validator.php
deleted file mode 100644
index f374f6a02259f8fae5303d3f794c74b5b6461a99..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/Validator.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-
-/**
- * Performs validations on HTMLPurifier_ConfigSchema_Interchange
- *
- * @note If you see '// handled by InterchangeBuilder', that means a
- *       design decision in that class would prevent this validation from
- *       ever being necessary. We have them anyway, however, for
- *       redundancy.
- */
-class HTMLPurifier_ConfigSchema_Validator
-{
-
-    /**
-     * Easy to access global objects.
-     */
-    protected $interchange, $aliases;
-
-    /**
-     * Context-stack to provide easy to read error messages.
-     */
-    protected $context = array();
-
-    /**
-     * HTMLPurifier_VarParser to test default's type.
-     */
-    protected $parser;
-
-    public function __construct() {
-        $this->parser = new HTMLPurifier_VarParser();
-    }
-
-    /**
-     * Validates a fully-formed interchange object. Throws an
-     * HTMLPurifier_ConfigSchema_Exception if there's a problem.
-     */
-    public function validate($interchange) {
-        $this->interchange = $interchange;
-        $this->aliases = array();
-        // PHP is a bit lax with integer <=> string conversions in
-        // arrays, so we don't use the identical !== comparison
-        foreach ($interchange->directives as $i => $directive) {
-            $id = $directive->id->toString();
-            if ($i != $id) $this->error(false, "Integrity violation: key '$i' does not match internal id '$id'");
-            $this->validateDirective($directive);
-        }
-        return true;
-    }
-
-    /**
-     * Validates a HTMLPurifier_ConfigSchema_Interchange_Id object.
-     */
-    public function validateId($id) {
-        $id_string = $id->toString();
-        $this->context[] = "id '$id_string'";
-        if (!$id instanceof HTMLPurifier_ConfigSchema_Interchange_Id) {
-            // handled by InterchangeBuilder
-            $this->error(false, 'is not an instance of HTMLPurifier_ConfigSchema_Interchange_Id');
-        }
-        // keys are now unconstrained (we might want to narrow down to A-Za-z0-9.)
-        // we probably should check that it has at least one namespace
-        $this->with($id, 'key')
-            ->assertNotEmpty()
-            ->assertIsString(); // implicit assertIsString handled by InterchangeBuilder
-        array_pop($this->context);
-    }
-
-    /**
-     * Validates a HTMLPurifier_ConfigSchema_Interchange_Directive object.
-     */
-    public function validateDirective($d) {
-        $id = $d->id->toString();
-        $this->context[] = "directive '$id'";
-        $this->validateId($d->id);
-
-        $this->with($d, 'description')
-            ->assertNotEmpty();
-
-        // BEGIN - handled by InterchangeBuilder
-        $this->with($d, 'type')
-            ->assertNotEmpty();
-        $this->with($d, 'typeAllowsNull')
-            ->assertIsBool();
-        try {
-            // This also tests validity of $d->type
-            $this->parser->parse($d->default, $d->type, $d->typeAllowsNull);
-        } catch (HTMLPurifier_VarParserException $e) {
-            $this->error('default', 'had error: ' . $e->getMessage());
-        }
-        // END - handled by InterchangeBuilder
-
-        if (!is_null($d->allowed) || !empty($d->valueAliases)) {
-            // allowed and valueAliases require that we be dealing with
-            // strings, so check for that early.
-            $d_int = HTMLPurifier_VarParser::$types[$d->type];
-            if (!isset(HTMLPurifier_VarParser::$stringTypes[$d_int])) {
-                $this->error('type', 'must be a string type when used with allowed or value aliases');
-            }
-        }
-
-        $this->validateDirectiveAllowed($d);
-        $this->validateDirectiveValueAliases($d);
-        $this->validateDirectiveAliases($d);
-
-        array_pop($this->context);
-    }
-
-    /**
-     * Extra validation if $allowed member variable of
-     * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
-     */
-    public function validateDirectiveAllowed($d) {
-        if (is_null($d->allowed)) return;
-        $this->with($d, 'allowed')
-            ->assertNotEmpty()
-            ->assertIsLookup(); // handled by InterchangeBuilder
-        if (is_string($d->default) && !isset($d->allowed[$d->default])) {
-            $this->error('default', 'must be an allowed value');
-        }
-        $this->context[] = 'allowed';
-        foreach ($d->allowed as $val => $x) {
-            if (!is_string($val)) $this->error("value $val", 'must be a string');
-        }
-        array_pop($this->context);
-    }
-
-    /**
-     * Extra validation if $valueAliases member variable of
-     * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
-     */
-    public function validateDirectiveValueAliases($d) {
-        if (is_null($d->valueAliases)) return;
-        $this->with($d, 'valueAliases')
-            ->assertIsArray(); // handled by InterchangeBuilder
-        $this->context[] = 'valueAliases';
-        foreach ($d->valueAliases as $alias => $real) {
-            if (!is_string($alias)) $this->error("alias $alias", 'must be a string');
-            if (!is_string($real))  $this->error("alias target $real from alias '$alias'",  'must be a string');
-            if ($alias === $real) {
-                $this->error("alias '$alias'", "must not be an alias to itself");
-            }
-        }
-        if (!is_null($d->allowed)) {
-            foreach ($d->valueAliases as $alias => $real) {
-                if (isset($d->allowed[$alias])) {
-                    $this->error("alias '$alias'", 'must not be an allowed value');
-                } elseif (!isset($d->allowed[$real])) {
-                    $this->error("alias '$alias'", 'must be an alias to an allowed value');
-                }
-            }
-        }
-        array_pop($this->context);
-    }
-
-    /**
-     * Extra validation if $aliases member variable of
-     * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
-     */
-    public function validateDirectiveAliases($d) {
-        $this->with($d, 'aliases')
-            ->assertIsArray(); // handled by InterchangeBuilder
-        $this->context[] = 'aliases';
-        foreach ($d->aliases as $alias) {
-            $this->validateId($alias);
-            $s = $alias->toString();
-            if (isset($this->interchange->directives[$s])) {
-                $this->error("alias '$s'", 'collides with another directive');
-            }
-            if (isset($this->aliases[$s])) {
-                $other_directive = $this->aliases[$s];
-                $this->error("alias '$s'", "collides with alias for directive '$other_directive'");
-            }
-            $this->aliases[$s] = $d->id->toString();
-        }
-        array_pop($this->context);
-    }
-
-    // protected helper functions
-
-    /**
-     * Convenience function for generating HTMLPurifier_ConfigSchema_ValidatorAtom
-     * for validating simple member variables of objects.
-     */
-    protected function with($obj, $member) {
-        return new HTMLPurifier_ConfigSchema_ValidatorAtom($this->getFormattedContext(), $obj, $member);
-    }
-
-    /**
-     * Emits an error, providing helpful context.
-     */
-    protected function error($target, $msg) {
-        if ($target !== false) $prefix = ucfirst($target) . ' in ' .  $this->getFormattedContext();
-        else $prefix = ucfirst($this->getFormattedContext());
-        throw new HTMLPurifier_ConfigSchema_Exception(trim($prefix . ' ' . $msg));
-    }
-
-    /**
-     * Returns a formatted context string.
-     */
-    protected function getFormattedContext() {
-        return implode(' in ', array_reverse($this->context));
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/ValidatorAtom.php b/lib/php/HTMLPurifier/ConfigSchema/ValidatorAtom.php
deleted file mode 100644
index b95aea18cc72f04f6675b92d66d62c8a67efe8f5..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/ValidatorAtom.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * Fluent interface for validating the contents of member variables.
- * This should be immutable. See HTMLPurifier_ConfigSchema_Validator for
- * use-cases. We name this an 'atom' because it's ONLY for validations that
- * are independent and usually scalar.
- */
-class HTMLPurifier_ConfigSchema_ValidatorAtom
-{
-
-    protected $context, $obj, $member, $contents;
-
-    public function __construct($context, $obj, $member) {
-        $this->context     = $context;
-        $this->obj         = $obj;
-        $this->member      = $member;
-        $this->contents    =& $obj->$member;
-    }
-
-    public function assertIsString() {
-        if (!is_string($this->contents)) $this->error('must be a string');
-        return $this;
-    }
-
-    public function assertIsBool() {
-        if (!is_bool($this->contents)) $this->error('must be a boolean');
-        return $this;
-    }
-
-    public function assertIsArray() {
-        if (!is_array($this->contents)) $this->error('must be an array');
-        return $this;
-    }
-
-    public function assertNotNull() {
-        if ($this->contents === null) $this->error('must not be null');
-        return $this;
-    }
-
-    public function assertAlnum() {
-        $this->assertIsString();
-        if (!ctype_alnum($this->contents)) $this->error('must be alphanumeric');
-        return $this;
-    }
-
-    public function assertNotEmpty() {
-        if (empty($this->contents)) $this->error('must not be empty');
-        return $this;
-    }
-
-    public function assertIsLookup() {
-        $this->assertIsArray();
-        foreach ($this->contents as $v) {
-            if ($v !== true) $this->error('must be a lookup array');
-        }
-        return $this;
-    }
-
-    protected function error($msg) {
-        throw new HTMLPurifier_ConfigSchema_Exception(ucfirst($this->member) . ' in ' . $this->context . ' ' . $msg);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema.ser b/lib/php/HTMLPurifier/ConfigSchema/schema.ser
deleted file mode 100644
index bbf12f9c3e7392aa8143727d2485f6f9ad1f97e1..0000000000000000000000000000000000000000
Binary files a/lib/php/HTMLPurifier/ConfigSchema/schema.ser and /dev/null differ
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
deleted file mode 100644
index 0517fed0a119eba2761e4017af5488861394c625..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Attr.AllowedClasses
-TYPE: lookup/null
-VERSION: 4.0.0
-DEFAULT: null
---DESCRIPTION--
-List of allowed class values in the class attribute. By default, this is null,
-which means all classes are allowed.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
deleted file mode 100644
index 249edd647b0f3a05e1e166145a30d35e27c7bb1a..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Attr.AllowedFrameTargets
-TYPE: lookup
-DEFAULT: array()
---DESCRIPTION--
-Lookup table of all allowed link frame targets.  Some commonly used link
-targets include _blank, _self, _parent and _top. Values should be
-lowercase, as validation will be done in a case-sensitive manner despite
-W3C's recommendation. XHTML 1.0 Strict does not permit the target attribute
-so this directive will have no effect in that doctype. XHTML 1.1 does not
-enable the Target module by default, you will have to manually enable it
-(see the module documentation for more details.)
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
deleted file mode 100644
index 9a8fa6a2e202c1f32eee1503293f1460cb8e2e1b..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Attr.AllowedRel
-TYPE: lookup
-VERSION: 1.6.0
-DEFAULT: array()
---DESCRIPTION--
-List of allowed forward document relationships in the rel attribute. Common
-values may be nofollow or print. By default, this is empty, meaning that no
-document relationships are allowed.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
deleted file mode 100644
index b017883485953fa1bb6fa31e21e2f284a34d9baa..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Attr.AllowedRev
-TYPE: lookup
-VERSION: 1.6.0
-DEFAULT: array()
---DESCRIPTION--
-List of allowed reverse document relationships in the rev attribute. This
-attribute is a bit of an edge-case; if you don't know what it is for, stay
-away.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
deleted file mode 100644
index e774b823b1b85871744e7f67753b3b5431114d4f..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Attr.ClassUseCDATA
-TYPE: bool/null
-DEFAULT: null
-VERSION: 4.0.0
---DESCRIPTION--
-If null, class will auto-detect the doctype and, if matching XHTML 1.1 or
-XHTML 2.0, will use the restrictive NMTOKENS specification of class. Otherwise,
-it will use a relaxed CDATA definition.  If true, the relaxed CDATA definition
-is forced; if false, the NMTOKENS definition is forced.  To get behavior
-of HTML Purifier prior to 4.0.0, set this directive to false.
-
-Some rational behind the auto-detection:
-in previous versions of HTML Purifier, it was assumed that the form of
-class was NMTOKENS, as specified by the XHTML Modularization (representing
-XHTML 1.1 and XHTML 2.0).  The DTDs for HTML 4.01 and XHTML 1.0, however
-specify class as CDATA.  HTML 5 effectively defines it as CDATA, but
-with the additional constraint that each name should be unique (this is not
-explicitly outlined in previous specifications).
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
deleted file mode 100644
index 533165e17590060510a5e0f8046df8b78234fb74..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Attr.DefaultImageAlt
-TYPE: string/null
-DEFAULT: null
-VERSION: 3.2.0
---DESCRIPTION--
-This is the content of the alt tag of an image if the user had not
-previously specified an alt attribute.  This applies to all images without
-a valid alt attribute, as opposed to %Attr.DefaultInvalidImageAlt, which
-only applies to invalid images, and overrides in the case of an invalid image.
-Default behavior with null is to use the basename of the src tag for the alt.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
deleted file mode 100644
index 9eb7e38469f0c94ba880396a89ddf9da483005f2..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Attr.DefaultInvalidImage
-TYPE: string
-DEFAULT: ''
---DESCRIPTION--
-This is the default image an img tag will be pointed to if it does not have
-a valid src attribute.  In future versions, we may allow the image tag to
-be removed completely, but due to design issues, this is not possible right
-now.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
deleted file mode 100644
index 2f17bf477a3dd2643fc3494b4926cc388fa287c2..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Attr.DefaultInvalidImageAlt
-TYPE: string
-DEFAULT: 'Invalid image'
---DESCRIPTION--
-This is the content of the alt tag of an invalid image if the user had not
-previously specified an alt attribute.  It has no effect when the image is
-valid but there was no alt attribute present.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
deleted file mode 100644
index 52654b53ae315bfbe70103acc2129487f8176c56..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Attr.DefaultTextDir
-TYPE: string
-DEFAULT: 'ltr'
---DESCRIPTION--
-Defines the default text direction (ltr or rtl) of the document being
-parsed.  This generally is the same as the value of the dir attribute in
-HTML, or ltr if that is not specified.
---ALLOWED--
-'ltr', 'rtl'
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
deleted file mode 100644
index 6440d210321ade5b9bdb529c1b88060316304974..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Attr.EnableID
-TYPE: bool
-DEFAULT: false
-VERSION: 1.2.0
---DESCRIPTION--
-Allows the ID attribute in HTML.  This is disabled by default due to the
-fact that without proper configuration user input can easily break the
-validation of a webpage by specifying an ID that is already on the
-surrounding HTML.  If you don't mind throwing caution to the wind, enable
-this directive, but I strongly recommend you also consider blacklisting IDs
-you use (%Attr.IDBlacklist) or prefixing all user supplied IDs
-(%Attr.IDPrefix).  When set to true HTML Purifier reverts to the behavior of
-pre-1.2.0 versions.
---ALIASES--
-HTML.EnableAttrID
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
deleted file mode 100644
index f31d226f58bb9e868c0be455ddc8cb60f14640ee..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Attr.ForbiddenClasses
-TYPE: lookup
-VERSION: 4.0.0
-DEFAULT: array()
---DESCRIPTION--
-List of forbidden class values in the class attribute. By default, this is
-empty, which means that no classes are forbidden. See also %Attr.AllowedClasses.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
deleted file mode 100644
index 5f2b5e3d2cda09d577272888aa2f3458e942009a..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Attr.IDBlacklist
-TYPE: list
-DEFAULT: array()
-DESCRIPTION: Array of IDs not allowed in the document.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
deleted file mode 100644
index 6f5824586ec4f37cabe8afefe5c372bb0c39f295..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Attr.IDBlacklistRegexp
-TYPE: string/null
-VERSION: 1.6.0
-DEFAULT: NULL
---DESCRIPTION--
-PCRE regular expression to be matched against all IDs. If the expression is
-matches, the ID is rejected. Use this with care: may cause significant
-degradation. ID matching is done after all other validation.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
deleted file mode 100644
index cc49d43fd0c68abab6877d5a30f0251ed7dcb8b0..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Attr.IDPrefix
-TYPE: string
-VERSION: 1.2.0
-DEFAULT: ''
---DESCRIPTION--
-String to prefix to IDs.  If you have no idea what IDs your pages may use,
-you may opt to simply add a prefix to all user-submitted ID attributes so
-that they are still usable, but will not conflict with core page IDs.
-Example: setting the directive to 'user_' will result in a user submitted
-'foo' to become 'user_foo'  Be sure to set %HTML.EnableAttrID to true
-before using this.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
deleted file mode 100644
index 2c5924a7ade81d45386a280a40b2721c93299731..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Attr.IDPrefixLocal
-TYPE: string
-VERSION: 1.2.0
-DEFAULT: ''
---DESCRIPTION--
-Temporary prefix for IDs used in conjunction with %Attr.IDPrefix.  If you
-need to allow multiple sets of user content on web page, you may need to
-have a seperate prefix that changes with each iteration.  This way,
-seperately submitted user content displayed on the same page doesn't
-clobber each other. Ideal values are unique identifiers for the content it
-represents (i.e. the id of the row in the database). Be sure to add a
-seperator (like an underscore) at the end.  Warning: this directive will
-not work unless %Attr.IDPrefix is set to a non-empty value!
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
deleted file mode 100644
index d5caa1bb978b2e9368074dd9fb46c1842347a3ca..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-AutoFormat.AutoParagraph
-TYPE: bool
-VERSION: 2.0.1
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-  This directive turns on auto-paragraphing, where double newlines are
-  converted in to paragraphs whenever possible. Auto-paragraphing:
-</p>
-<ul>
-  <li>Always applies to inline elements or text in the root node,</li>
-  <li>Applies to inline elements or text with double newlines in nodes
-      that allow paragraph tags,</li>
-  <li>Applies to double newlines in paragraph tags</li>
-</ul>
-<p>
-  <code>p</code> tags must be allowed for this directive to take effect.
-  We do not use <code>br</code> tags for paragraphing, as that is
-  semantically incorrect.
-</p>
-<p>
-  To prevent auto-paragraphing as a content-producer, refrain from using
-  double-newlines except to specify a new paragraph or in contexts where
-  it has special meaning (whitespace usually has no meaning except in
-  tags like <code>pre</code>, so this should not be difficult.) To prevent
-  the paragraphing of inline text adjacent to block elements, wrap them
-  in <code>div</code> tags (the behavior is slightly different outside of
-  the root node.)
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
deleted file mode 100644
index 2a476481af6c1030ddf13c2df1c78a4aafb8960a..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-AutoFormat.Custom
-TYPE: list
-VERSION: 2.0.1
-DEFAULT: array()
---DESCRIPTION--
-
-<p>
-  This directive can be used to add custom auto-format injectors.
-  Specify an array of injector names (class name minus the prefix)
-  or concrete implementations. Injector class must exist.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
deleted file mode 100644
index 663064a3447ba4155f9ed52e18786a58f4ce1689..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-AutoFormat.DisplayLinkURI
-TYPE: bool
-VERSION: 3.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-  This directive turns on the in-text display of URIs in &lt;a&gt; tags, and disables
-  those links. For example, <a href="http://example.com">example</a> becomes
-  example (<a>http://example.com</a>).
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
deleted file mode 100644
index 3a48ba960e934877c00f4844eb248df416ecb6b9..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-AutoFormat.Linkify
-TYPE: bool
-VERSION: 2.0.1
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-  This directive turns on linkification, auto-linking http, ftp and
-  https URLs. <code>a</code> tags with the <code>href</code> attribute
-  must be allowed.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
deleted file mode 100644
index db58b134646b496cfa31c191e05f1fa52c8b7670..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-AutoFormat.PurifierLinkify.DocURL
-TYPE: string
-VERSION: 2.0.1
-DEFAULT: '#%s'
-ALIASES: AutoFormatParam.PurifierLinkifyDocURL
---DESCRIPTION--
-<p>
-  Location of configuration documentation to link to, let %s substitute
-  into the configuration's namespace and directive names sans the percent
-  sign.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
deleted file mode 100644
index 7996488be0d0f94896da45b86db8944e900aeb31..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-AutoFormat.PurifierLinkify
-TYPE: bool
-VERSION: 2.0.1
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-  Internal auto-formatter that converts configuration directives in
-  syntax <a>%Namespace.Directive</a> to links. <code>a</code> tags
-  with the <code>href</code> attribute must be allowed.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
deleted file mode 100644
index 35c393b4e63cd94cbf92270fb6badf53a72c325a..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions
-TYPE: lookup
-VERSION: 4.0.0
-DEFAULT: array('td' => true, 'th' => true)
---DESCRIPTION--
-<p>
-  When %AutoFormat.RemoveEmpty and %AutoFormat.RemoveEmpty.RemoveNbsp
-  are enabled, this directive defines what HTML elements should not be
-  removede if they have only a non-breaking space in them.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
deleted file mode 100644
index ca17eb1dc489cbd8c98bd8a04025f924801580c6..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-AutoFormat.RemoveEmpty.RemoveNbsp
-TYPE: bool
-VERSION: 4.0.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-  When enabled, HTML Purifier will treat any elements that contain only
-  non-breaking spaces as well as regular whitespace as empty, and remove
-  them when %AutoForamt.RemoveEmpty is enabled.
-</p>
-<p>
-  See %AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions for a list of elements
-  that don't have this behavior applied to them.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
deleted file mode 100644
index 34657ba47b15e7980ff2fcd80f7b2ad2807ef6ab..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-AutoFormat.RemoveEmpty
-TYPE: bool
-VERSION: 3.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-  When enabled, HTML Purifier will attempt to remove empty elements that
-  contribute no semantic information to the document. The following types
-  of nodes will be removed:
-</p>
-<ul><li>
-    Tags with no attributes and no content, and that are not empty
-    elements (remove <code>&lt;a&gt;&lt;/a&gt;</code> but not
-    <code>&lt;br /&gt;</code>), and
-  </li>
-  <li>
-    Tags with no content, except for:<ul>
-      <li>The <code>colgroup</code> element, or</li>
-      <li>
-        Elements with the <code>id</code> or <code>name</code> attribute,
-        when those attributes are permitted on those elements.
-      </li>
-    </ul></li>
-</ul>
-<p>
-  Please be very careful when using this functionality; while it may not
-  seem that empty elements contain useful information, they can alter the
-  layout of a document given appropriate styling. This directive is most
-  useful when you are processing machine-generated HTML, please avoid using
-  it on regular user HTML.
-</p>
-<p>
-  Elements that contain only whitespace will be treated as empty. Non-breaking
-  spaces, however, do not count as whitespace. See
-  %AutoFormat.RemoveEmpty.RemoveNbsp for alternate behavior.
-</p>
-<p>
-  This algorithm is not perfect; you may still notice some empty tags,
-  particularly if a node had elements, but those elements were later removed
-  because they were not permitted in that context, or tags that, after
-  being auto-closed by another tag, where empty. This is for safety reasons
-  to prevent clever code from breaking validation. The general rule of thumb:
-  if a tag looked empty on the way in, it will get removed; if HTML Purifier
-  made it empty, it will stay.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
deleted file mode 100644
index b324608f761c2d4f116576993beaefdef23fd237..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-CSS.AllowImportant
-TYPE: bool
-DEFAULT: false
-VERSION: 3.1.0
---DESCRIPTION--
-This parameter determines whether or not !important cascade modifiers should
-be allowed in user CSS. If false, !important will stripped.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
deleted file mode 100644
index 748be0eec8bee195ccfd3cbcbfa662ea76db9615..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-CSS.AllowTricky
-TYPE: bool
-DEFAULT: false
-VERSION: 3.1.0
---DESCRIPTION--
-This parameter determines whether or not to allow "tricky" CSS properties and
-values. Tricky CSS properties/values can drastically modify page layout or
-be used for deceptive practices but do not directly constitute a security risk.
-For example, <code>display:none;</code> is considered a tricky property that
-will only be allowed if this directive is set to true.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
deleted file mode 100644
index 460112ebe0ae49eff6c6514d1cd4461301117ebe..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-CSS.AllowedProperties
-TYPE: lookup/null
-VERSION: 3.1.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    If HTML Purifier's style attributes set is unsatisfactory for your needs,
-    you can overload it with your own list of tags to allow.  Note that this
-    method is subtractive: it does its job by taking away from HTML Purifier
-    usual feature set, so you cannot add an attribute that HTML Purifier never
-    supported in the first place.
-</p>
-<p>
-    <strong>Warning:</strong> If another directive conflicts with the
-    elements here, <em>that</em> directive will win and override.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
deleted file mode 100644
index 5cb7dda3baea51be40f06bbc3d60e8eb97f333e7..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-CSS.DefinitionRev
-TYPE: int
-VERSION: 2.0.0
-DEFAULT: 1
---DESCRIPTION--
-
-<p>
-    Revision identifier for your custom definition. See
-    %HTML.DefinitionRev for details.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
deleted file mode 100644
index 7a3291470ccb798f1590a24bd58fe082c29e7900..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-CSS.MaxImgLength
-TYPE: string/null
-DEFAULT: '1200px'
-VERSION: 3.1.1
---DESCRIPTION--
-<p>
- This parameter sets the maximum allowed length on <code>img</code> tags,
- effectively the <code>width</code> and <code>height</code> properties.
- Only absolute units of measurement (in, pt, pc, mm, cm) and pixels (px) are allowed. This is
- in place to prevent imagecrash attacks, disable with null at your own risk.
- This directive is similar to %HTML.MaxImgLength, and both should be
- concurrently edited, although there are
- subtle differences in the input format (the CSS max is a number with
- a unit).
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
deleted file mode 100644
index 148eedb8be29e951f5ad92075d83a4b5d85f7456..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-CSS.Proprietary
-TYPE: bool
-VERSION: 3.0.0
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-    Whether or not to allow safe, proprietary CSS values.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
deleted file mode 100644
index c486724c88ae49e875f802b0eaf0c079c4003df7..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Cache.DefinitionImpl
-TYPE: string/null
-VERSION: 2.0.0
-DEFAULT: 'Serializer'
---DESCRIPTION--
-
-This directive defines which method to use when caching definitions,
-the complex data-type that makes HTML Purifier tick. Set to null
-to disable caching (not recommended, as you will see a definite
-performance degradation).
-
---ALIASES--
-Core.DefinitionCache
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
deleted file mode 100644
index 54036507d6ce240dff64f2d7009a2440d86c98f2..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Cache.SerializerPath
-TYPE: string/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    Absolute path with no trailing slash to store serialized definitions in.
-    Default is within the
-    HTML Purifier library inside DefinitionCache/Serializer. This
-    path must be writable by the webserver.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
deleted file mode 100644
index 568cbf3b32823326c2b662aba0fe43bbf993944c..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Core.AggressivelyFixLt
-TYPE: bool
-VERSION: 2.1.0
-DEFAULT: true
---DESCRIPTION--
-<p>
-    This directive enables aggressive pre-filter fixes HTML Purifier can
-    perform in order to ensure that open angled-brackets do not get killed
-    during parsing stage. Enabling this will result in two preg_replace_callback
-    calls and at least two preg_replace calls for every HTML document parsed;
-    if your users make very well-formed HTML, you can set this directive false.
-    This has no effect when DirectLex is used.
-</p>
-<p>
-    <strong>Notice:</strong> This directive's default turned from false to true
-    in HTML Purifier 3.2.0.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
deleted file mode 100644
index d7317911fa30e3ee87456d6ff669f1d872654ae7..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Core.CollectErrors
-TYPE: bool
-VERSION: 2.0.0
-DEFAULT: false
---DESCRIPTION--
-
-Whether or not to collect errors found while filtering the document. This
-is a useful way to give feedback to your users. <strong>Warning:</strong>
-Currently this feature is very patchy and experimental, with lots of
-possible error messages not yet implemented. It will not cause any
-problems, but it may not help your users either.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
deleted file mode 100644
index 08b381d34c1aeb49f55293decbe18588826d95e9..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Core.ColorKeywords
-TYPE: hash
-VERSION: 2.0.0
---DEFAULT--
-array (
-  'maroon' => '#800000',
-  'red' => '#FF0000',
-  'orange' => '#FFA500',
-  'yellow' => '#FFFF00',
-  'olive' => '#808000',
-  'purple' => '#800080',
-  'fuchsia' => '#FF00FF',
-  'white' => '#FFFFFF',
-  'lime' => '#00FF00',
-  'green' => '#008000',
-  'navy' => '#000080',
-  'blue' => '#0000FF',
-  'aqua' => '#00FFFF',
-  'teal' => '#008080',
-  'black' => '#000000',
-  'silver' => '#C0C0C0',
-  'gray' => '#808080',
-)
---DESCRIPTION--
-
-Lookup array of color names to six digit hexadecimal number corresponding
-to color, with preceding hash mark. Used when parsing colors.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
deleted file mode 100644
index 64b114fce2b108f426835b2f69281494e52b312d..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Core.ConvertDocumentToFragment
-TYPE: bool
-DEFAULT: true
---DESCRIPTION--
-
-This parameter determines whether or not the filter should convert
-input that is a full document with html and body tags to a fragment
-of just the contents of a body tag. This parameter is simply something
-HTML Purifier can do during an edge-case: for most inputs, this
-processing is not necessary.
-
---ALIASES--
-Core.AcceptFullDocuments
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
deleted file mode 100644
index 36f16e07eaefe31bfc8814b1f6dcafeba6dbcaac..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Core.DirectLexLineNumberSyncInterval
-TYPE: int
-VERSION: 2.0.0
-DEFAULT: 0
---DESCRIPTION--
-
-<p>
-  Specifies the number of tokens the DirectLex line number tracking
-  implementations should process before attempting to resyncronize the
-  current line count by manually counting all previous new-lines. When
-  at 0, this functionality is disabled. Lower values will decrease
-  performance, and this is only strictly necessary if the counting
-  algorithm is buggy (in which case you should report it as a bug).
-  This has no effect when %Core.MaintainLineNumbers is disabled or DirectLex is
-  not being used.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
deleted file mode 100644
index 8bfb47c3ac1c97a0f11bec501d4f5b6c60d4434a..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Core.Encoding
-TYPE: istring
-DEFAULT: 'utf-8'
---DESCRIPTION--
-If for some reason you are unable to convert all webpages to UTF-8, you can
-use this directive as a stop-gap compatibility change to let HTML Purifier
-deal with non UTF-8 input.  This technique has notable deficiencies:
-absolutely no characters outside of the selected character encoding will be
-preserved, not even the ones that have been ampersand escaped (this is due
-to a UTF-8 specific <em>feature</em> that automatically resolves all
-entities), making it pretty useless for anything except the most I18N-blind
-applications, although %Core.EscapeNonASCIICharacters offers fixes this
-trouble with another tradeoff. This directive only accepts ISO-8859-1 if
-iconv is not enabled.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
deleted file mode 100644
index 4d5b5055cd31d2f611125f8a0c52aec91ed79eb2..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Core.EscapeInvalidChildren
-TYPE: bool
-DEFAULT: false
---DESCRIPTION--
-When true, a child is found that is not allowed in the context of the
-parent element will be transformed into text as if it were ASCII. When
-false, that element and all internal tags will be dropped, though text will
-be preserved.  There is no option for dropping the element but preserving
-child nodes.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
deleted file mode 100644
index a7a5b249bb71bc7623d67ffb69e5dadc43f959aa..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Core.EscapeInvalidTags
-TYPE: bool
-DEFAULT: false
---DESCRIPTION--
-When true, invalid tags will be written back to the document as plain text.
-Otherwise, they are silently dropped.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
deleted file mode 100644
index abb499948aca3b2402794f9b2709c8074ede5a00..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Core.EscapeNonASCIICharacters
-TYPE: bool
-VERSION: 1.4.0
-DEFAULT: false
---DESCRIPTION--
-This directive overcomes a deficiency in %Core.Encoding by blindly
-converting all non-ASCII characters into decimal numeric entities before
-converting it to its native encoding. This means that even characters that
-can be expressed in the non-UTF-8 encoding will be entity-ized, which can
-be a real downer for encodings like Big5. It also assumes that the ASCII
-repetoire is available, although this is the case for almost all encodings.
-Anyway, use UTF-8!
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
deleted file mode 100644
index 915391edb73fc1c3f573666ff436f6db6a149673..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Core.HiddenElements
-TYPE: lookup
---DEFAULT--
-array (
-  'script' => true,
-  'style' => true,
-)
---DESCRIPTION--
-
-<p>
-  This directive is a lookup array of elements which should have their
-  contents removed when they are not allowed by the HTML definition.
-  For example, the contents of a <code>script</code> tag are not
-  normally shown in a document, so if script tags are to be removed,
-  their contents should be removed to. This is opposed to a <code>b</code>
-  tag, which defines some presentational changes but does not hide its
-  contents.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.Language.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
deleted file mode 100644
index 233fca14f84b2020e0b8c83152d7c3bc83070ffc..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Core.Language
-TYPE: string
-VERSION: 2.0.0
-DEFAULT: 'en'
---DESCRIPTION--
-
-ISO 639 language code for localizable things in HTML Purifier to use,
-which is mainly error reporting. There is currently only an English (en)
-translation, so this directive is currently useless.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
deleted file mode 100644
index 8983e2cca9b3a9863e87c021d980f55440de0c8c..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-Core.LexerImpl
-TYPE: mixed/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-  This parameter determines what lexer implementation can be used. The
-  valid values are:
-</p>
-<dl>
-  <dt><em>null</em></dt>
-  <dd>
-    Recommended, the lexer implementation will be auto-detected based on
-    your PHP-version and configuration.
-  </dd>
-  <dt><em>string</em> lexer identifier</dt>
-  <dd>
-    This is a slim way of manually overridding the implementation.
-    Currently recognized values are: DOMLex (the default PHP5
-implementation)
-    and DirectLex (the default PHP4 implementation). Only use this if
-    you know what you are doing: usually, the auto-detection will
-    manage things for cases you aren't even aware of.
-  </dd>
-  <dt><em>object</em> lexer instance</dt>
-  <dd>
-    Super-advanced: you can specify your own, custom, implementation that
-    implements the interface defined by <code>HTMLPurifier_Lexer</code>.
-    I may remove this option simply because I don't expect anyone
-    to use it.
-  </dd>
-</dl>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
deleted file mode 100644
index eb841a7597a0ab16913ca8396461692f936c0944..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Core.MaintainLineNumbers
-TYPE: bool/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-  If true, HTML Purifier will add line number information to all tokens.
-  This is useful when error reporting is turned on, but can result in
-  significant performance degradation and should not be used when
-  unnecessary. This directive must be used with the DirectLex lexer,
-  as the DOMLex lexer does not (yet) support this functionality.
-  If the value is null, an appropriate value will be selected based
-  on other configuration.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
deleted file mode 100644
index 4070c2a0de20439361abcc5446c8fe0c072d2346..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Core.RemoveInvalidImg
-TYPE: bool
-DEFAULT: true
-VERSION: 1.3.0
---DESCRIPTION--
-
-<p>
-  This directive enables pre-emptive URI checking in <code>img</code>
-  tags, as the attribute validation strategy is not authorized to
-  remove elements from the document. Revert to pre-1.3.0 behavior by setting to false.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
deleted file mode 100644
index a4cd966df89aa5f5ec80eff45e00e5fffb079b2f..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Core.RemoveScriptContents
-TYPE: bool/null
-DEFAULT: NULL
-VERSION: 2.0.0
-DEPRECATED-VERSION: 2.1.0
-DEPRECATED-USE: Core.HiddenElements
---DESCRIPTION--
-<p>
-  This directive enables HTML Purifier to remove not only script tags
-  but all of their contents.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
deleted file mode 100644
index 3db50ef204b4fc5d57e7757b6316774aa6c214f1..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Filter.Custom
-TYPE: list
-VERSION: 3.1.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
-  This directive can be used to add custom filters; it is nearly the
-  equivalent of the now deprecated <code>HTMLPurifier-&gt;addFilter()</code>
-  method. Specify an array of concrete implementations.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
deleted file mode 100644
index 16829bcda0335f582c83ff6e2a603111e412700b..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Filter.ExtractStyleBlocks.Escaping
-TYPE: bool
-VERSION: 3.0.0
-DEFAULT: true
-ALIASES: Filter.ExtractStyleBlocksEscaping, FilterParam.ExtractStyleBlocksEscaping
---DESCRIPTION--
-
-<p>
-  Whether or not to escape the dangerous characters &lt;, &gt; and &amp;
-  as \3C, \3E and \26, respectively. This is can be safely set to false
-  if the contents of StyleBlocks will be placed in an external stylesheet,
-  where there is no risk of it being interpreted as HTML.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
deleted file mode 100644
index 7f95f54d125de2312dc7bcd6630e453cee73bd5c..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Filter.ExtractStyleBlocks.Scope
-TYPE: string/null
-VERSION: 3.0.0
-DEFAULT: NULL
-ALIASES: Filter.ExtractStyleBlocksScope, FilterParam.ExtractStyleBlocksScope
---DESCRIPTION--
-
-<p>
-  If you would like users to be able to define external stylesheets, but
-  only allow them to specify CSS declarations for a specific node and
-  prevent them from fiddling with other elements, use this directive.
-  It accepts any valid CSS selector, and will prepend this to any
-  CSS declaration extracted from the document. For example, if this
-  directive is set to <code>#user-content</code> and a user uses the
-  selector <code>a:hover</code>, the final selector will be
-  <code>#user-content a:hover</code>.
-</p>
-<p>
-  The comma shorthand may be used; consider the above example, with
-  <code>#user-content, #user-content2</code>, the final selector will
-  be <code>#user-content a:hover, #user-content2 a:hover</code>.
-</p>
-<p>
-  <strong>Warning:</strong> It is possible for users to bypass this measure
-  using a naughty + selector. This is a bug in CSS Tidy 1.3, not HTML
-  Purifier, and I am working to get it fixed. Until then, HTML Purifier
-  performs a basic check to prevent this.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
deleted file mode 100644
index 6c231b2d7f7b2a1ccb9fc90e0162b8f0396ae30d..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Filter.ExtractStyleBlocks.TidyImpl
-TYPE: mixed/null
-VERSION: 3.1.0
-DEFAULT: NULL
-ALIASES: FilterParam.ExtractStyleBlocksTidyImpl
---DESCRIPTION--
-<p>
-  If left NULL, HTML Purifier will attempt to instantiate a <code>csstidy</code>
-  class to use for internal cleaning. This will usually be good enough.
-</p>
-<p>
-  However, for trusted user input, you can set this to <code>false</code> to
-  disable cleaning. In addition, you can supply your own concrete implementation
-  of Tidy's interface to use, although I don't know why you'd want to do that.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
deleted file mode 100644
index 078d087417e2e5510d3d193704da98493bc5e89e..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-Filter.ExtractStyleBlocks
-TYPE: bool
-VERSION: 3.1.0
-DEFAULT: false
-EXTERNAL: CSSTidy
---DESCRIPTION--
-<p>
-  This directive turns on the style block extraction filter, which removes
-  <code>style</code> blocks from input HTML, cleans them up with CSSTidy,
-  and places them in the <code>StyleBlocks</code> context variable, for further
-  use by you, usually to be placed in an external stylesheet, or a
-  <code>style</code> block in the <code>head</code> of your document.
-</p>
-<p>
-  Sample usage:
-</p>
-<pre><![CDATA[
-<?php
-    header('Content-type: text/html; charset=utf-8');
-    echo '<?xml version="1.0" encoding="UTF-8"?>';
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-  <title>Filter.ExtractStyleBlocks</title>
-<?php
-    require_once '/path/to/library/HTMLPurifier.auto.php';
-    require_once '/path/to/csstidy.class.php';
-
-    $dirty = '<style>body {color:#F00;}</style> Some text';
-
-    $config = HTMLPurifier_Config::createDefault();
-    $config->set('Filter', 'ExtractStyleBlocks', true);
-    $purifier = new HTMLPurifier($config);
-
-    $html = $purifier->purify($dirty);
-
-    // This implementation writes the stylesheets to the styles/ directory.
-    // You can also echo the styles inside the document, but it's a bit
-    // more difficult to make sure they get interpreted properly by
-    // browsers; try the usual CSS armoring techniques.
-    $styles = $purifier->context->get('StyleBlocks');
-    $dir = 'styles/';
-    if (!is_dir($dir)) mkdir($dir);
-    $hash = sha1($_GET['html']);
-    foreach ($styles as $i => $style) {
-        file_put_contents($name = $dir . $hash . "_$i");
-        echo '<link rel="stylesheet" type="text/css" href="'.$name.'" />';
-    }
-?>
-</head>
-<body>
-  <div>
-    <?php echo $html; ?>
-  </div>
-</b]]><![CDATA[ody>
-</html>
-]]></pre>
-<p>
-  <strong>Warning:</strong> It is possible for a user to mount an
-  imagecrash attack using this CSS. Counter-measures are difficult;
-  it is not simply enough to limit the range of CSS lengths (using
-  relative lengths with many nesting levels allows for large values
-  to be attained without actually specifying them in the stylesheet),
-  and the flexible nature of selectors makes it difficult to selectively
-  disable lengths on image tags (HTML Purifier, however, does disable
-  CSS width and height in inline styling). There are probably two effective
-  counter measures: an explicit width and height set to auto in all
-  images in your document (unlikely) or the disabling of width and
-  height (somewhat reasonable). Whether or not these measures should be
-  used is left to the reader.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
deleted file mode 100644
index 7fa6536b2c70f4b2593bb5ab8d32e57cce560194..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Filter.YouTube
-TYPE: bool
-VERSION: 3.1.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-  This directive enables YouTube video embedding in HTML Purifier. Check
-  <a href="http://htmlpurifier.org/docs/enduser-youtube.html">this document
-  on embedding videos</a> for more information on what this filter does.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
deleted file mode 100644
index 3e231d2d16a5c9ee671f98f618263df48f8223a2..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-HTML.Allowed
-TYPE: itext/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    This is a convenience directive that rolls the functionality of
-    %HTML.AllowedElements and %HTML.AllowedAttributes into one directive.
-    Specify elements and attributes that are allowed using:
-    <code>element1[attr1|attr2],element2...</code>. You can also use
-    newlines instead of commas to separate elements.
-</p>
-<p>
-    <strong>Warning</strong>:
-    All of the constraints on the component directives are still enforced.
-    The syntax is a <em>subset</em> of TinyMCE's <code>valid_elements</code>
-    whitelist: directly copy-pasting it here will probably result in
-    broken whitelists. If %HTML.AllowedElements or %HTML.AllowedAttributes
-    are set, this directive has no effect.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
deleted file mode 100644
index fcf093f17d1fbda44affba011425726b7257357a..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-HTML.AllowedAttributes
-TYPE: lookup/null
-VERSION: 1.3.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    If HTML Purifier's attribute set is unsatisfactory, overload it!
-    The syntax is "tag.attr" or "*.attr" for the global attributes
-    (style, id, class, dir, lang, xml:lang).
-</p>
-<p>
-    <strong>Warning:</strong> If another directive conflicts with the
-    elements here, <em>that</em> directive will win and override. For
-    example, %HTML.EnableAttrID will take precedence over *.id in this
-    directive.  You must set that directive to true before you can use
-    IDs at all.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
deleted file mode 100644
index 888d55819690d49ef5d1776b07f44413b185c277..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-HTML.AllowedElements
-TYPE: lookup/null
-VERSION: 1.3.0
-DEFAULT: NULL
---DESCRIPTION--
-<p>
-    If HTML Purifier's tag set is unsatisfactory for your needs, you
-    can overload it with your own list of tags to allow.  Note that this
-    method is subtractive: it does its job by taking away from HTML Purifier
-    usual feature set, so you cannot add a tag that HTML Purifier never
-    supported in the first place (like embed, form or head).  If you
-    change this, you probably also want to change %HTML.AllowedAttributes.
-</p>
-<p>
-    <strong>Warning:</strong> If another directive conflicts with the
-    elements here, <em>that</em> directive will win and override.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
deleted file mode 100644
index 5a59a55c083e47c9e7eef4bb6bc40e21258de588..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-HTML.AllowedModules
-TYPE: lookup/null
-VERSION: 2.0.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    A doctype comes with a set of usual modules to use. Without having
-    to mucking about with the doctypes, you can quickly activate or
-    disable these modules by specifying which modules you wish to allow
-    with this directive. This is most useful for unit testing specific
-    modules, although end users may find it useful for their own ends.
-</p>
-<p>
-    If you specify a module that does not exist, the manager will silently
-    fail to use it, so be careful! User-defined modules are not affected
-    by this directive. Modules defined in %HTML.CoreModules are not
-    affected by this directive.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
deleted file mode 100644
index 151fb7b8264b3959cd9029605ad5bacdf9d07c7d..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-HTML.Attr.Name.UseCDATA
-TYPE: bool
-DEFAULT: false
-VERSION: 4.0.0
---DESCRIPTION--
-The W3C specification DTD defines the name attribute to be CDATA, not ID, due
-to limitations of DTD.  In certain documents, this relaxed behavior is desired,
-whether it is to specify duplicate names, or to specify names that would be
-illegal IDs (for example, names that begin with a digit.) Set this configuration
-directive to true to use the relaxed parsing rules.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
deleted file mode 100644
index 45ae469ec9852bbb6cc85fb30123e3b3e300f99e..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-HTML.BlockWrapper
-TYPE: string
-VERSION: 1.3.0
-DEFAULT: 'p'
---DESCRIPTION--
-
-<p>
-    String name of element to wrap inline elements that are inside a block
-    context.  This only occurs in the children of blockquote in strict mode.
-</p>
-<p>
-    Example: by default value,
-    <code>&lt;blockquote&gt;Foo&lt;/blockquote&gt;</code> would become
-    <code>&lt;blockquote&gt;&lt;p&gt;Foo&lt;/p&gt;&lt;/blockquote&gt;</code>.
-    The <code>&lt;p&gt;</code> tags can be replaced with whatever you desire,
-    as long as it is a block level element.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
deleted file mode 100644
index 5246188795507b0c161f3d2c45ff3ddfc392dbfb..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-HTML.CoreModules
-TYPE: lookup
-VERSION: 2.0.0
---DEFAULT--
-array (
-  'Structure' => true,
-  'Text' => true,
-  'Hypertext' => true,
-  'List' => true,
-  'NonXMLCommonAttributes' => true,
-  'XMLCommonAttributes' => true,
-  'CommonAttributes' => true,
-)
---DESCRIPTION--
-
-<p>
-    Certain modularized doctypes (XHTML, namely), have certain modules
-    that must be included for the doctype to be an conforming document
-    type: put those modules here. By default, XHTML's core modules
-    are used. You can set this to a blank array to disable core module
-    protection, but this is not recommended.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
deleted file mode 100644
index a64e3d7c363ebaa06b555c02f8a88c8da49013a9..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-HTML.CustomDoctype
-TYPE: string/null
-VERSION: 2.0.1
-DEFAULT: NULL
---DESCRIPTION--
-
-A custom doctype for power-users who defined there own document
-type. This directive only applies when %HTML.Doctype is blank.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
deleted file mode 100644
index 103db754a289a5c9ad194008325f41e317b538a7..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-HTML.DefinitionID
-TYPE: string/null
-DEFAULT: NULL
-VERSION: 2.0.0
---DESCRIPTION--
-
-<p>
-    Unique identifier for a custom-built HTML definition. If you edit
-    the raw version of the HTMLDefinition, introducing changes that the
-    configuration object does not reflect, you must specify this variable.
-    If you change your custom edits, you should change this directive, or
-    clear your cache. Example:
-</p>
-<pre>
-$config = HTMLPurifier_Config::createDefault();
-$config->set('HTML', 'DefinitionID', '1');
-$def = $config->getHTMLDefinition();
-$def->addAttribute('a', 'tabindex', 'Number');
-</pre>
-<p>
-    In the above example, the configuration is still at the defaults, but
-    using the advanced API, an extra attribute has been added. The
-    configuration object normally has no way of knowing that this change
-    has taken place, so it needs an extra directive: %HTML.DefinitionID.
-    If someone else attempts to use the default configuration, these two
-    pieces of code will not clobber each other in the cache, since one has
-    an extra directive attached to it.
-</p>
-<p>
-    You <em>must</em> specify a value to this directive to use the
-    advanced API features.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
deleted file mode 100644
index 229ae0267a6ff6eae15db65167045f89f1179e16..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-HTML.DefinitionRev
-TYPE: int
-VERSION: 2.0.0
-DEFAULT: 1
---DESCRIPTION--
-
-<p>
-    Revision identifier for your custom definition specified in
-    %HTML.DefinitionID.  This serves the same purpose: uniquely identifying
-    your custom definition, but this one does so in a chronological
-    context: revision 3 is more up-to-date then revision 2.  Thus, when
-    this gets incremented, the cache handling is smart enough to clean
-    up any older revisions of your definition as well as flush the
-    cache.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
deleted file mode 100644
index 9dab497f2f3ca79e9b217a0631a06b19ce83dd3e..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-HTML.Doctype
-TYPE: string/null
-DEFAULT: NULL
---DESCRIPTION--
-Doctype to use during filtering. Technically speaking this is not actually
-a doctype (as it does not identify a corresponding DTD), but we are using
-this name for sake of simplicity. When non-blank, this will override any
-older directives like %HTML.XHTML or %HTML.Strict.
---ALLOWED--
-'HTML 4.01 Transitional', 'HTML 4.01 Strict', 'XHTML 1.0 Transitional', 'XHTML 1.0 Strict', 'XHTML 1.1'
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
deleted file mode 100644
index 57358f9bad296bca1b977480b11f6c0e89e6171c..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-HTML.ForbiddenAttributes
-TYPE: lookup
-VERSION: 3.1.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
-    While this directive is similar to %HTML.AllowedAttributes, for
-    forwards-compatibility with XML, this attribute has a different syntax. Instead of
-    <code>tag.attr</code>, use <code>tag@attr</code>. To disallow <code>href</code>
-    attributes in <code>a</code> tags, set this directive to
-    <code>a@href</code>. You can also disallow an attribute globally with
-    <code>attr</code> or <code>*@attr</code> (either syntax is fine; the latter
-    is provided for consistency with %HTML.AllowedAttributes).
-</p>
-<p>
-    <strong>Warning:</strong> This directive complements %HTML.ForbiddenElements,
-    accordingly, check
-    out that directive for a discussion of why you
-    should think twice before using this directive.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
deleted file mode 100644
index 93a53e14fb4e9532479a6727c1bae261c8c634ff..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-HTML.ForbiddenElements
-TYPE: lookup
-VERSION: 3.1.0
-DEFAULT: array()
---DESCRIPTION--
-<p>
-    This was, perhaps, the most requested feature ever in HTML
-    Purifier. Please don't abuse it! This is the logical inverse of
-    %HTML.AllowedElements, and it will override that directive, or any
-    other directive.
-</p>
-<p>
-    If possible, %HTML.Allowed is recommended over this directive, because it
-    can sometimes be difficult to tell whether or not you've forbidden all of
-    the behavior you would like to disallow. If you forbid <code>img</code>
-    with the expectation of preventing images on your site, you'll be in for
-    a nasty surprise when people start using the <code>background-image</code>
-    CSS property.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
deleted file mode 100644
index e424c386ec31e391ee7c12e186af4a51d6101f2a..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-HTML.MaxImgLength
-TYPE: int/null
-DEFAULT: 1200
-VERSION: 3.1.1
---DESCRIPTION--
-<p>
- This directive controls the maximum number of pixels in the width and
- height attributes in <code>img</code> tags. This is
- in place to prevent imagecrash attacks, disable with null at your own risk.
- This directive is similar to %CSS.MaxImgLength, and both should be
- concurrently edited, although there are
- subtle differences in the input format (the HTML max is an integer).
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
deleted file mode 100644
index 62e8e160c736570c69a1d5655dfad97053f85b16..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-HTML.Parent
-TYPE: string
-VERSION: 1.3.0
-DEFAULT: 'div'
---DESCRIPTION--
-
-<p>
-    String name of element that HTML fragment passed to library will be
-    inserted in.  An interesting variation would be using span as the
-    parent element, meaning that only inline tags would be allowed.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
deleted file mode 100644
index dfb720496dab5aa44f3893c53a90ff64f14d53b0..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-HTML.Proprietary
-TYPE: bool
-VERSION: 3.1.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Whether or not to allow proprietary elements and attributes in your
-    documents, as per <code>HTMLPurifier_HTMLModule_Proprietary</code>.
-    <strong>Warning:</strong> This can cause your documents to stop
-    validating!
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
deleted file mode 100644
index f635a68548bad4985efd5615b6df8cd79d0f4fdf..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-HTML.SafeEmbed
-TYPE: bool
-VERSION: 3.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Whether or not to permit embed tags in documents, with a number of extra
-    security features added to prevent script execution. This is similar to
-    what websites like MySpace do to embed tags. Embed is a proprietary
-    element and will cause your website to stop validating. You probably want
-    to enable this with %HTML.SafeObject.
-    <strong>Highly experimental.</strong>
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
deleted file mode 100644
index 32967b88fb7d34b4c757224c86d1d90386d89ca2..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-HTML.SafeObject
-TYPE: bool
-VERSION: 3.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Whether or not to permit object tags in documents, with a number of extra
-    security features added to prevent script execution. This is similar to
-    what websites like MySpace do to object tags. You may also want to
-    enable %HTML.SafeEmbed for maximum interoperability with Internet Explorer,
-    although embed tags will cause your website to stop validating.
-    <strong>Highly experimental.</strong>
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
deleted file mode 100644
index a8b1de56bef7e9847fdf0c6e0ad9f9c1c6195929..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-HTML.Strict
-TYPE: bool
-VERSION: 1.3.0
-DEFAULT: false
-DEPRECATED-VERSION: 1.7.0
-DEPRECATED-USE: HTML.Doctype
---DESCRIPTION--
-Determines whether or not to use Transitional (loose) or Strict rulesets.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
deleted file mode 100644
index b4c271b7fac768967c9b7f36c22075e88c9e8b33..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-HTML.TidyAdd
-TYPE: lookup
-VERSION: 2.0.0
-DEFAULT: array()
---DESCRIPTION--
-
-Fixes to add to the default set of Tidy fixes as per your level.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
deleted file mode 100644
index 4186ccd0d196ad2a4846c7e25781e1f119c067c6..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-HTML.TidyLevel
-TYPE: string
-VERSION: 2.0.0
-DEFAULT: 'medium'
---DESCRIPTION--
-
-<p>General level of cleanliness the Tidy module should enforce.
-There are four allowed values:</p>
-<dl>
-    <dt>none</dt>
-    <dd>No extra tidying should be done</dd>
-    <dt>light</dt>
-    <dd>Only fix elements that would be discarded otherwise due to
-    lack of support in doctype</dd>
-    <dt>medium</dt>
-    <dd>Enforce best practices</dd>
-    <dt>heavy</dt>
-    <dd>Transform all deprecated elements and attributes to standards
-    compliant equivalents</dd>
-</dl>
-
---ALLOWED--
-'none', 'light', 'medium', 'heavy'
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
deleted file mode 100644
index 996762bd1d66f725cd76f456326672a0cc86b208..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-HTML.TidyRemove
-TYPE: lookup
-VERSION: 2.0.0
-DEFAULT: array()
---DESCRIPTION--
-
-Fixes to remove from the default set of Tidy fixes as per your level.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
deleted file mode 100644
index 89133b1a385d326c1e2882e7d1f18f75a09edb60..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-HTML.Trusted
-TYPE: bool
-VERSION: 2.0.0
-DEFAULT: false
---DESCRIPTION--
-Indicates whether or not the user input is trusted or not. If the input is
-trusted, a more expansive set of allowed tags and attributes will be used.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
deleted file mode 100644
index 2a47e384f4142490020436a837f081fb63841ceb..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-HTML.XHTML
-TYPE: bool
-DEFAULT: true
-VERSION: 1.1.0
-DEPRECATED-VERSION: 1.7.0
-DEPRECATED-USE: HTML.Doctype
---DESCRIPTION--
-Determines whether or not output is XHTML 1.0 or HTML 4.01 flavor.
---ALIASES--
-Core.XHTML
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
deleted file mode 100644
index 08921fde70a17d49cfa7b555174e31ba2cf6cffb..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Output.CommentScriptContents
-TYPE: bool
-VERSION: 2.0.0
-DEFAULT: true
---DESCRIPTION--
-Determines whether or not HTML Purifier should attempt to fix up the
-contents of script tags for legacy browsers with comments.
---ALIASES--
-Core.CommentScriptContents
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
deleted file mode 100644
index 79f8ad82cfc6b01eab440bf41d0af66d6db91d8a..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Output.Newline
-TYPE: string/null
-VERSION: 2.0.1
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    Newline string to format final output with. If left null, HTML Purifier
-    will auto-detect the default newline type of the system and use that;
-    you can manually override it here. Remember, \r\n is Windows, \r
-    is Mac, and \n is Unix.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
deleted file mode 100644
index 232b02362a46af7a9fd7d44894dab9b1c59f0e54..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Output.SortAttr
-TYPE: bool
-VERSION: 3.2.0
-DEFAULT: false
---DESCRIPTION--
-<p>
-  If true, HTML Purifier will sort attributes by name before writing them back
-  to the document, converting a tag like: <code>&lt;el b="" a="" c="" /&gt;</code>
-  to <code>&lt;el a="" b="" c="" /&gt;</code>. This is a workaround for
-  a bug in FCKeditor which causes it to swap attributes order, adding noise
-  to text diffs. If you're not seeing this bug, chances are, you don't need
-  this directive.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
deleted file mode 100644
index 06bab00a0a2a1bd066d1344742ea457d3df03896..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Output.TidyFormat
-TYPE: bool
-VERSION: 1.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
-    Determines whether or not to run Tidy on the final output for pretty
-    formatting reasons, such as indentation and wrap.
-</p>
-<p>
-    This can greatly improve readability for editors who are hand-editing
-    the HTML, but is by no means necessary as HTML Purifier has already
-    fixed all major errors the HTML may have had. Tidy is a non-default
-    extension, and this directive will silently fail if Tidy is not
-    available.
-</p>
-<p>
-    If you are looking to make the overall look of your page's source
-    better, I recommend running Tidy on the entire page rather than just
-    user-content (after all, the indentation relative to the containing
-    blocks will be incorrect).
-</p>
---ALIASES--
-Core.TidyFormat
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
deleted file mode 100644
index 071bc0295df30acd443e87f49f77420b6f84d93d..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Test.ForceNoIconv
-TYPE: bool
-DEFAULT: false
---DESCRIPTION--
-When set to true, HTMLPurifier_Encoder will act as if iconv does not exist
-and use only pure PHP implementations.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
deleted file mode 100644
index 98fdfe922260a2b6b574891c9cb05c5d99028f7f..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-URI.AllowedSchemes
-TYPE: lookup
---DEFAULT--
-array (
-  'http' => true,
-  'https' => true,
-  'mailto' => true,
-  'ftp' => true,
-  'nntp' => true,
-  'news' => true,
-)
---DESCRIPTION--
-Whitelist that defines the schemes that a URI is allowed to have.  This
-prevents XSS attacks from using pseudo-schemes like javascript or mocha.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.Base.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
deleted file mode 100644
index 876f0680cf27769d7ad396db186635f163e05dbd..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-URI.Base
-TYPE: string/null
-VERSION: 2.1.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    The base URI is the URI of the document this purified HTML will be
-    inserted into.  This information is important if HTML Purifier needs
-    to calculate absolute URIs from relative URIs, such as when %URI.MakeAbsolute
-    is on.  You may use a non-absolute URI for this value, but behavior
-    may vary (%URI.MakeAbsolute deals nicely with both absolute and
-    relative paths, but forwards-compatibility is not guaranteed).
-    <strong>Warning:</strong> If set, the scheme on this URI
-    overrides the one specified by %URI.DefaultScheme.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
deleted file mode 100644
index 728e378cbeb462998a10de23946b60e3ebd74cc5..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-URI.DefaultScheme
-TYPE: string
-DEFAULT: 'http'
---DESCRIPTION--
-
-<p>
-    Defines through what scheme the output will be served, in order to
-    select the proper object validator when no scheme information is present.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
deleted file mode 100644
index f05312ba862690b00fb80399b299d24c25d1c7be..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-URI.DefinitionID
-TYPE: string/null
-VERSION: 2.1.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    Unique identifier for a custom-built URI definition. If you  want
-    to add custom URIFilters, you must specify this value.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
deleted file mode 100644
index 80cfea93f72dcc76d5ec39d68b5b0efccdef41fb..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-URI.DefinitionRev
-TYPE: int
-VERSION: 2.1.0
-DEFAULT: 1
---DESCRIPTION--
-
-<p>
-    Revision identifier for your custom definition. See
-    %HTML.DefinitionRev for details.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
deleted file mode 100644
index 71ce025a2dcf06fad2171c8fa849552d81af2c50..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-URI.Disable
-TYPE: bool
-VERSION: 1.3.0
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-    Disables all URIs in all forms. Not sure why you'd want to do that
-    (after all, the Internet's founded on the notion of a hyperlink).
-</p>
-
---ALIASES--
-Attr.DisableURI
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
deleted file mode 100644
index 13c122c8cecabcda3c65897357de50955c1e91e8..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-URI.DisableExternal
-TYPE: bool
-VERSION: 1.2.0
-DEFAULT: false
---DESCRIPTION--
-Disables links to external websites.  This is a highly effective anti-spam
-and anti-pagerank-leech measure, but comes at a hefty price: nolinks or
-images outside of your domain will be allowed.  Non-linkified URIs will
-still be preserved.  If you want to be able to link to subdomains or use
-absolute URIs, specify %URI.Host for your website.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
deleted file mode 100644
index abcc1efd61328375ffdb5f233b265b69b612a0c9..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-URI.DisableExternalResources
-TYPE: bool
-VERSION: 1.3.0
-DEFAULT: false
---DESCRIPTION--
-Disables the embedding of external resources, preventing users from
-embedding things like images from other hosts. This prevents access
-tracking (good for email viewers), bandwidth leeching, cross-site request
-forging, goatse.cx posting, and other nasties, but also results in a loss
-of end-user functionality (they can't directly post a pic they posted from
-Flickr anymore). Use it if you don't have a robust user-content moderation
-team.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
deleted file mode 100644
index 51e6ea91f79cf36ea1e717ed5aebf26449cc5b61..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-URI.DisableResources
-TYPE: bool
-VERSION: 1.3.0
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-    Disables embedding resources, essentially meaning no pictures. You can
-    still link to them though. See %URI.DisableExternalResources for why
-    this might be a good idea.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.Host.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
deleted file mode 100644
index ee83b121dece74354d881dd76ce2b4dac9a74a7f..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-URI.Host
-TYPE: string/null
-VERSION: 1.2.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    Defines the domain name of the server, so we can determine whether or
-    an absolute URI is from your website or not.  Not strictly necessary,
-    as users should be using relative URIs to reference resources on your
-    website.  It will, however, let you use absolute URIs to link to
-    subdomains of the domain you post here: i.e. example.com will allow
-    sub.example.com.  However, higher up domains will still be excluded:
-    if you set %URI.Host to sub.example.com, example.com will be blocked.
-    <strong>Note:</strong> This directive overrides %URI.Base because
-    a given page may be on a sub-domain, but you wish HTML Purifier to be
-    more relaxed and allow some of the parent domains too.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
deleted file mode 100644
index 0b6df7625dca565406073ec4ffb0d63fc080a992..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-URI.HostBlacklist
-TYPE: list
-VERSION: 1.3.0
-DEFAULT: array()
---DESCRIPTION--
-List of strings that are forbidden in the host of any URI. Use it to kill
-domain names of spam, etc. Note that it will catch anything in the domain,
-so <tt>moo.com</tt> will catch <tt>moo.com.example.com</tt>.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
deleted file mode 100644
index 4214900a592c400030521a9cc26af9d7343da81e..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-URI.MakeAbsolute
-TYPE: bool
-VERSION: 2.1.0
-DEFAULT: false
---DESCRIPTION--
-
-<p>
-    Converts all URIs into absolute forms. This is useful when the HTML
-    being filtered assumes a specific base path, but will actually be
-    viewed in a different context (and setting an alternate base URI is
-    not possible). %URI.Base must be set for this directive to work.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
deleted file mode 100644
index 58c81dcc441625b4ea966a7dd2b04131c0542e66..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-URI.Munge
-TYPE: string/null
-VERSION: 1.3.0
-DEFAULT: NULL
---DESCRIPTION--
-
-<p>
-    Munges all browsable (usually http, https and ftp)
-    absolute URIs into another URI, usually a URI redirection service.
-    This directive accepts a URI, formatted with a <code>%s</code> where
-    the url-encoded original URI should be inserted (sample:
-    <code>http://www.google.com/url?q=%s</code>).
-</p>
-<p>
-    Uses for this directive:
-</p>
-<ul>
-    <li>
-        Prevent PageRank leaks, while being fairly transparent
-        to users (you may also want to add some client side JavaScript to
-        override the text in the statusbar). <strong>Notice</strong>:
-        Many security experts believe that this form of protection does not deter spam-bots.
-    </li>
-    <li>
-        Redirect users to a splash page telling them they are leaving your
-        website. While this is poor usability practice, it is often mandated
-        in corporate environments.
-    </li>
-</ul>
-<p>
-    Prior to HTML Purifier 3.1.1, this directive also enabled the munging
-    of browsable external resources, which could break things if your redirection
-    script was a splash page or used <code>meta</code> tags. To revert to
-    previous behavior, please use %URI.MungeResources.
-</p>
-<p>
-    You may want to also use %URI.MungeSecretKey along with this directive
-    in order to enforce what URIs your redirector script allows. Open
-    redirector scripts can be a security risk and negatively affect the
-    reputation of your domain name.
-</p>
-<p>
-    Starting with HTML Purifier 3.1.1, there is also these substitutions:
-</p>
-<table>
-    <thead>
-        <tr>
-            <th>Key</th>
-            <th>Description</th>
-            <th>Example <code>&lt;a href=""&gt;</code></th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr>
-            <td>%r</td>
-            <td>1 - The URI embeds a resource<br />(blank) - The URI is merely a link</td>
-            <td></td>
-        </tr>
-        <tr>
-            <td>%n</td>
-            <td>The name of the tag this URI came from</td>
-            <td>a</td>
-        </tr>
-        <tr>
-            <td>%m</td>
-            <td>The name of the attribute this URI came from</td>
-            <td>href</td>
-        </tr>
-        <tr>
-            <td>%p</td>
-            <td>The name of the CSS property this URI came from, or blank if irrelevant</td>
-            <td></td>
-        </tr>
-    </tbody>
-</table>
-<p>
-    Admittedly, these letters are somewhat arbitrary; the only stipulation
-    was that they couldn't be a through f. r is for resource (I would have preferred
-    e, but you take what you can get), n is for name, m
-    was picked because it came after n (and I couldn't use a), p is for
-    property.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
deleted file mode 100644
index 6fce0fdc3735655c3a8416c71f9b8f6bf24c3169..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-URI.MungeResources
-TYPE: bool
-VERSION: 3.1.1
-DEFAULT: false
---DESCRIPTION--
-<p>
-    If true, any URI munging directives like %URI.Munge
-    will also apply to embedded resources, such as <code>&lt;img src=""&gt;</code>.
-    Be careful enabling this directive if you have a redirector script
-    that does not use the <code>Location</code> HTTP header; all of your images
-    and other embedded resources will break.
-</p>
-<p>
-    <strong>Warning:</strong> It is strongly advised you use this in conjunction
-    %URI.MungeSecretKey to mitigate the security risk of an open redirector.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
deleted file mode 100644
index 0d00f62ea8a41daf20a83e2ce54170035604e200..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-URI.MungeSecretKey
-TYPE: string/null
-VERSION: 3.1.1
-DEFAULT: NULL
---DESCRIPTION--
-<p>
-    This directive enables secure checksum generation along with %URI.Munge.
-    It should be set to a secure key that is not shared with anyone else.
-    The checksum can be placed in the URI using %t. Use of this checksum
-    affords an additional level of protection by allowing a redirector
-    to check if a URI has passed through HTML Purifier with this line:
-</p>
-
-<pre>$checksum === sha1($secret_key . ':' . $url)</pre>
-
-<p>
-    If the output is TRUE, the redirector script should accept the URI.
-</p>
-
-<p>
-    Please note that it would still be possible for an attacker to procure
-    secure hashes en-mass by abusing your website's Preview feature or the
-    like, but this service affords an additional level of protection
-    that should be combined with website blacklisting.
-</p>
-
-<p>
-    Remember this has no effect if %URI.Munge is not on.
-</p>
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt b/lib/php/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
deleted file mode 100644
index 23331a4e79047ea1b0935802f34c0a92cc8df4cd..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-URI.OverrideAllowedSchemes
-TYPE: bool
-DEFAULT: true
---DESCRIPTION--
-If this is set to true (which it is by default), you can override
-%URI.AllowedSchemes by simply registering a HTMLPurifier_URIScheme to the
-registry.  If false, you will also have to update that directive in order
-to add more schemes.
---# vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ConfigSchema/schema/info.ini b/lib/php/HTMLPurifier/ConfigSchema/schema/info.ini
deleted file mode 100644
index 5de4505e1b04bcb2b35bfb9357b7b3f9ae6f7fb4..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ConfigSchema/schema/info.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-name = "HTML Purifier"
-
-; vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ContentSets.php b/lib/php/HTMLPurifier/ContentSets.php
deleted file mode 100644
index 3b6e96f5f56a8fee3e8f3bcf4e48d1be85cce14d..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ContentSets.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-/**
- * @todo Unit test
- */
-class HTMLPurifier_ContentSets
-{
-
-    /**
-     * List of content set strings (pipe seperators) indexed by name.
-     */
-    public $info = array();
-
-    /**
-     * List of content set lookups (element => true) indexed by name.
-     * @note This is in HTMLPurifier_HTMLDefinition->info_content_sets
-     */
-    public $lookup = array();
-
-    /**
-     * Synchronized list of defined content sets (keys of info)
-     */
-    protected $keys = array();
-    /**
-     * Synchronized list of defined content values (values of info)
-     */
-    protected $values = array();
-
-    /**
-     * Merges in module's content sets, expands identifiers in the content
-     * sets and populates the keys, values and lookup member variables.
-     * @param $modules List of HTMLPurifier_HTMLModule
-     */
-    public function __construct($modules) {
-        if (!is_array($modules)) $modules = array($modules);
-        // populate content_sets based on module hints
-        // sorry, no way of overloading
-        foreach ($modules as $module_i => $module) {
-            foreach ($module->content_sets as $key => $value) {
-                $temp = $this->convertToLookup($value);
-                if (isset($this->lookup[$key])) {
-                    // add it into the existing content set
-                    $this->lookup[$key] = array_merge($this->lookup[$key], $temp);
-                } else {
-                    $this->lookup[$key] = $temp;
-                }
-            }
-        }
-        $old_lookup = false;
-        while ($old_lookup !== $this->lookup) {
-            $old_lookup = $this->lookup;
-            foreach ($this->lookup as $i => $set) {
-                $add = array();
-                foreach ($set as $element => $x) {
-                    if (isset($this->lookup[$element])) {
-                        $add += $this->lookup[$element];
-                        unset($this->lookup[$i][$element]);
-                    }
-                }
-                $this->lookup[$i] += $add;
-            }
-        }
-
-        foreach ($this->lookup as $key => $lookup) {
-            $this->info[$key] = implode(' | ', array_keys($lookup));
-        }
-        $this->keys   = array_keys($this->info);
-        $this->values = array_values($this->info);
-    }
-
-    /**
-     * Accepts a definition; generates and assigns a ChildDef for it
-     * @param $def HTMLPurifier_ElementDef reference
-     * @param $module Module that defined the ElementDef
-     */
-    public function generateChildDef(&$def, $module) {
-        if (!empty($def->child)) return; // already done!
-        $content_model = $def->content_model;
-        if (is_string($content_model)) {
-            // Assume that $this->keys is alphanumeric
-            $def->content_model = preg_replace_callback(
-                '/\b(' . implode('|', $this->keys) . ')\b/',
-                array($this, 'generateChildDefCallback'),
-                $content_model
-            );
-            //$def->content_model = str_replace(
-            //    $this->keys, $this->values, $content_model);
-        }
-        $def->child = $this->getChildDef($def, $module);
-    }
-
-    public function generateChildDefCallback($matches) {
-        return $this->info[$matches[0]];
-    }
-
-    /**
-     * Instantiates a ChildDef based on content_model and content_model_type
-     * member variables in HTMLPurifier_ElementDef
-     * @note This will also defer to modules for custom HTMLPurifier_ChildDef
-     *       subclasses that need content set expansion
-     * @param $def HTMLPurifier_ElementDef to have ChildDef extracted
-     * @return HTMLPurifier_ChildDef corresponding to ElementDef
-     */
-    public function getChildDef($def, $module) {
-        $value = $def->content_model;
-        if (is_object($value)) {
-            trigger_error(
-                'Literal object child definitions should be stored in '.
-                'ElementDef->child not ElementDef->content_model',
-                E_USER_NOTICE
-            );
-            return $value;
-        }
-        switch ($def->content_model_type) {
-            case 'required':
-                return new HTMLPurifier_ChildDef_Required($value);
-            case 'optional':
-                return new HTMLPurifier_ChildDef_Optional($value);
-            case 'empty':
-                return new HTMLPurifier_ChildDef_Empty();
-            case 'custom':
-                return new HTMLPurifier_ChildDef_Custom($value);
-        }
-        // defer to its module
-        $return = false;
-        if ($module->defines_child_def) { // save a func call
-            $return = $module->getChildDef($def);
-        }
-        if ($return !== false) return $return;
-        // error-out
-        trigger_error(
-            'Could not determine which ChildDef class to instantiate',
-            E_USER_ERROR
-        );
-        return false;
-    }
-
-    /**
-     * Converts a string list of elements separated by pipes into
-     * a lookup array.
-     * @param $string List of elements
-     * @return Lookup array of elements
-     */
-    protected function convertToLookup($string) {
-        $array = explode('|', str_replace(' ', '', $string));
-        $ret = array();
-        foreach ($array as $i => $k) {
-            $ret[$k] = true;
-        }
-        return $ret;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Context.php b/lib/php/HTMLPurifier/Context.php
deleted file mode 100644
index 9ddf0c5476a186d9bb694dee319e674f79ad868c..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Context.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * Registry object that contains information about the current context.
- * @warning Is a bit buggy when variables are set to null: it thinks
- *          they don't exist! So use false instead, please.
- * @note Since the variables Context deals with may not be objects,
- *       references are very important here! Do not remove!
- */
-class HTMLPurifier_Context
-{
-
-    /**
-     * Private array that stores the references.
-     */
-    private $_storage = array();
-
-    /**
-     * Registers a variable into the context.
-     * @param $name String name
-     * @param $ref Reference to variable to be registered
-     */
-    public function register($name, &$ref) {
-        if (isset($this->_storage[$name])) {
-            trigger_error("Name $name produces collision, cannot re-register",
-                          E_USER_ERROR);
-            return;
-        }
-        $this->_storage[$name] =& $ref;
-    }
-
-    /**
-     * Retrieves a variable reference from the context.
-     * @param $name String name
-     * @param $ignore_error Boolean whether or not to ignore error
-     */
-    public function &get($name, $ignore_error = false) {
-        if (!isset($this->_storage[$name])) {
-            if (!$ignore_error) {
-                trigger_error("Attempted to retrieve non-existent variable $name",
-                              E_USER_ERROR);
-            }
-            $var = null; // so we can return by reference
-            return $var;
-        }
-        return $this->_storage[$name];
-    }
-
-    /**
-     * Destorys a variable in the context.
-     * @param $name String name
-     */
-    public function destroy($name) {
-        if (!isset($this->_storage[$name])) {
-            trigger_error("Attempted to destroy non-existent variable $name",
-                          E_USER_ERROR);
-            return;
-        }
-        unset($this->_storage[$name]);
-    }
-
-    /**
-     * Checks whether or not the variable exists.
-     * @param $name String name
-     */
-    public function exists($name) {
-        return isset($this->_storage[$name]);
-    }
-
-    /**
-     * Loads a series of variables from an associative array
-     * @param $context_array Assoc array of variables to load
-     */
-    public function loadArray($context_array) {
-        foreach ($context_array as $key => $discard) {
-            $this->register($key, $context_array[$key]);
-        }
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Definition.php b/lib/php/HTMLPurifier/Definition.php
deleted file mode 100644
index a7408c97498eabfa586ca762f82ae102ae88a7c7..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Definition.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Super-class for definition datatype objects, implements serialization
- * functions for the class.
- */
-abstract class HTMLPurifier_Definition
-{
-
-    /**
-     * Has setup() been called yet?
-     */
-    public $setup = false;
-
-    /**
-     * What type of definition is it?
-     */
-    public $type;
-
-    /**
-     * Sets up the definition object into the final form, something
-     * not done by the constructor
-     * @param $config HTMLPurifier_Config instance
-     */
-    abstract protected function doSetup($config);
-
-    /**
-     * Setup function that aborts if already setup
-     * @param $config HTMLPurifier_Config instance
-     */
-    public function setup($config) {
-        if ($this->setup) return;
-        $this->setup = true;
-        $this->doSetup($config);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/DefinitionCache.php b/lib/php/HTMLPurifier/DefinitionCache.php
deleted file mode 100644
index c6e1e388c6513251112fcb4d911d14983298f79b..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/DefinitionCache.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-/**
- * Abstract class representing Definition cache managers that implements
- * useful common methods and is a factory.
- * @todo Create a separate maintenance file advanced users can use to
- *       cache their custom HTMLDefinition, which can be loaded
- *       via a configuration directive
- * @todo Implement memcached
- */
-abstract class HTMLPurifier_DefinitionCache
-{
-
-    public $type;
-
-    /**
-     * @param $name Type of definition objects this instance of the
-     *      cache will handle.
-     */
-    public function __construct($type) {
-        $this->type = $type;
-    }
-
-    /**
-     * Generates a unique identifier for a particular configuration
-     * @param Instance of HTMLPurifier_Config
-     */
-    public function generateKey($config) {
-        return $config->version . ',' . // possibly replace with function calls
-               $config->getBatchSerial($this->type) . ',' .
-               $config->get($this->type . '.DefinitionRev');
-    }
-
-    /**
-     * Tests whether or not a key is old with respect to the configuration's
-     * version and revision number.
-     * @param $key Key to test
-     * @param $config Instance of HTMLPurifier_Config to test against
-     */
-    public function isOld($key, $config) {
-        if (substr_count($key, ',') < 2) return true;
-        list($version, $hash, $revision) = explode(',', $key, 3);
-        $compare = version_compare($version, $config->version);
-        // version mismatch, is always old
-        if ($compare != 0) return true;
-        // versions match, ids match, check revision number
-        if (
-            $hash == $config->getBatchSerial($this->type) &&
-            $revision < $config->get($this->type . '.DefinitionRev')
-        ) return true;
-        return false;
-    }
-
-    /**
-     * Checks if a definition's type jives with the cache's type
-     * @note Throws an error on failure
-     * @param $def Definition object to check
-     * @return Boolean true if good, false if not
-     */
-    public function checkDefType($def) {
-        if ($def->type !== $this->type) {
-            trigger_error("Cannot use definition of type {$def->type} in cache for {$this->type}");
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Adds a definition object to the cache
-     */
-    abstract public function add($def, $config);
-
-    /**
-     * Unconditionally saves a definition object to the cache
-     */
-    abstract public function set($def, $config);
-
-    /**
-     * Replace an object in the cache
-     */
-    abstract public function replace($def, $config);
-
-    /**
-     * Retrieves a definition object from the cache
-     */
-    abstract public function get($config);
-
-    /**
-     * Removes a definition object to the cache
-     */
-    abstract public function remove($config);
-
-    /**
-     * Clears all objects from cache
-     */
-    abstract public function flush($config);
-
-    /**
-     * Clears all expired (older version or revision) objects from cache
-     * @note Be carefuly implementing this method as flush. Flush must
-     *       not interfere with other Definition types, and cleanup()
-     *       should not be repeatedly called by userland code.
-     */
-    abstract public function cleanup($config);
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/DefinitionCache/Decorator.php b/lib/php/HTMLPurifier/DefinitionCache/Decorator.php
deleted file mode 100644
index b0fb6d0cd67a21d6720fb13d3aca3c7aab64ca7f..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/DefinitionCache/Decorator.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-class HTMLPurifier_DefinitionCache_Decorator extends HTMLPurifier_DefinitionCache
-{
-
-    /**
-     * Cache object we are decorating
-     */
-    public $cache;
-
-    public function __construct() {}
-
-    /**
-     * Lazy decorator function
-     * @param $cache Reference to cache object to decorate
-     */
-    public function decorate(&$cache) {
-        $decorator = $this->copy();
-        // reference is necessary for mocks in PHP 4
-        $decorator->cache =& $cache;
-        $decorator->type  = $cache->type;
-        return $decorator;
-    }
-
-    /**
-     * Cross-compatible clone substitute
-     */
-    public function copy() {
-        return new HTMLPurifier_DefinitionCache_Decorator();
-    }
-
-    public function add($def, $config) {
-        return $this->cache->add($def, $config);
-    }
-
-    public function set($def, $config) {
-        return $this->cache->set($def, $config);
-    }
-
-    public function replace($def, $config) {
-        return $this->cache->replace($def, $config);
-    }
-
-    public function get($config) {
-        return $this->cache->get($config);
-    }
-
-    public function remove($config) {
-        return $this->cache->remove($config);
-    }
-
-    public function flush($config) {
-        return $this->cache->flush($config);
-    }
-
-    public function cleanup($config) {
-        return $this->cache->cleanup($config);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php b/lib/php/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
deleted file mode 100644
index d4cc35c4bc1cd7e16a94742f03b72b1586c16532..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Definition cache decorator class that cleans up the cache
- * whenever there is a cache miss.
- */
-class HTMLPurifier_DefinitionCache_Decorator_Cleanup extends
-      HTMLPurifier_DefinitionCache_Decorator
-{
-
-    public $name = 'Cleanup';
-
-    public function copy() {
-        return new HTMLPurifier_DefinitionCache_Decorator_Cleanup();
-    }
-
-    public function add($def, $config) {
-        $status = parent::add($def, $config);
-        if (!$status) parent::cleanup($config);
-        return $status;
-    }
-
-    public function set($def, $config) {
-        $status = parent::set($def, $config);
-        if (!$status) parent::cleanup($config);
-        return $status;
-    }
-
-    public function replace($def, $config) {
-        $status = parent::replace($def, $config);
-        if (!$status) parent::cleanup($config);
-        return $status;
-    }
-
-    public function get($config) {
-        $ret = parent::get($config);
-        if (!$ret) parent::cleanup($config);
-        return $ret;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/DefinitionCache/Decorator/Memory.php b/lib/php/HTMLPurifier/DefinitionCache/Decorator/Memory.php
deleted file mode 100644
index 18f16d32b6698eed50dbe0d8d3ee81d05ad7c724..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/DefinitionCache/Decorator/Memory.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * Definition cache decorator class that saves all cache retrievals
- * to PHP's memory; good for unit tests or circumstances where
- * there are lots of configuration objects floating around.
- */
-class HTMLPurifier_DefinitionCache_Decorator_Memory extends
-      HTMLPurifier_DefinitionCache_Decorator
-{
-
-    protected $definitions;
-    public $name = 'Memory';
-
-    public function copy() {
-        return new HTMLPurifier_DefinitionCache_Decorator_Memory();
-    }
-
-    public function add($def, $config) {
-        $status = parent::add($def, $config);
-        if ($status) $this->definitions[$this->generateKey($config)] = $def;
-        return $status;
-    }
-
-    public function set($def, $config) {
-        $status = parent::set($def, $config);
-        if ($status) $this->definitions[$this->generateKey($config)] = $def;
-        return $status;
-    }
-
-    public function replace($def, $config) {
-        $status = parent::replace($def, $config);
-        if ($status) $this->definitions[$this->generateKey($config)] = $def;
-        return $status;
-    }
-
-    public function get($config) {
-        $key = $this->generateKey($config);
-        if (isset($this->definitions[$key])) return $this->definitions[$key];
-        $this->definitions[$key] = parent::get($config);
-        return $this->definitions[$key];
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/DefinitionCache/Decorator/Template.php.in b/lib/php/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
deleted file mode 100644
index 21a8fcfda2415808ba432ce7fa14041286198ada..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/DefinitionCache/Decorator/Template.php.in
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-require_once 'HTMLPurifier/DefinitionCache/Decorator.php';
-
-/**
- * Definition cache decorator template.
- */
-class HTMLPurifier_DefinitionCache_Decorator_Template extends
-      HTMLPurifier_DefinitionCache_Decorator
-{
-
-    var $name = 'Template'; // replace this
-
-    function copy() {
-        // replace class name with yours
-        return new HTMLPurifier_DefinitionCache_Decorator_Template();
-    }
-
-    // remove methods you don't need
-
-    function add($def, $config) {
-        return parent::add($def, $config);
-    }
-
-    function set($def, $config) {
-        return parent::set($def, $config);
-    }
-
-    function replace($def, $config) {
-        return parent::replace($def, $config);
-    }
-
-    function get($config) {
-        return parent::get($config);
-    }
-
-    function flush() {
-        return parent::flush();
-    }
-
-    function cleanup($config) {
-        return parent::cleanup($config);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/DefinitionCache/Null.php b/lib/php/HTMLPurifier/DefinitionCache/Null.php
deleted file mode 100644
index 41d97e734fe068e466c7bfffbc79e95791ba9171..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/DefinitionCache/Null.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Null cache object to use when no caching is on.
- */
-class HTMLPurifier_DefinitionCache_Null extends HTMLPurifier_DefinitionCache
-{
-
-    public function add($def, $config) {
-        return false;
-    }
-
-    public function set($def, $config) {
-        return false;
-    }
-
-    public function replace($def, $config) {
-        return false;
-    }
-
-    public function remove($config) {
-        return false;
-    }
-
-    public function get($config) {
-        return false;
-    }
-
-    public function flush($config) {
-        return false;
-    }
-
-    public function cleanup($config) {
-        return false;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/DefinitionCache/Serializer.php b/lib/php/HTMLPurifier/DefinitionCache/Serializer.php
deleted file mode 100644
index 7a6aa93f0290bec0ac18771b60e6a66fcb48ac46..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/DefinitionCache/Serializer.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-
-class HTMLPurifier_DefinitionCache_Serializer extends
-      HTMLPurifier_DefinitionCache
-{
-
-    public function add($def, $config) {
-        if (!$this->checkDefType($def)) return;
-        $file = $this->generateFilePath($config);
-        if (file_exists($file)) return false;
-        if (!$this->_prepareDir($config)) return false;
-        return $this->_write($file, serialize($def));
-    }
-
-    public function set($def, $config) {
-        if (!$this->checkDefType($def)) return;
-        $file = $this->generateFilePath($config);
-        if (!$this->_prepareDir($config)) return false;
-        return $this->_write($file, serialize($def));
-    }
-
-    public function replace($def, $config) {
-        if (!$this->checkDefType($def)) return;
-        $file = $this->generateFilePath($config);
-        if (!file_exists($file)) return false;
-        if (!$this->_prepareDir($config)) return false;
-        return $this->_write($file, serialize($def));
-    }
-
-    public function get($config) {
-        $file = $this->generateFilePath($config);
-        if (!file_exists($file)) return false;
-        return unserialize(file_get_contents($file));
-    }
-
-    public function remove($config) {
-        $file = $this->generateFilePath($config);
-        if (!file_exists($file)) return false;
-        return unlink($file);
-    }
-
-    public function flush($config) {
-        if (!$this->_prepareDir($config)) return false;
-        $dir = $this->generateDirectoryPath($config);
-        $dh  = opendir($dir);
-        while (false !== ($filename = readdir($dh))) {
-            if (empty($filename)) continue;
-            if ($filename[0] === '.') continue;
-            unlink($dir . '/' . $filename);
-        }
-    }
-
-    public function cleanup($config) {
-        if (!$this->_prepareDir($config)) return false;
-        $dir = $this->generateDirectoryPath($config);
-        $dh  = opendir($dir);
-        while (false !== ($filename = readdir($dh))) {
-            if (empty($filename)) continue;
-            if ($filename[0] === '.') continue;
-            $key = substr($filename, 0, strlen($filename) - 4);
-            if ($this->isOld($key, $config)) unlink($dir . '/' . $filename);
-        }
-    }
-
-    /**
-     * Generates the file path to the serial file corresponding to
-     * the configuration and definition name
-     * @todo Make protected
-     */
-    public function generateFilePath($config) {
-        $key = $this->generateKey($config);
-        return $this->generateDirectoryPath($config) . '/' . $key . '.ser';
-    }
-
-    /**
-     * Generates the path to the directory contain this cache's serial files
-     * @note No trailing slash
-     * @todo Make protected
-     */
-    public function generateDirectoryPath($config) {
-        $base = $this->generateBaseDirectoryPath($config);
-        return $base . '/' . $this->type;
-    }
-
-    /**
-     * Generates path to base directory that contains all definition type
-     * serials
-     * @todo Make protected
-     */
-    public function generateBaseDirectoryPath($config) {
-        $base = $config->get('Cache.SerializerPath');
-        $base = is_null($base) ? HTMLPURIFIER_PREFIX . '/HTMLPurifier/DefinitionCache/Serializer' : $base;
-        return $base;
-    }
-
-    /**
-     * Convenience wrapper function for file_put_contents
-     * @param $file File name to write to
-     * @param $data Data to write into file
-     * @return Number of bytes written if success, or false if failure.
-     */
-    private function _write($file, $data) {
-        return file_put_contents($file, $data);
-    }
-
-    /**
-     * Prepares the directory that this type stores the serials in
-     * @return True if successful
-     */
-    private function _prepareDir($config) {
-        $directory = $this->generateDirectoryPath($config);
-        if (!is_dir($directory)) {
-            $base = $this->generateBaseDirectoryPath($config);
-            if (!is_dir($base)) {
-                trigger_error('Base directory '.$base.' does not exist,
-                    please create or change using %Cache.SerializerPath',
-                    E_USER_WARNING);
-                return false;
-            } elseif (!$this->_testPermissions($base)) {
-                return false;
-            }
-            $old = umask(0022); // disable group and world writes
-            mkdir($directory);
-            umask($old);
-        } elseif (!$this->_testPermissions($directory)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Tests permissions on a directory and throws out friendly
-     * error messages and attempts to chmod it itself if possible
-     */
-    private function _testPermissions($dir) {
-        // early abort, if it is writable, everything is hunky-dory
-        if (is_writable($dir)) return true;
-        if (!is_dir($dir)) {
-            // generally, you'll want to handle this beforehand
-            // so a more specific error message can be given
-            trigger_error('Directory '.$dir.' does not exist',
-                E_USER_WARNING);
-            return false;
-        }
-        if (function_exists('posix_getuid')) {
-            // POSIX system, we can give more specific advice
-            if (fileowner($dir) === posix_getuid()) {
-                // we can chmod it ourselves
-                chmod($dir, 0755);
-                return true;
-            } elseif (filegroup($dir) === posix_getgid()) {
-                $chmod = '775';
-            } else {
-                // PHP's probably running as nobody, so we'll
-                // need to give global permissions
-                $chmod = '777';
-            }
-            trigger_error('Directory '.$dir.' not writable, '.
-                'please chmod to ' . $chmod,
-                E_USER_WARNING);
-        } else {
-            // generic error message
-            trigger_error('Directory '.$dir.' not writable, '.
-                'please alter file permissions',
-                E_USER_WARNING);
-        }
-        return false;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/DefinitionCache/Serializer/README b/lib/php/HTMLPurifier/DefinitionCache/Serializer/README
deleted file mode 100644
index 2e35c1c3d06445db25e61ca9c64845728d023f7f..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/DefinitionCache/Serializer/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a dummy file to prevent Git from ignoring this empty directory.
-
-    vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/DefinitionCacheFactory.php b/lib/php/HTMLPurifier/DefinitionCacheFactory.php
deleted file mode 100644
index a6ead62818754b90c0c3aca45cbf9f4cae5e0f86..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/DefinitionCacheFactory.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/**
- * Responsible for creating definition caches.
- */
-class HTMLPurifier_DefinitionCacheFactory
-{
-
-    protected $caches = array('Serializer' => array());
-    protected $implementations = array();
-    protected $decorators = array();
-
-    /**
-     * Initialize default decorators
-     */
-    public function setup() {
-        $this->addDecorator('Cleanup');
-    }
-
-    /**
-     * Retrieves an instance of global definition cache factory.
-     */
-    public static function instance($prototype = null) {
-        static $instance;
-        if ($prototype !== null) {
-            $instance = $prototype;
-        } elseif ($instance === null || $prototype === true) {
-            $instance = new HTMLPurifier_DefinitionCacheFactory();
-            $instance->setup();
-        }
-        return $instance;
-    }
-
-    /**
-     * Registers a new definition cache object
-     * @param $short Short name of cache object, for reference
-     * @param $long Full class name of cache object, for construction
-     */
-    public function register($short, $long) {
-        $this->implementations[$short] = $long;
-    }
-
-    /**
-     * Factory method that creates a cache object based on configuration
-     * @param $name Name of definitions handled by cache
-     * @param $config Instance of HTMLPurifier_Config
-     */
-    public function create($type, $config) {
-        $method = $config->get('Cache.DefinitionImpl');
-        if ($method === null) {
-            return new HTMLPurifier_DefinitionCache_Null($type);
-        }
-        if (!empty($this->caches[$method][$type])) {
-            return $this->caches[$method][$type];
-        }
-        if (
-          isset($this->implementations[$method]) &&
-          class_exists($class = $this->implementations[$method], false)
-        ) {
-            $cache = new $class($type);
-        } else {
-            if ($method != 'Serializer') {
-                trigger_error("Unrecognized DefinitionCache $method, using Serializer instead", E_USER_WARNING);
-            }
-            $cache = new HTMLPurifier_DefinitionCache_Serializer($type);
-        }
-        foreach ($this->decorators as $decorator) {
-            $new_cache = $decorator->decorate($cache);
-            // prevent infinite recursion in PHP 4
-            unset($cache);
-            $cache = $new_cache;
-        }
-        $this->caches[$method][$type] = $cache;
-        return $this->caches[$method][$type];
-    }
-
-    /**
-     * Registers a decorator to add to all new cache objects
-     * @param
-     */
-    public function addDecorator($decorator) {
-        if (is_string($decorator)) {
-            $class = "HTMLPurifier_DefinitionCache_Decorator_$decorator";
-            $decorator = new $class;
-        }
-        $this->decorators[$decorator->name] = $decorator;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Doctype.php b/lib/php/HTMLPurifier/Doctype.php
deleted file mode 100644
index 1e3c574c065279b2338a1add7e303e90e3affd20..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Doctype.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Represents a document type, contains information on which modules
- * need to be loaded.
- * @note This class is inspected by Printer_HTMLDefinition->renderDoctype.
- *       If structure changes, please update that function.
- */
-class HTMLPurifier_Doctype
-{
-    /**
-     * Full name of doctype
-     */
-    public $name;
-
-    /**
-     * List of standard modules (string identifiers or literal objects)
-     * that this doctype uses
-     */
-    public $modules = array();
-
-    /**
-     * List of modules to use for tidying up code
-     */
-    public $tidyModules = array();
-
-    /**
-     * Is the language derived from XML (i.e. XHTML)?
-     */
-    public $xml = true;
-
-    /**
-     * List of aliases for this doctype
-     */
-    public $aliases = array();
-
-    /**
-     * Public DTD identifier
-     */
-    public $dtdPublic;
-
-    /**
-     * System DTD identifier
-     */
-    public $dtdSystem;
-
-    public function __construct($name = null, $xml = true, $modules = array(),
-        $tidyModules = array(), $aliases = array(), $dtd_public = null, $dtd_system = null
-    ) {
-        $this->name         = $name;
-        $this->xml          = $xml;
-        $this->modules      = $modules;
-        $this->tidyModules  = $tidyModules;
-        $this->aliases      = $aliases;
-        $this->dtdPublic    = $dtd_public;
-        $this->dtdSystem    = $dtd_system;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/DoctypeRegistry.php b/lib/php/HTMLPurifier/DoctypeRegistry.php
deleted file mode 100644
index 86049e9391bf5ce11ae708034b1b1ad0bd1d03cd..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/DoctypeRegistry.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-class HTMLPurifier_DoctypeRegistry
-{
-
-    /**
-     * Hash of doctype names to doctype objects
-     */
-    protected $doctypes;
-
-    /**
-     * Lookup table of aliases to real doctype names
-     */
-    protected $aliases;
-
-    /**
-     * Registers a doctype to the registry
-     * @note Accepts a fully-formed doctype object, or the
-     *       parameters for constructing a doctype object
-     * @param $doctype Name of doctype or literal doctype object
-     * @param $modules Modules doctype will load
-     * @param $modules_for_modes Modules doctype will load for certain modes
-     * @param $aliases Alias names for doctype
-     * @return Editable registered doctype
-     */
-    public function register($doctype, $xml = true, $modules = array(),
-        $tidy_modules = array(), $aliases = array(), $dtd_public = null, $dtd_system = null
-    ) {
-        if (!is_array($modules)) $modules = array($modules);
-        if (!is_array($tidy_modules)) $tidy_modules = array($tidy_modules);
-        if (!is_array($aliases)) $aliases = array($aliases);
-        if (!is_object($doctype)) {
-            $doctype = new HTMLPurifier_Doctype(
-                $doctype, $xml, $modules, $tidy_modules, $aliases, $dtd_public, $dtd_system
-            );
-        }
-        $this->doctypes[$doctype->name] = $doctype;
-        $name = $doctype->name;
-        // hookup aliases
-        foreach ($doctype->aliases as $alias) {
-            if (isset($this->doctypes[$alias])) continue;
-            $this->aliases[$alias] = $name;
-        }
-        // remove old aliases
-        if (isset($this->aliases[$name])) unset($this->aliases[$name]);
-        return $doctype;
-    }
-
-    /**
-     * Retrieves reference to a doctype of a certain name
-     * @note This function resolves aliases
-     * @note When possible, use the more fully-featured make()
-     * @param $doctype Name of doctype
-     * @return Editable doctype object
-     */
-    public function get($doctype) {
-        if (isset($this->aliases[$doctype])) $doctype = $this->aliases[$doctype];
-        if (!isset($this->doctypes[$doctype])) {
-            trigger_error('Doctype ' . htmlspecialchars($doctype) . ' does not exist', E_USER_ERROR);
-            $anon = new HTMLPurifier_Doctype($doctype);
-            return $anon;
-        }
-        return $this->doctypes[$doctype];
-    }
-
-    /**
-     * Creates a doctype based on a configuration object,
-     * will perform initialization on the doctype
-     * @note Use this function to get a copy of doctype that config
-     *       can hold on to (this is necessary in order to tell
-     *       Generator whether or not the current document is XML
-     *       based or not).
-     */
-    public function make($config) {
-        return clone $this->get($this->getDoctypeFromConfig($config));
-    }
-
-    /**
-     * Retrieves the doctype from the configuration object
-     */
-    public function getDoctypeFromConfig($config) {
-        // recommended test
-        $doctype = $config->get('HTML.Doctype');
-        if (!empty($doctype)) return $doctype;
-        $doctype = $config->get('HTML.CustomDoctype');
-        if (!empty($doctype)) return $doctype;
-        // backwards-compatibility
-        if ($config->get('HTML.XHTML')) {
-            $doctype = 'XHTML 1.0';
-        } else {
-            $doctype = 'HTML 4.01';
-        }
-        if ($config->get('HTML.Strict')) {
-            $doctype .= ' Strict';
-        } else {
-            $doctype .= ' Transitional';
-        }
-        return $doctype;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ElementDef.php b/lib/php/HTMLPurifier/ElementDef.php
deleted file mode 100644
index aede2c3bb49b25af997901918600751415bc03cd..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ElementDef.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-/**
- * Structure that stores an HTML element definition. Used by
- * HTMLPurifier_HTMLDefinition and HTMLPurifier_HTMLModule.
- * @note This class is inspected by HTMLPurifier_Printer_HTMLDefinition.
- *       Please update that class too.
- * @warning If you add new properties to this class, you MUST update
- *          the mergeIn() method.
- */
-class HTMLPurifier_ElementDef
-{
-
-    /**
-     * Does the definition work by itself, or is it created solely
-     * for the purpose of merging into another definition?
-     */
-    public $standalone = true;
-
-    /**
-     * Associative array of attribute name to HTMLPurifier_AttrDef
-     * @note Before being processed by HTMLPurifier_AttrCollections
-     *       when modules are finalized during
-     *       HTMLPurifier_HTMLDefinition->setup(), this array may also
-     *       contain an array at index 0 that indicates which attribute
-     *       collections to load into the full array. It may also
-     *       contain string indentifiers in lieu of HTMLPurifier_AttrDef,
-     *       see HTMLPurifier_AttrTypes on how they are expanded during
-     *       HTMLPurifier_HTMLDefinition->setup() processing.
-     */
-    public $attr = array();
-
-    /**
-     * Indexed list of tag's HTMLPurifier_AttrTransform to be done before validation
-     */
-    public $attr_transform_pre = array();
-
-    /**
-     * Indexed list of tag's HTMLPurifier_AttrTransform to be done after validation
-     */
-    public $attr_transform_post = array();
-
-    /**
-     * HTMLPurifier_ChildDef of this tag.
-     */
-    public $child;
-
-    /**
-     * Abstract string representation of internal ChildDef rules. See
-     * HTMLPurifier_ContentSets for how this is parsed and then transformed
-     * into an HTMLPurifier_ChildDef.
-     * @warning This is a temporary variable that is not available after
-     *      being processed by HTMLDefinition
-     */
-    public $content_model;
-
-    /**
-     * Value of $child->type, used to determine which ChildDef to use,
-     * used in combination with $content_model.
-     * @warning This must be lowercase
-     * @warning This is a temporary variable that is not available after
-     *      being processed by HTMLDefinition
-     */
-    public $content_model_type;
-
-
-
-    /**
-     * Does the element have a content model (#PCDATA | Inline)*? This
-     * is important for chameleon ins and del processing in
-     * HTMLPurifier_ChildDef_Chameleon. Dynamically set: modules don't
-     * have to worry about this one.
-     */
-    public $descendants_are_inline = false;
-
-    /**
-     * List of the names of required attributes this element has. Dynamically
-     * populated by HTMLPurifier_HTMLDefinition::getElement
-     */
-    public $required_attr = array();
-
-    /**
-     * Lookup table of tags excluded from all descendants of this tag.
-     * @note SGML permits exclusions for all descendants, but this is
-     *       not possible with DTDs or XML Schemas. W3C has elected to
-     *       use complicated compositions of content_models to simulate
-     *       exclusion for children, but we go the simpler, SGML-style
-     *       route of flat-out exclusions, which correctly apply to
-     *       all descendants and not just children. Note that the XHTML
-     *       Modularization Abstract Modules are blithely unaware of such
-     *       distinctions.
-     */
-    public $excludes = array();
-
-    /**
-     * This tag is explicitly auto-closed by the following tags.
-     */
-    public $autoclose = array();
-
-    /**
-     * Whether or not this is a formatting element affected by the
-     * "Active Formatting Elements" algorithm.
-     */
-    public $formatting;
-
-    /**
-     * Low-level factory constructor for creating new standalone element defs
-     */
-    public static function create($content_model, $content_model_type, $attr) {
-        $def = new HTMLPurifier_ElementDef();
-        $def->content_model = $content_model;
-        $def->content_model_type = $content_model_type;
-        $def->attr = $attr;
-        return $def;
-    }
-
-    /**
-     * Merges the values of another element definition into this one.
-     * Values from the new element def take precedence if a value is
-     * not mergeable.
-     */
-    public function mergeIn($def) {
-
-        // later keys takes precedence
-        foreach($def->attr as $k => $v) {
-            if ($k === 0) {
-                // merge in the includes
-                // sorry, no way to override an include
-                foreach ($v as $v2) {
-                    $this->attr[0][] = $v2;
-                }
-                continue;
-            }
-            if ($v === false) {
-                if (isset($this->attr[$k])) unset($this->attr[$k]);
-                continue;
-            }
-            $this->attr[$k] = $v;
-        }
-        $this->_mergeAssocArray($this->attr_transform_pre, $def->attr_transform_pre);
-        $this->_mergeAssocArray($this->attr_transform_post, $def->attr_transform_post);
-        $this->_mergeAssocArray($this->excludes, $def->excludes);
-
-        if(!empty($def->content_model)) {
-            $this->content_model =
-                str_replace("#SUPER", $this->content_model, $def->content_model);
-            $this->child = false;
-        }
-        if(!empty($def->content_model_type)) {
-            $this->content_model_type = $def->content_model_type;
-            $this->child = false;
-        }
-        if(!is_null($def->child)) $this->child = $def->child;
-        if(!is_null($def->formatting)) $this->formatting = $def->formatting;
-        if($def->descendants_are_inline) $this->descendants_are_inline = $def->descendants_are_inline;
-
-    }
-
-    /**
-     * Merges one array into another, removes values which equal false
-     * @param $a1 Array by reference that is merged into
-     * @param $a2 Array that merges into $a1
-     */
-    private function _mergeAssocArray(&$a1, $a2) {
-        foreach ($a2 as $k => $v) {
-            if ($v === false) {
-                if (isset($a1[$k])) unset($a1[$k]);
-                continue;
-            }
-            $a1[$k] = $v;
-        }
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Encoder.php b/lib/php/HTMLPurifier/Encoder.php
deleted file mode 100644
index 2b3140caaf575a15c22550b864839c50c0d6b439..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Encoder.php
+++ /dev/null
@@ -1,426 +0,0 @@
-<?php
-
-/**
- * A UTF-8 specific character encoder that handles cleaning and transforming.
- * @note All functions in this class should be static.
- */
-class HTMLPurifier_Encoder
-{
-
-    /**
-     * Constructor throws fatal error if you attempt to instantiate class
-     */
-    private function __construct() {
-        trigger_error('Cannot instantiate encoder, call methods statically', E_USER_ERROR);
-    }
-
-    /**
-     * Error-handler that mutes errors, alternative to shut-up operator.
-     */
-    public static function muteErrorHandler() {}
-
-    /**
-     * Cleans a UTF-8 string for well-formedness and SGML validity
-     *
-     * It will parse according to UTF-8 and return a valid UTF8 string, with
-     * non-SGML codepoints excluded.
-     *
-     * @note Just for reference, the non-SGML code points are 0 to 31 and
-     *       127 to 159, inclusive.  However, we allow code points 9, 10
-     *       and 13, which are the tab, line feed and carriage return
-     *       respectively. 128 and above the code points map to multibyte
-     *       UTF-8 representations.
-     *
-     * @note Fallback code adapted from utf8ToUnicode by Henri Sivonen and
-     *       hsivonen@iki.fi at <http://iki.fi/hsivonen/php-utf8/> under the
-     *       LGPL license.  Notes on what changed are inside, but in general,
-     *       the original code transformed UTF-8 text into an array of integer
-     *       Unicode codepoints. Understandably, transforming that back to
-     *       a string would be somewhat expensive, so the function was modded to
-     *       directly operate on the string.  However, this discourages code
-     *       reuse, and the logic enumerated here would be useful for any
-     *       function that needs to be able to understand UTF-8 characters.
-     *       As of right now, only smart lossless character encoding converters
-     *       would need that, and I'm probably not going to implement them.
-     *       Once again, PHP 6 should solve all our problems.
-     */
-    public static function cleanUTF8($str, $force_php = false) {
-
-        // UTF-8 validity is checked since PHP 4.3.5
-        // This is an optimization: if the string is already valid UTF-8, no
-        // need to do PHP stuff. 99% of the time, this will be the case.
-        // The regexp matches the XML char production, as well as well as excluding
-        // non-SGML codepoints U+007F to U+009F
-        if (preg_match('/^[\x{9}\x{A}\x{D}\x{20}-\x{7E}\x{A0}-\x{D7FF}\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]*$/Du', $str)) {
-            return $str;
-        }
-
-        $mState = 0; // cached expected number of octets after the current octet
-                     // until the beginning of the next UTF8 character sequence
-        $mUcs4  = 0; // cached Unicode character
-        $mBytes = 1; // cached expected number of octets in the current sequence
-
-        // original code involved an $out that was an array of Unicode
-        // codepoints.  Instead of having to convert back into UTF-8, we've
-        // decided to directly append valid UTF-8 characters onto a string
-        // $out once they're done.  $char accumulates raw bytes, while $mUcs4
-        // turns into the Unicode code point, so there's some redundancy.
-
-        $out = '';
-        $char = '';
-
-        $len = strlen($str);
-        for($i = 0; $i < $len; $i++) {
-            $in = ord($str{$i});
-            $char .= $str[$i]; // append byte to char
-            if (0 == $mState) {
-                // When mState is zero we expect either a US-ASCII character
-                // or a multi-octet sequence.
-                if (0 == (0x80 & ($in))) {
-                    // US-ASCII, pass straight through.
-                    if (($in <= 31 || $in == 127) &&
-                        !($in == 9 || $in == 13 || $in == 10) // save \r\t\n
-                    ) {
-                        // control characters, remove
-                    } else {
-                        $out .= $char;
-                    }
-                    // reset
-                    $char = '';
-                    $mBytes = 1;
-                } elseif (0xC0 == (0xE0 & ($in))) {
-                    // First octet of 2 octet sequence
-                    $mUcs4 = ($in);
-                    $mUcs4 = ($mUcs4 & 0x1F) << 6;
-                    $mState = 1;
-                    $mBytes = 2;
-                } elseif (0xE0 == (0xF0 & ($in))) {
-                    // First octet of 3 octet sequence
-                    $mUcs4 = ($in);
-                    $mUcs4 = ($mUcs4 & 0x0F) << 12;
-                    $mState = 2;
-                    $mBytes = 3;
-                } elseif (0xF0 == (0xF8 & ($in))) {
-                    // First octet of 4 octet sequence
-                    $mUcs4 = ($in);
-                    $mUcs4 = ($mUcs4 & 0x07) << 18;
-                    $mState = 3;
-                    $mBytes = 4;
-                } elseif (0xF8 == (0xFC & ($in))) {
-                    // First octet of 5 octet sequence.
-                    //
-                    // This is illegal because the encoded codepoint must be
-                    // either:
-                    // (a) not the shortest form or
-                    // (b) outside the Unicode range of 0-0x10FFFF.
-                    // Rather than trying to resynchronize, we will carry on
-                    // until the end of the sequence and let the later error
-                    // handling code catch it.
-                    $mUcs4 = ($in);
-                    $mUcs4 = ($mUcs4 & 0x03) << 24;
-                    $mState = 4;
-                    $mBytes = 5;
-                } elseif (0xFC == (0xFE & ($in))) {
-                    // First octet of 6 octet sequence, see comments for 5
-                    // octet sequence.
-                    $mUcs4 = ($in);
-                    $mUcs4 = ($mUcs4 & 1) << 30;
-                    $mState = 5;
-                    $mBytes = 6;
-                } else {
-                    // Current octet is neither in the US-ASCII range nor a
-                    // legal first octet of a multi-octet sequence.
-                    $mState = 0;
-                    $mUcs4  = 0;
-                    $mBytes = 1;
-                    $char = '';
-                }
-            } else {
-                // When mState is non-zero, we expect a continuation of the
-                // multi-octet sequence
-                if (0x80 == (0xC0 & ($in))) {
-                    // Legal continuation.
-                    $shift = ($mState - 1) * 6;
-                    $tmp = $in;
-                    $tmp = ($tmp & 0x0000003F) << $shift;
-                    $mUcs4 |= $tmp;
-
-                    if (0 == --$mState) {
-                        // End of the multi-octet sequence. mUcs4 now contains
-                        // the final Unicode codepoint to be output
-
-                        // Check for illegal sequences and codepoints.
-
-                        // From Unicode 3.1, non-shortest form is illegal
-                        if (((2 == $mBytes) && ($mUcs4 < 0x0080)) ||
-                            ((3 == $mBytes) && ($mUcs4 < 0x0800)) ||
-                            ((4 == $mBytes) && ($mUcs4 < 0x10000)) ||
-                            (4 < $mBytes) ||
-                            // From Unicode 3.2, surrogate characters = illegal
-                            (($mUcs4 & 0xFFFFF800) == 0xD800) ||
-                            // Codepoints outside the Unicode range are illegal
-                            ($mUcs4 > 0x10FFFF)
-                        ) {
-
-                        } elseif (0xFEFF != $mUcs4 && // omit BOM
-                            // check for valid Char unicode codepoints
-                            (
-                                0x9 == $mUcs4 ||
-                                0xA == $mUcs4 ||
-                                0xD == $mUcs4 ||
-                                (0x20 <= $mUcs4 && 0x7E >= $mUcs4) ||
-                                // 7F-9F is not strictly prohibited by XML,
-                                // but it is non-SGML, and thus we don't allow it
-                                (0xA0 <= $mUcs4 && 0xD7FF >= $mUcs4) ||
-                                (0x10000 <= $mUcs4 && 0x10FFFF >= $mUcs4)
-                            )
-                        ) {
-                            $out .= $char;
-                        }
-                        // initialize UTF8 cache (reset)
-                        $mState = 0;
-                        $mUcs4  = 0;
-                        $mBytes = 1;
-                        $char = '';
-                    }
-                } else {
-                    // ((0xC0 & (*in) != 0x80) && (mState != 0))
-                    // Incomplete multi-octet sequence.
-                    // used to result in complete fail, but we'll reset
-                    $mState = 0;
-                    $mUcs4  = 0;
-                    $mBytes = 1;
-                    $char ='';
-                }
-            }
-        }
-        return $out;
-    }
-
-    /**
-     * Translates a Unicode codepoint into its corresponding UTF-8 character.
-     * @note Based on Feyd's function at
-     *       <http://forums.devnetwork.net/viewtopic.php?p=191404#191404>,
-     *       which is in public domain.
-     * @note While we're going to do code point parsing anyway, a good
-     *       optimization would be to refuse to translate code points that
-     *       are non-SGML characters.  However, this could lead to duplication.
-     * @note This is very similar to the unichr function in
-     *       maintenance/generate-entity-file.php (although this is superior,
-     *       due to its sanity checks).
-     */
-
-    // +----------+----------+----------+----------+
-    // | 33222222 | 22221111 | 111111   |          |
-    // | 10987654 | 32109876 | 54321098 | 76543210 | bit
-    // +----------+----------+----------+----------+
-    // |          |          |          | 0xxxxxxx | 1 byte 0x00000000..0x0000007F
-    // |          |          | 110yyyyy | 10xxxxxx | 2 byte 0x00000080..0x000007FF
-    // |          | 1110zzzz | 10yyyyyy | 10xxxxxx | 3 byte 0x00000800..0x0000FFFF
-    // | 11110www | 10wwzzzz | 10yyyyyy | 10xxxxxx | 4 byte 0x00010000..0x0010FFFF
-    // +----------+----------+----------+----------+
-    // | 00000000 | 00011111 | 11111111 | 11111111 | Theoretical upper limit of legal scalars: 2097151 (0x001FFFFF)
-    // | 00000000 | 00010000 | 11111111 | 11111111 | Defined upper limit of legal scalar codes
-    // +----------+----------+----------+----------+
-
-    public static function unichr($code) {
-        if($code > 1114111 or $code < 0 or
-          ($code >= 55296 and $code <= 57343) ) {
-            // bits are set outside the "valid" range as defined
-            // by UNICODE 4.1.0
-            return '';
-        }
-
-        $x = $y = $z = $w = 0;
-        if ($code < 128) {
-            // regular ASCII character
-            $x = $code;
-        } else {
-            // set up bits for UTF-8
-            $x = ($code & 63) | 128;
-            if ($code < 2048) {
-                $y = (($code & 2047) >> 6) | 192;
-            } else {
-                $y = (($code & 4032) >> 6) | 128;
-                if($code < 65536) {
-                    $z = (($code >> 12) & 15) | 224;
-                } else {
-                    $z = (($code >> 12) & 63) | 128;
-                    $w = (($code >> 18) & 7)  | 240;
-                }
-            }
-        }
-        // set up the actual character
-        $ret = '';
-        if($w) $ret .= chr($w);
-        if($z) $ret .= chr($z);
-        if($y) $ret .= chr($y);
-        $ret .= chr($x);
-
-        return $ret;
-    }
-
-    /**
-     * Converts a string to UTF-8 based on configuration.
-     */
-    public static function convertToUTF8($str, $config, $context) {
-        $encoding = $config->get('Core.Encoding');
-        if ($encoding === 'utf-8') return $str;
-        static $iconv = null;
-        if ($iconv === null) $iconv = function_exists('iconv');
-        set_error_handler(array('HTMLPurifier_Encoder', 'muteErrorHandler'));
-        if ($iconv && !$config->get('Test.ForceNoIconv')) {
-            $str = iconv($encoding, 'utf-8//IGNORE', $str);
-            if ($str === false) {
-                // $encoding is not a valid encoding
-                restore_error_handler();
-                trigger_error('Invalid encoding ' . $encoding, E_USER_ERROR);
-                return '';
-            }
-            // If the string is bjorked by Shift_JIS or a similar encoding
-            // that doesn't support all of ASCII, convert the naughty
-            // characters to their true byte-wise ASCII/UTF-8 equivalents.
-            $str = strtr($str, HTMLPurifier_Encoder::testEncodingSupportsASCII($encoding));
-            restore_error_handler();
-            return $str;
-        } elseif ($encoding === 'iso-8859-1') {
-            $str = utf8_encode($str);
-            restore_error_handler();
-            return $str;
-        }
-        trigger_error('Encoding not supported, please install iconv', E_USER_ERROR);
-    }
-
-    /**
-     * Converts a string from UTF-8 based on configuration.
-     * @note Currently, this is a lossy conversion, with unexpressable
-     *       characters being omitted.
-     */
-    public static function convertFromUTF8($str, $config, $context) {
-        $encoding = $config->get('Core.Encoding');
-        if ($encoding === 'utf-8') return $str;
-        static $iconv = null;
-        if ($iconv === null) $iconv = function_exists('iconv');
-        if ($escape = $config->get('Core.EscapeNonASCIICharacters')) {
-            $str = HTMLPurifier_Encoder::convertToASCIIDumbLossless($str);
-        }
-        set_error_handler(array('HTMLPurifier_Encoder', 'muteErrorHandler'));
-        if ($iconv && !$config->get('Test.ForceNoIconv')) {
-            // Undo our previous fix in convertToUTF8, otherwise iconv will barf
-            $ascii_fix = HTMLPurifier_Encoder::testEncodingSupportsASCII($encoding);
-            if (!$escape && !empty($ascii_fix)) {
-                $clear_fix = array();
-                foreach ($ascii_fix as $utf8 => $native) $clear_fix[$utf8] = '';
-                $str = strtr($str, $clear_fix);
-            }
-            $str = strtr($str, array_flip($ascii_fix));
-            // Normal stuff
-            $str = iconv('utf-8', $encoding . '//IGNORE', $str);
-            restore_error_handler();
-            return $str;
-        } elseif ($encoding === 'iso-8859-1') {
-            $str = utf8_decode($str);
-            restore_error_handler();
-            return $str;
-        }
-        trigger_error('Encoding not supported', E_USER_ERROR);
-    }
-
-    /**
-     * Lossless (character-wise) conversion of HTML to ASCII
-     * @param $str UTF-8 string to be converted to ASCII
-     * @returns ASCII encoded string with non-ASCII character entity-ized
-     * @warning Adapted from MediaWiki, claiming fair use: this is a common
-     *       algorithm. If you disagree with this license fudgery,
-     *       implement it yourself.
-     * @note Uses decimal numeric entities since they are best supported.
-     * @note This is a DUMB function: it has no concept of keeping
-     *       character entities that the projected character encoding
-     *       can allow. We could possibly implement a smart version
-     *       but that would require it to also know which Unicode
-     *       codepoints the charset supported (not an easy task).
-     * @note Sort of with cleanUTF8() but it assumes that $str is
-     *       well-formed UTF-8
-     */
-    public static function convertToASCIIDumbLossless($str) {
-        $bytesleft = 0;
-        $result = '';
-        $working = 0;
-        $len = strlen($str);
-        for( $i = 0; $i < $len; $i++ ) {
-            $bytevalue = ord( $str[$i] );
-            if( $bytevalue <= 0x7F ) { //0xxx xxxx
-                $result .= chr( $bytevalue );
-                $bytesleft = 0;
-            } elseif( $bytevalue <= 0xBF ) { //10xx xxxx
-                $working = $working << 6;
-                $working += ($bytevalue & 0x3F);
-                $bytesleft--;
-                if( $bytesleft <= 0 ) {
-                    $result .= "&#" . $working . ";";
-                }
-            } elseif( $bytevalue <= 0xDF ) { //110x xxxx
-                $working = $bytevalue & 0x1F;
-                $bytesleft = 1;
-            } elseif( $bytevalue <= 0xEF ) { //1110 xxxx
-                $working = $bytevalue & 0x0F;
-                $bytesleft = 2;
-            } else { //1111 0xxx
-                $working = $bytevalue & 0x07;
-                $bytesleft = 3;
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * This expensive function tests whether or not a given character
-     * encoding supports ASCII. 7/8-bit encodings like Shift_JIS will
-     * fail this test, and require special processing. Variable width
-     * encodings shouldn't ever fail.
-     *
-     * @param string $encoding Encoding name to test, as per iconv format
-     * @param bool $bypass Whether or not to bypass the precompiled arrays.
-     * @return Array of UTF-8 characters to their corresponding ASCII,
-     *      which can be used to "undo" any overzealous iconv action.
-     */
-    public static function testEncodingSupportsASCII($encoding, $bypass = false) {
-        static $encodings = array();
-        if (!$bypass) {
-            if (isset($encodings[$encoding])) return $encodings[$encoding];
-            $lenc = strtolower($encoding);
-            switch ($lenc) {
-                case 'shift_jis':
-                    return array("\xC2\xA5" => '\\', "\xE2\x80\xBE" => '~');
-                case 'johab':
-                    return array("\xE2\x82\xA9" => '\\');
-            }
-            if (strpos($lenc, 'iso-8859-') === 0) return array();
-        }
-        $ret = array();
-        set_error_handler(array('HTMLPurifier_Encoder', 'muteErrorHandler'));
-        if (iconv('UTF-8', $encoding, 'a') === false) return false;
-        for ($i = 0x20; $i <= 0x7E; $i++) { // all printable ASCII chars
-            $c = chr($i); // UTF-8 char
-            $r = iconv('UTF-8', "$encoding//IGNORE", $c); // initial conversion
-            if (
-                $r === '' ||
-                // This line is needed for iconv implementations that do not
-                // omit characters that do not exist in the target character set
-                ($r === $c && iconv($encoding, 'UTF-8//IGNORE', $r) !== $c)
-            ) {
-                // Reverse engineer: what's the UTF-8 equiv of this byte
-                // sequence? This assumes that there's no variable width
-                // encoding that doesn't support ASCII.
-                $ret[iconv($encoding, 'UTF-8//IGNORE', $c)] = $c;
-            }
-        }
-        restore_error_handler();
-        $encodings[$encoding] = $ret;
-        return $ret;
-    }
-
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/EntityLookup.php b/lib/php/HTMLPurifier/EntityLookup.php
deleted file mode 100644
index b4dfce94c3852a21162e588e69b87e4062af23a8..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/EntityLookup.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Object that provides entity lookup table from entity name to character
- */
-class HTMLPurifier_EntityLookup {
-
-    /**
-     * Assoc array of entity name to character represented.
-     */
-    public $table;
-
-    /**
-     * Sets up the entity lookup table from the serialized file contents.
-     * @note The serialized contents are versioned, but were generated
-     *       using the maintenance script generate_entity_file.php
-     * @warning This is not in constructor to help enforce the Singleton
-     */
-    public function setup($file = false) {
-        if (!$file) {
-            $file = HTMLPURIFIER_PREFIX . '/HTMLPurifier/EntityLookup/entities.ser';
-        }
-        $this->table = unserialize(file_get_contents($file));
-    }
-
-    /**
-     * Retrieves sole instance of the object.
-     * @param Optional prototype of custom lookup table to overload with.
-     */
-    public static function instance($prototype = false) {
-        // no references, since PHP doesn't copy unless modified
-        static $instance = null;
-        if ($prototype) {
-            $instance = $prototype;
-        } elseif (!$instance) {
-            $instance = new HTMLPurifier_EntityLookup();
-            $instance->setup();
-        }
-        return $instance;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/EntityLookup/entities.ser b/lib/php/HTMLPurifier/EntityLookup/entities.ser
deleted file mode 100644
index f2b8b8f2db018a83ba9f03a7bad52b7ec945860d..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/EntityLookup/entities.ser
+++ /dev/null
@@ -1 +0,0 @@
-a:246:{s:4:"nbsp";s:2:" ";s:5:"iexcl";s:2:"¡";s:4:"cent";s:2:"¢";s:5:"pound";s:2:"£";s:6:"curren";s:2:"¤";s:3:"yen";s:2:"¥";s:6:"brvbar";s:2:"¦";s:4:"sect";s:2:"§";s:3:"uml";s:2:"¨";s:4:"copy";s:2:"©";s:4:"ordf";s:2:"ª";s:5:"laquo";s:2:"«";s:3:"not";s:2:"¬";s:3:"shy";s:2:"­";s:3:"reg";s:2:"®";s:4:"macr";s:2:"¯";s:3:"deg";s:2:"°";s:6:"plusmn";s:2:"±";s:5:"acute";s:2:"´";s:5:"micro";s:2:"µ";s:4:"para";s:2:"¶";s:6:"middot";s:2:"·";s:5:"cedil";s:2:"¸";s:4:"ordm";s:2:"º";s:5:"raquo";s:2:"»";s:6:"iquest";s:2:"¿";s:6:"Agrave";s:2:"À";s:6:"Aacute";s:2:"Á";s:5:"Acirc";s:2:"Â";s:6:"Atilde";s:2:"Ã";s:4:"Auml";s:2:"Ä";s:5:"Aring";s:2:"Å";s:5:"AElig";s:2:"Æ";s:6:"Ccedil";s:2:"Ç";s:6:"Egrave";s:2:"È";s:6:"Eacute";s:2:"É";s:5:"Ecirc";s:2:"Ê";s:4:"Euml";s:2:"Ë";s:6:"Igrave";s:2:"Ì";s:6:"Iacute";s:2:"Í";s:5:"Icirc";s:2:"Î";s:4:"Iuml";s:2:"Ï";s:3:"ETH";s:2:"Ð";s:6:"Ntilde";s:2:"Ñ";s:6:"Ograve";s:2:"Ò";s:6:"Oacute";s:2:"Ó";s:5:"Ocirc";s:2:"Ô";s:6:"Otilde";s:2:"Õ";s:4:"Ouml";s:2:"Ö";s:5:"times";s:2:"×";s:6:"Oslash";s:2:"Ø";s:6:"Ugrave";s:2:"Ù";s:6:"Uacute";s:2:"Ú";s:5:"Ucirc";s:2:"Û";s:4:"Uuml";s:2:"Ü";s:6:"Yacute";s:2:"Ý";s:5:"THORN";s:2:"Þ";s:5:"szlig";s:2:"ß";s:6:"agrave";s:2:"à";s:6:"aacute";s:2:"á";s:5:"acirc";s:2:"â";s:6:"atilde";s:2:"ã";s:4:"auml";s:2:"ä";s:5:"aring";s:2:"å";s:5:"aelig";s:2:"æ";s:6:"ccedil";s:2:"ç";s:6:"egrave";s:2:"è";s:6:"eacute";s:2:"é";s:5:"ecirc";s:2:"ê";s:4:"euml";s:2:"ë";s:6:"igrave";s:2:"ì";s:6:"iacute";s:2:"í";s:5:"icirc";s:2:"î";s:4:"iuml";s:2:"ï";s:3:"eth";s:2:"ð";s:6:"ntilde";s:2:"ñ";s:6:"ograve";s:2:"ò";s:6:"oacute";s:2:"ó";s:5:"ocirc";s:2:"ô";s:6:"otilde";s:2:"õ";s:4:"ouml";s:2:"ö";s:6:"divide";s:2:"÷";s:6:"oslash";s:2:"ø";s:6:"ugrave";s:2:"ù";s:6:"uacute";s:2:"ú";s:5:"ucirc";s:2:"û";s:4:"uuml";s:2:"ü";s:6:"yacute";s:2:"ý";s:5:"thorn";s:2:"þ";s:4:"yuml";s:2:"ÿ";s:4:"quot";s:1:""";s:3:"amp";s:1:"&";s:2:"lt";s:1:"<";s:2:"gt";s:1:">";s:4:"apos";s:1:"'";s:5:"OElig";s:2:"Œ";s:5:"oelig";s:2:"œ";s:6:"Scaron";s:2:"Š";s:6:"scaron";s:2:"š";s:4:"Yuml";s:2:"Ÿ";s:4:"circ";s:2:"ˆ";s:5:"tilde";s:2:"˜";s:4:"ensp";s:3:" ";s:4:"emsp";s:3:" ";s:6:"thinsp";s:3:" ";s:4:"zwnj";s:3:"‌";s:3:"zwj";s:3:"‍";s:3:"lrm";s:3:"‎";s:3:"rlm";s:3:"‏";s:5:"ndash";s:3:"–";s:5:"mdash";s:3:"—";s:5:"lsquo";s:3:"‘";s:5:"rsquo";s:3:"’";s:5:"sbquo";s:3:"‚";s:5:"ldquo";s:3:"“";s:5:"rdquo";s:3:"”";s:5:"bdquo";s:3:"„";s:6:"dagger";s:3:"†";s:6:"Dagger";s:3:"‡";s:6:"permil";s:3:"‰";s:6:"lsaquo";s:3:"‹";s:6:"rsaquo";s:3:"›";s:4:"euro";s:3:"€";s:4:"fnof";s:2:"ƒ";s:5:"Alpha";s:2:"Α";s:4:"Beta";s:2:"Β";s:5:"Gamma";s:2:"Γ";s:5:"Delta";s:2:"Δ";s:7:"Epsilon";s:2:"Ε";s:4:"Zeta";s:2:"Ζ";s:3:"Eta";s:2:"Η";s:5:"Theta";s:2:"Θ";s:4:"Iota";s:2:"Ι";s:5:"Kappa";s:2:"Κ";s:6:"Lambda";s:2:"Λ";s:2:"Mu";s:2:"Μ";s:2:"Nu";s:2:"Ν";s:2:"Xi";s:2:"Ξ";s:7:"Omicron";s:2:"Ο";s:2:"Pi";s:2:"Π";s:3:"Rho";s:2:"Ρ";s:5:"Sigma";s:2:"Σ";s:3:"Tau";s:2:"Τ";s:7:"Upsilon";s:2:"Υ";s:3:"Phi";s:2:"Φ";s:3:"Chi";s:2:"Χ";s:3:"Psi";s:2:"Ψ";s:5:"Omega";s:2:"Ω";s:5:"alpha";s:2:"α";s:4:"beta";s:2:"β";s:5:"gamma";s:2:"γ";s:5:"delta";s:2:"δ";s:7:"epsilon";s:2:"ε";s:4:"zeta";s:2:"ζ";s:3:"eta";s:2:"η";s:5:"theta";s:2:"θ";s:4:"iota";s:2:"ι";s:5:"kappa";s:2:"κ";s:6:"lambda";s:2:"λ";s:2:"mu";s:2:"μ";s:2:"nu";s:2:"ν";s:2:"xi";s:2:"ξ";s:7:"omicron";s:2:"ο";s:2:"pi";s:2:"π";s:3:"rho";s:2:"ρ";s:6:"sigmaf";s:2:"ς";s:5:"sigma";s:2:"σ";s:3:"tau";s:2:"τ";s:7:"upsilon";s:2:"υ";s:3:"phi";s:2:"φ";s:3:"chi";s:2:"χ";s:3:"psi";s:2:"ψ";s:5:"omega";s:2:"ω";s:8:"thetasym";s:2:"ϑ";s:5:"upsih";s:2:"ϒ";s:3:"piv";s:2:"ϖ";s:4:"bull";s:3:"•";s:6:"hellip";s:3:"…";s:5:"prime";s:3:"′";s:5:"Prime";s:3:"″";s:5:"oline";s:3:"‾";s:5:"frasl";s:3:"⁄";s:6:"weierp";s:3:"℘";s:5:"image";s:3:"ℑ";s:4:"real";s:3:"ℜ";s:5:"trade";s:3:"™";s:7:"alefsym";s:3:"ℵ";s:4:"larr";s:3:"←";s:4:"uarr";s:3:"↑";s:4:"rarr";s:3:"→";s:4:"darr";s:3:"↓";s:4:"harr";s:3:"↔";s:5:"crarr";s:3:"↵";s:4:"lArr";s:3:"⇐";s:4:"uArr";s:3:"⇑";s:4:"rArr";s:3:"⇒";s:4:"dArr";s:3:"⇓";s:4:"hArr";s:3:"⇔";s:6:"forall";s:3:"∀";s:4:"part";s:3:"∂";s:5:"exist";s:3:"∃";s:5:"empty";s:3:"∅";s:5:"nabla";s:3:"∇";s:4:"isin";s:3:"∈";s:5:"notin";s:3:"∉";s:2:"ni";s:3:"∋";s:4:"prod";s:3:"∏";s:3:"sum";s:3:"∑";s:5:"minus";s:3:"−";s:6:"lowast";s:3:"∗";s:5:"radic";s:3:"√";s:4:"prop";s:3:"∝";s:5:"infin";s:3:"∞";s:3:"ang";s:3:"∠";s:3:"and";s:3:"∧";s:2:"or";s:3:"∨";s:3:"cap";s:3:"∩";s:3:"cup";s:3:"∪";s:3:"int";s:3:"∫";s:3:"sim";s:3:"∼";s:4:"cong";s:3:"≅";s:5:"asymp";s:3:"≈";s:2:"ne";s:3:"≠";s:5:"equiv";s:3:"≡";s:2:"le";s:3:"≤";s:2:"ge";s:3:"≥";s:3:"sub";s:3:"⊂";s:3:"sup";s:3:"⊃";s:4:"nsub";s:3:"⊄";s:4:"sube";s:3:"⊆";s:4:"supe";s:3:"⊇";s:5:"oplus";s:3:"⊕";s:6:"otimes";s:3:"⊗";s:4:"perp";s:3:"⊥";s:4:"sdot";s:3:"⋅";s:5:"lceil";s:3:"⌈";s:5:"rceil";s:3:"⌉";s:6:"lfloor";s:3:"⌊";s:6:"rfloor";s:3:"⌋";s:4:"lang";s:3:"〈";s:4:"rang";s:3:"〉";s:3:"loz";s:3:"◊";s:6:"spades";s:3:"♠";s:5:"clubs";s:3:"♣";s:6:"hearts";s:3:"♥";s:5:"diams";s:3:"♦";}
\ No newline at end of file
diff --git a/lib/php/HTMLPurifier/EntityParser.php b/lib/php/HTMLPurifier/EntityParser.php
deleted file mode 100644
index 8c384472dc6c12ee507c396f12bdf1722c00646a..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/EntityParser.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-// if want to implement error collecting here, we'll need to use some sort
-// of global data (probably trigger_error) because it's impossible to pass
-// $config or $context to the callback functions.
-
-/**
- * Handles referencing and derefencing character entities
- */
-class HTMLPurifier_EntityParser
-{
-
-    /**
-     * Reference to entity lookup table.
-     */
-    protected $_entity_lookup;
-
-    /**
-     * Callback regex string for parsing entities.
-     */
-    protected $_substituteEntitiesRegex =
-'/&(?:[#]x([a-fA-F0-9]+)|[#]0*(\d+)|([A-Za-z_:][A-Za-z0-9.\-_:]*));?/';
-//     1. hex             2. dec      3. string (XML style)
-
-
-    /**
-     * Decimal to parsed string conversion table for special entities.
-     */
-    protected $_special_dec2str =
-            array(
-                    34 => '"',
-                    38 => '&',
-                    39 => "'",
-                    60 => '<',
-                    62 => '>'
-            );
-
-    /**
-     * Stripped entity names to decimal conversion table for special entities.
-     */
-    protected $_special_ent2dec =
-            array(
-                    'quot' => 34,
-                    'amp'  => 38,
-                    'lt'   => 60,
-                    'gt'   => 62
-            );
-
-    /**
-     * Substitutes non-special entities with their parsed equivalents. Since
-     * running this whenever you have parsed character is t3h 5uck, we run
-     * it before everything else.
-     *
-     * @param $string String to have non-special entities parsed.
-     * @returns Parsed string.
-     */
-    public function substituteNonSpecialEntities($string) {
-        // it will try to detect missing semicolons, but don't rely on it
-        return preg_replace_callback(
-            $this->_substituteEntitiesRegex,
-            array($this, 'nonSpecialEntityCallback'),
-            $string
-            );
-    }
-
-    /**
-     * Callback function for substituteNonSpecialEntities() that does the work.
-     *
-     * @param $matches  PCRE matches array, with 0 the entire match, and
-     *                  either index 1, 2 or 3 set with a hex value, dec value,
-     *                  or string (respectively).
-     * @returns Replacement string.
-     */
-
-    protected function nonSpecialEntityCallback($matches) {
-        // replaces all but big five
-        $entity = $matches[0];
-        $is_num = (@$matches[0][1] === '#');
-        if ($is_num) {
-            $is_hex = (@$entity[2] === 'x');
-            $code = $is_hex ? hexdec($matches[1]) : (int) $matches[2];
-
-            // abort for special characters
-            if (isset($this->_special_dec2str[$code]))  return $entity;
-
-            return HTMLPurifier_Encoder::unichr($code);
-        } else {
-            if (isset($this->_special_ent2dec[$matches[3]])) return $entity;
-            if (!$this->_entity_lookup) {
-                $this->_entity_lookup = HTMLPurifier_EntityLookup::instance();
-            }
-            if (isset($this->_entity_lookup->table[$matches[3]])) {
-                return $this->_entity_lookup->table[$matches[3]];
-            } else {
-                return $entity;
-            }
-        }
-    }
-
-    /**
-     * Substitutes only special entities with their parsed equivalents.
-     *
-     * @notice We try to avoid calling this function because otherwise, it
-     * would have to be called a lot (for every parsed section).
-     *
-     * @param $string String to have non-special entities parsed.
-     * @returns Parsed string.
-     */
-    public function substituteSpecialEntities($string) {
-        return preg_replace_callback(
-            $this->_substituteEntitiesRegex,
-            array($this, 'specialEntityCallback'),
-            $string);
-    }
-
-    /**
-     * Callback function for substituteSpecialEntities() that does the work.
-     *
-     * This callback has same syntax as nonSpecialEntityCallback().
-     *
-     * @param $matches  PCRE-style matches array, with 0 the entire match, and
-     *                  either index 1, 2 or 3 set with a hex value, dec value,
-     *                  or string (respectively).
-     * @returns Replacement string.
-     */
-    protected function specialEntityCallback($matches) {
-        $entity = $matches[0];
-        $is_num = (@$matches[0][1] === '#');
-        if ($is_num) {
-            $is_hex = (@$entity[2] === 'x');
-            $int = $is_hex ? hexdec($matches[1]) : (int) $matches[2];
-            return isset($this->_special_dec2str[$int]) ?
-                $this->_special_dec2str[$int] :
-                $entity;
-        } else {
-            return isset($this->_special_ent2dec[$matches[3]]) ?
-                $this->_special_ent2dec[$matches[3]] :
-                $entity;
-        }
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ErrorCollector.php b/lib/php/HTMLPurifier/ErrorCollector.php
deleted file mode 100644
index 6713eaf77309c1a9a6b5e3297899b92b01ae12e2..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ErrorCollector.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-/**
- * Error collection class that enables HTML Purifier to report HTML
- * problems back to the user
- */
-class HTMLPurifier_ErrorCollector
-{
-
-    /**
-     * Identifiers for the returned error array. These are purposely numeric
-     * so list() can be used.
-     */
-    const LINENO   = 0;
-    const SEVERITY = 1;
-    const MESSAGE  = 2;
-    const CHILDREN = 3;
-
-    protected $errors;
-    protected $_current;
-    protected $_stacks = array(array());
-    protected $locale;
-    protected $generator;
-    protected $context;
-
-    protected $lines = array();
-
-    public function __construct($context) {
-        $this->locale    =& $context->get('Locale');
-        $this->context   = $context;
-        $this->_current  =& $this->_stacks[0];
-        $this->errors    =& $this->_stacks[0];
-    }
-
-    /**
-     * Sends an error message to the collector for later use
-     * @param $severity int Error severity, PHP error style (don't use E_USER_)
-     * @param $msg string Error message text
-     * @param $subst1 string First substitution for $msg
-     * @param $subst2 string ...
-     */
-    public function send($severity, $msg) {
-
-        $args = array();
-        if (func_num_args() > 2) {
-            $args = func_get_args();
-            array_shift($args);
-            unset($args[0]);
-        }
-
-        $token = $this->context->get('CurrentToken', true);
-        $line  = $token ? $token->line : $this->context->get('CurrentLine', true);
-        $col   = $token ? $token->col  : $this->context->get('CurrentCol',  true);
-        $attr  = $this->context->get('CurrentAttr', true);
-
-        // perform special substitutions, also add custom parameters
-        $subst = array();
-        if (!is_null($token)) {
-            $args['CurrentToken'] = $token;
-        }
-        if (!is_null($attr)) {
-            $subst['$CurrentAttr.Name'] = $attr;
-            if (isset($token->attr[$attr])) $subst['$CurrentAttr.Value'] = $token->attr[$attr];
-        }
-
-        if (empty($args)) {
-            $msg = $this->locale->getMessage($msg);
-        } else {
-            $msg = $this->locale->formatMessage($msg, $args);
-        }
-
-        if (!empty($subst)) $msg = strtr($msg, $subst);
-
-        // (numerically indexed)
-        $error = array(
-            self::LINENO   => $line,
-            self::SEVERITY => $severity,
-            self::MESSAGE  => $msg,
-            self::CHILDREN => array()
-        );
-        $this->_current[] = $error;
-
-
-        // NEW CODE BELOW ...
-
-        $struct = null;
-        // Top-level errors are either:
-        //  TOKEN type, if $value is set appropriately, or
-        //  "syntax" type, if $value is null
-        $new_struct = new HTMLPurifier_ErrorStruct();
-        $new_struct->type = HTMLPurifier_ErrorStruct::TOKEN;
-        if ($token) $new_struct->value = clone $token;
-        if (is_int($line) && is_int($col)) {
-            if (isset($this->lines[$line][$col])) {
-                $struct = $this->lines[$line][$col];
-            } else {
-                $struct = $this->lines[$line][$col] = $new_struct;
-            }
-            // These ksorts may present a performance problem
-            ksort($this->lines[$line], SORT_NUMERIC);
-        } else {
-            if (isset($this->lines[-1])) {
-                $struct = $this->lines[-1];
-            } else {
-                $struct = $this->lines[-1] = $new_struct;
-            }
-        }
-        ksort($this->lines, SORT_NUMERIC);
-
-        // Now, check if we need to operate on a lower structure
-        if (!empty($attr)) {
-            $struct = $struct->getChild(HTMLPurifier_ErrorStruct::ATTR, $attr);
-            if (!$struct->value) {
-                $struct->value = array($attr, 'PUT VALUE HERE');
-            }
-        }
-        if (!empty($cssprop)) {
-            $struct = $struct->getChild(HTMLPurifier_ErrorStruct::CSSPROP, $cssprop);
-            if (!$struct->value) {
-                // if we tokenize CSS this might be a little more difficult to do
-                $struct->value = array($cssprop, 'PUT VALUE HERE');
-            }
-        }
-
-        // Ok, structs are all setup, now time to register the error
-        $struct->addError($severity, $msg);
-    }
-
-    /**
-     * Retrieves raw error data for custom formatter to use
-     * @param List of arrays in format of array(line of error,
-     *        error severity, error message,
-     *        recursive sub-errors array)
-     */
-    public function getRaw() {
-        return $this->errors;
-    }
-
-    /**
-     * Default HTML formatting implementation for error messages
-     * @param $config Configuration array, vital for HTML output nature
-     * @param $errors Errors array to display; used for recursion.
-     */
-    public function getHTMLFormatted($config, $errors = null) {
-        $ret = array();
-
-        $this->generator = new HTMLPurifier_Generator($config, $this->context);
-        if ($errors === null) $errors = $this->errors;
-
-        // 'At line' message needs to be removed
-
-        // generation code for new structure goes here. It needs to be recursive.
-        foreach ($this->lines as $line => $col_array) {
-            if ($line == -1) continue;
-            foreach ($col_array as $col => $struct) {
-                $this->_renderStruct($ret, $struct, $line, $col);
-            }
-        }
-        if (isset($this->lines[-1])) {
-            $this->_renderStruct($ret, $this->lines[-1]);
-        }
-
-        if (empty($errors)) {
-            return '<p>' . $this->locale->getMessage('ErrorCollector: No errors') . '</p>';
-        } else {
-            return '<ul><li>' . implode('</li><li>', $ret) . '</li></ul>';
-        }
-
-    }
-
-    private function _renderStruct(&$ret, $struct, $line = null, $col = null) {
-        $stack = array($struct);
-        $context_stack = array(array());
-        while ($current = array_pop($stack)) {
-            $context = array_pop($context_stack);
-            foreach ($current->errors as $error) {
-                list($severity, $msg) = $error;
-                $string = '';
-                $string .= '<div>';
-                // W3C uses an icon to indicate the severity of the error.
-                $error = $this->locale->getErrorName($severity);
-                $string .= "<span class=\"error e$severity\"><strong>$error</strong></span> ";
-                if (!is_null($line) && !is_null($col)) {
-                    $string .= "<em class=\"location\">Line $line, Column $col: </em> ";
-                } else {
-                    $string .= '<em class="location">End of Document: </em> ';
-                }
-                $string .= '<strong class="description">' . $this->generator->escape($msg) . '</strong> ';
-                $string .= '</div>';
-                // Here, have a marker for the character on the column appropriate.
-                // Be sure to clip extremely long lines.
-                //$string .= '<pre>';
-                //$string .= '';
-                //$string .= '</pre>';
-                $ret[] = $string;
-            }
-            foreach ($current->children as $type => $array) {
-                $context[] = $current;
-                $stack = array_merge($stack, array_reverse($array, true));
-                for ($i = count($array); $i > 0; $i--) {
-                    $context_stack[] = $context;
-                }
-            }
-        }
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/ErrorStruct.php b/lib/php/HTMLPurifier/ErrorStruct.php
deleted file mode 100644
index 9bc8996ec1939d6a0d1da83ec4c651e9ce00b390..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/ErrorStruct.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Records errors for particular segments of an HTML document such as tokens,
- * attributes or CSS properties. They can contain error structs (which apply
- * to components of what they represent), but their main purpose is to hold
- * errors applying to whatever struct is being used.
- */
-class HTMLPurifier_ErrorStruct
-{
-
-    /**
-     * Possible values for $children first-key. Note that top-level structures
-     * are automatically token-level.
-     */
-    const TOKEN     = 0;
-    const ATTR      = 1;
-    const CSSPROP   = 2;
-
-    /**
-     * Type of this struct.
-     */
-    public $type;
-
-    /**
-     * Value of the struct we are recording errors for. There are various
-     * values for this:
-     *  - TOKEN: Instance of HTMLPurifier_Token
-     *  - ATTR: array('attr-name', 'value')
-     *  - CSSPROP: array('prop-name', 'value')
-     */
-    public $value;
-
-    /**
-     * Errors registered for this structure.
-     */
-    public $errors = array();
-
-    /**
-     * Child ErrorStructs that are from this structure. For example, a TOKEN
-     * ErrorStruct would contain ATTR ErrorStructs. This is a multi-dimensional
-     * array in structure: [TYPE]['identifier']
-     */
-    public $children = array();
-
-    public function getChild($type, $id) {
-        if (!isset($this->children[$type][$id])) {
-            $this->children[$type][$id] = new HTMLPurifier_ErrorStruct();
-            $this->children[$type][$id]->type = $type;
-        }
-        return $this->children[$type][$id];
-    }
-
-    public function addError($severity, $message) {
-        $this->errors[] = array($severity, $message);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Exception.php b/lib/php/HTMLPurifier/Exception.php
deleted file mode 100644
index be85b4c560e04ffed27885d7dddaba6450b12059..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Exception.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Global exception class for HTML Purifier; any exceptions we throw
- * are from here.
- */
-class HTMLPurifier_Exception extends Exception
-{
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Filter.php b/lib/php/HTMLPurifier/Filter.php
deleted file mode 100644
index 9a0e7b09f3b90079200832695d9af51041395648..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Filter.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * Represents a pre or post processing filter on HTML Purifier's output
- *
- * Sometimes, a little ad-hoc fixing of HTML has to be done before
- * it gets sent through HTML Purifier: you can use filters to acheive
- * this effect. For instance, YouTube videos can be preserved using
- * this manner. You could have used a decorator for this task, but
- * PHP's support for them is not terribly robust, so we're going
- * to just loop through the filters.
- *
- * Filters should be exited first in, last out. If there are three filters,
- * named 1, 2 and 3, the order of execution should go 1->preFilter,
- * 2->preFilter, 3->preFilter, purify, 3->postFilter, 2->postFilter,
- * 1->postFilter.
- *
- * @note Methods are not declared abstract as it is perfectly legitimate
- *       for an implementation not to want anything to happen on a step
- */
-
-class HTMLPurifier_Filter
-{
-
-    /**
-     * Name of the filter for identification purposes
-     */
-    public $name;
-
-    /**
-     * Pre-processor function, handles HTML before HTML Purifier
-     */
-    public function preFilter($html, $config, $context) {
-        return $html;
-    }
-
-    /**
-     * Post-processor function, handles HTML after HTML Purifier
-     */
-    public function postFilter($html, $config, $context) {
-        return $html;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Filter/ExtractStyleBlocks.php b/lib/php/HTMLPurifier/Filter/ExtractStyleBlocks.php
deleted file mode 100644
index bbf78a6630a6b02c8495b1433695336b5e0c9853..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Filter/ExtractStyleBlocks.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-/**
- * This filter extracts <style> blocks from input HTML, cleans them up
- * using CSSTidy, and then places them in $purifier->context->get('StyleBlocks')
- * so they can be used elsewhere in the document.
- *
- * @note
- *      See tests/HTMLPurifier/Filter/ExtractStyleBlocksTest.php for
- *      sample usage.
- *
- * @note
- *      This filter can also be used on stylesheets not included in the
- *      document--something purists would probably prefer. Just directly
- *      call HTMLPurifier_Filter_ExtractStyleBlocks->cleanCSS()
- */
-class HTMLPurifier_Filter_ExtractStyleBlocks extends HTMLPurifier_Filter
-{
-
-    public $name = 'ExtractStyleBlocks';
-    private $_styleMatches = array();
-    private $_tidy;
-
-    public function __construct() {
-        $this->_tidy = new csstidy();
-    }
-
-    /**
-     * Save the contents of CSS blocks to style matches
-     * @param $matches preg_replace style $matches array
-     */
-    protected function styleCallback($matches) {
-        $this->_styleMatches[] = $matches[1];
-    }
-
-    /**
-     * Removes inline <style> tags from HTML, saves them for later use
-     * @todo Extend to indicate non-text/css style blocks
-     */
-    public function preFilter($html, $config, $context) {
-        $tidy = $config->get('Filter.ExtractStyleBlocks.TidyImpl');
-        if ($tidy !== null) $this->_tidy = $tidy;
-        $html = preg_replace_callback('#<style(?:\s.*)?>(.+)</style>#isU', array($this, 'styleCallback'), $html);
-        $style_blocks = $this->_styleMatches;
-        $this->_styleMatches = array(); // reset
-        $context->register('StyleBlocks', $style_blocks); // $context must not be reused
-        if ($this->_tidy) {
-            foreach ($style_blocks as &$style) {
-                $style = $this->cleanCSS($style, $config, $context);
-            }
-        }
-        return $html;
-    }
-
-    /**
-     * Takes CSS (the stuff found in <style>) and cleans it.
-     * @warning Requires CSSTidy <http://csstidy.sourceforge.net/>
-     * @param $css     CSS styling to clean
-     * @param $config  Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     * @return Cleaned CSS
-     */
-    public function cleanCSS($css, $config, $context) {
-        // prepare scope
-        $scope = $config->get('Filter.ExtractStyleBlocks.Scope');
-        if ($scope !== null) {
-            $scopes = array_map('trim', explode(',', $scope));
-        } else {
-            $scopes = array();
-        }
-        // remove comments from CSS
-        $css = trim($css);
-        if (strncmp('<!--', $css, 4) === 0) {
-            $css = substr($css, 4);
-        }
-        if (strlen($css) > 3 && substr($css, -3) == '-->') {
-            $css = substr($css, 0, -3);
-        }
-        $css = trim($css);
-        $this->_tidy->parse($css);
-        $css_definition = $config->getDefinition('CSS');
-        foreach ($this->_tidy->css as $k => $decls) {
-            // $decls are all CSS declarations inside an @ selector
-            $new_decls = array();
-            foreach ($decls as $selector => $style) {
-                $selector = trim($selector);
-                if ($selector === '') continue; // should not happen
-                if ($selector[0] === '+') {
-                    if ($selector !== '' && $selector[0] === '+') continue;
-                }
-                if (!empty($scopes)) {
-                    $new_selector = array(); // because multiple ones are possible
-                    $selectors = array_map('trim', explode(',', $selector));
-                    foreach ($scopes as $s1) {
-                        foreach ($selectors as $s2) {
-                            $new_selector[] = "$s1 $s2";
-                        }
-                    }
-                    $selector = implode(', ', $new_selector); // now it's a string
-                }
-                foreach ($style as $name => $value) {
-                    if (!isset($css_definition->info[$name])) {
-                        unset($style[$name]);
-                        continue;
-                    }
-                    $def = $css_definition->info[$name];
-                    $ret = $def->validate($value, $config, $context);
-                    if ($ret === false) unset($style[$name]);
-                    else $style[$name] = $ret;
-                }
-                $new_decls[$selector] = $style;
-            }
-            $this->_tidy->css[$k] = $new_decls;
-        }
-        // remove stuff that shouldn't be used, could be reenabled
-        // after security risks are analyzed
-        $this->_tidy->import = array();
-        $this->_tidy->charset = null;
-        $this->_tidy->namespace = null;
-        $css = $this->_tidy->print->plain();
-        // we are going to escape any special characters <>& to ensure
-        // that no funny business occurs (i.e. </style> in a font-family prop).
-        if ($config->get('Filter.ExtractStyleBlocks.Escaping')) {
-            $css = str_replace(
-                array('<',    '>',    '&'),
-                array('\3C ', '\3E ', '\26 '),
-                $css
-            );
-        }
-        return $css;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Filter/YouTube.php b/lib/php/HTMLPurifier/Filter/YouTube.php
deleted file mode 100644
index aca972f6c56fb1f4fcb7b00e6e1a0c4b91aa2033..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Filter/YouTube.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter
-{
-
-    public $name = 'YouTube';
-
-    public function preFilter($html, $config, $context) {
-        $pre_regex = '#<object[^>]+>.+?'.
-            'http://www.youtube.com/v/([A-Za-z0-9\-_]+).+?</object>#s';
-        $pre_replace = '<span class="youtube-embed">\1</span>';
-        return preg_replace($pre_regex, $pre_replace, $html);
-    }
-
-    public function postFilter($html, $config, $context) {
-        $post_regex = '#<span class="youtube-embed">([A-Za-z0-9\-_]+)</span>#';
-        return preg_replace_callback($post_regex, array($this, 'postFilterCallback'), $html);
-    }
-
-    protected function armorUrl($url) {
-        return str_replace('--', '-&#45;', $url);
-    }
-
-    protected function postFilterCallback($matches) {
-        $url = $this->armorUrl($matches[1]);
-        return '<object width="425" height="350" type="application/x-shockwave-flash" '.
-            'data="http://www.youtube.com/v/'.$url.'">'.
-            '<param name="movie" value="http://www.youtube.com/v/'.$url.'"></param>'.
-            '<!--[if IE]>'.
-            '<embed src="http://www.youtube.com/v/'.$url.'"'.
-            'type="application/x-shockwave-flash"'.
-            'wmode="transparent" width="425" height="350" />'.
-            '<![endif]-->'.
-            '</object>';
-
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Generator.php b/lib/php/HTMLPurifier/Generator.php
deleted file mode 100644
index 24bd8a54eddafd0821ba78fad3a77c53bb8a6778..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Generator.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-/**
- * Generates HTML from tokens.
- * @todo Refactor interface so that configuration/context is determined
- *       upon instantiation, no need for messy generateFromTokens() calls
- * @todo Make some of the more internal functions protected, and have
- *       unit tests work around that
- */
-class HTMLPurifier_Generator
-{
-
-    /**
-     * Whether or not generator should produce XML output
-     */
-    private $_xhtml = true;
-
-    /**
-     * :HACK: Whether or not generator should comment the insides of <script> tags
-     */
-    private $_scriptFix = false;
-
-    /**
-     * Cache of HTMLDefinition during HTML output to determine whether or
-     * not attributes should be minimized.
-     */
-    private $_def;
-
-    /**
-     * Cache of %Output.SortAttr
-     */
-    private $_sortAttr;
-
-    /**
-     * Configuration for the generator
-     */
-    protected $config;
-
-    /**
-     * @param $config Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     */
-    public function __construct($config, $context) {
-        $this->config = $config;
-        $this->_scriptFix = $config->get('Output.CommentScriptContents');
-        $this->_sortAttr = $config->get('Output.SortAttr');
-        $this->_def = $config->getHTMLDefinition();
-        $this->_xhtml = $this->_def->doctype->xml;
-    }
-
-    /**
-     * Generates HTML from an array of tokens.
-     * @param $tokens Array of HTMLPurifier_Token
-     * @param $config HTMLPurifier_Config object
-     * @return Generated HTML
-     */
-    public function generateFromTokens($tokens) {
-        if (!$tokens) return '';
-
-        // Basic algorithm
-        $html = '';
-        for ($i = 0, $size = count($tokens); $i < $size; $i++) {
-            if ($this->_scriptFix && $tokens[$i]->name === 'script'
-                && $i + 2 < $size && $tokens[$i+2] instanceof HTMLPurifier_Token_End) {
-                // script special case
-                // the contents of the script block must be ONE token
-                // for this to work.
-                $html .= $this->generateFromToken($tokens[$i++]);
-                $html .= $this->generateScriptFromToken($tokens[$i++]);
-            }
-            $html .= $this->generateFromToken($tokens[$i]);
-        }
-
-        // Tidy cleanup
-        if (extension_loaded('tidy') && $this->config->get('Output.TidyFormat')) {
-            $tidy = new Tidy;
-            $tidy->parseString($html, array(
-               'indent'=> true,
-               'output-xhtml' => $this->_xhtml,
-               'show-body-only' => true,
-               'indent-spaces' => 2,
-               'wrap' => 68,
-            ), 'utf8');
-            $tidy->cleanRepair();
-            $html = (string) $tidy; // explicit cast necessary
-        }
-
-        // Normalize newlines to system defined value
-        $nl = $this->config->get('Output.Newline');
-        if ($nl === null) $nl = PHP_EOL;
-        if ($nl !== "\n") $html = str_replace("\n", $nl, $html);
-        return $html;
-    }
-
-    /**
-     * Generates HTML from a single token.
-     * @param $token HTMLPurifier_Token object.
-     * @return Generated HTML
-     */
-    public function generateFromToken($token) {
-        if (!$token instanceof HTMLPurifier_Token) {
-            trigger_error('Cannot generate HTML from non-HTMLPurifier_Token object', E_USER_WARNING);
-            return '';
-
-        } elseif ($token instanceof HTMLPurifier_Token_Start) {
-            $attr = $this->generateAttributes($token->attr, $token->name);
-            return '<' . $token->name . ($attr ? ' ' : '') . $attr . '>';
-
-        } elseif ($token instanceof HTMLPurifier_Token_End) {
-            return '</' . $token->name . '>';
-
-        } elseif ($token instanceof HTMLPurifier_Token_Empty) {
-            $attr = $this->generateAttributes($token->attr, $token->name);
-             return '<' . $token->name . ($attr ? ' ' : '') . $attr .
-                ( $this->_xhtml ? ' /': '' ) // <br /> v. <br>
-                . '>';
-
-        } elseif ($token instanceof HTMLPurifier_Token_Text) {
-            return $this->escape($token->data, ENT_NOQUOTES);
-
-        } elseif ($token instanceof HTMLPurifier_Token_Comment) {
-            return '<!--' . $token->data . '-->';
-        } else {
-            return '';
-
-        }
-    }
-
-    /**
-     * Special case processor for the contents of script tags
-     * @warning This runs into problems if there's already a literal
-     *          --> somewhere inside the script contents.
-     */
-    public function generateScriptFromToken($token) {
-        if (!$token instanceof HTMLPurifier_Token_Text) return $this->generateFromToken($token);
-        // Thanks <http://lachy.id.au/log/2005/05/script-comments>
-        $data = preg_replace('#//\s*$#', '', $token->data);
-        return '<!--//--><![CDATA[//><!--' . "\n" . trim($data) . "\n" . '//--><!]]>';
-    }
-
-    /**
-     * Generates attribute declarations from attribute array.
-     * @note This does not include the leading or trailing space.
-     * @param $assoc_array_of_attributes Attribute array
-     * @param $element Name of element attributes are for, used to check
-     *        attribute minimization.
-     * @return Generate HTML fragment for insertion.
-     */
-    public function generateAttributes($assoc_array_of_attributes, $element = false) {
-        $html = '';
-        if ($this->_sortAttr) ksort($assoc_array_of_attributes);
-        foreach ($assoc_array_of_attributes as $key => $value) {
-            if (!$this->_xhtml) {
-                // Remove namespaced attributes
-                if (strpos($key, ':') !== false) continue;
-                // Check if we should minimize the attribute: val="val" -> val
-                if ($element && !empty($this->_def->info[$element]->attr[$key]->minimized)) {
-                    $html .= $key . ' ';
-                    continue;
-                }
-            }
-            $html .= $key.'="'.$this->escape($value).'" ';
-        }
-        return rtrim($html);
-    }
-
-    /**
-     * Escapes raw text data.
-     * @todo This really ought to be protected, but until we have a facility
-     *       for properly generating HTML here w/o using tokens, it stays
-     *       public.
-     * @param $string String data to escape for HTML.
-     * @param $quote Quoting style, like htmlspecialchars. ENT_NOQUOTES is
-     *               permissible for non-attribute output.
-     * @return String escaped data.
-     */
-    public function escape($string, $quote = ENT_COMPAT) {
-        return htmlspecialchars($string, $quote, 'UTF-8');
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLDefinition.php b/lib/php/HTMLPurifier/HTMLDefinition.php
deleted file mode 100644
index c99ac11eb22aae38c4858342e27838e1d364b20a..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLDefinition.php
+++ /dev/null
@@ -1,420 +0,0 @@
-<?php
-
-/**
- * Definition of the purified HTML that describes allowed children,
- * attributes, and many other things.
- *
- * Conventions:
- *
- * All member variables that are prefixed with info
- * (including the main $info array) are used by HTML Purifier internals
- * and should not be directly edited when customizing the HTMLDefinition.
- * They can usually be set via configuration directives or custom
- * modules.
- *
- * On the other hand, member variables without the info prefix are used
- * internally by the HTMLDefinition and MUST NOT be used by other HTML
- * Purifier internals. Many of them, however, are public, and may be
- * edited by userspace code to tweak the behavior of HTMLDefinition.
- *
- * @note This class is inspected by Printer_HTMLDefinition; please
- *       update that class if things here change.
- *
- * @warning Directives that change this object's structure must be in
- *          the HTML or Attr namespace!
- */
-class HTMLPurifier_HTMLDefinition extends HTMLPurifier_Definition
-{
-
-    // FULLY-PUBLIC VARIABLES ---------------------------------------------
-
-    /**
-     * Associative array of element names to HTMLPurifier_ElementDef
-     */
-    public $info = array();
-
-    /**
-     * Associative array of global attribute name to attribute definition.
-     */
-    public $info_global_attr = array();
-
-    /**
-     * String name of parent element HTML will be going into.
-     */
-    public $info_parent = 'div';
-
-    /**
-     * Definition for parent element, allows parent element to be a
-     * tag that's not allowed inside the HTML fragment.
-     */
-    public $info_parent_def;
-
-    /**
-     * String name of element used to wrap inline elements in block context
-     * @note This is rarely used except for BLOCKQUOTEs in strict mode
-     */
-    public $info_block_wrapper = 'p';
-
-    /**
-     * Associative array of deprecated tag name to HTMLPurifier_TagTransform
-     */
-    public $info_tag_transform = array();
-
-    /**
-     * Indexed list of HTMLPurifier_AttrTransform to be performed before validation.
-     */
-    public $info_attr_transform_pre = array();
-
-    /**
-     * Indexed list of HTMLPurifier_AttrTransform to be performed after validation.
-     */
-    public $info_attr_transform_post = array();
-
-    /**
-     * Nested lookup array of content set name (Block, Inline) to
-     * element name to whether or not it belongs in that content set.
-     */
-    public $info_content_sets = array();
-
-    /**
-     * Indexed list of HTMLPurifier_Injector to be used.
-     */
-    public $info_injector = array();
-
-    /**
-     * Doctype object
-     */
-    public $doctype;
-
-
-
-    // RAW CUSTOMIZATION STUFF --------------------------------------------
-
-    /**
-     * Adds a custom attribute to a pre-existing element
-     * @note This is strictly convenience, and does not have a corresponding
-     *       method in HTMLPurifier_HTMLModule
-     * @param $element_name String element name to add attribute to
-     * @param $attr_name String name of attribute
-     * @param $def Attribute definition, can be string or object, see
-     *             HTMLPurifier_AttrTypes for details
-     */
-    public function addAttribute($element_name, $attr_name, $def) {
-        $module = $this->getAnonymousModule();
-        if (!isset($module->info[$element_name])) {
-            $element = $module->addBlankElement($element_name);
-        } else {
-            $element = $module->info[$element_name];
-        }
-        $element->attr[$attr_name] = $def;
-    }
-
-    /**
-     * Adds a custom element to your HTML definition
-     * @note See HTMLPurifier_HTMLModule::addElement for detailed
-     *       parameter and return value descriptions.
-     */
-    public function addElement($element_name, $type, $contents, $attr_collections, $attributes = array()) {
-        $module = $this->getAnonymousModule();
-        // assume that if the user is calling this, the element
-        // is safe. This may not be a good idea
-        $element = $module->addElement($element_name, $type, $contents, $attr_collections, $attributes);
-        return $element;
-    }
-
-    /**
-     * Adds a blank element to your HTML definition, for overriding
-     * existing behavior
-     * @note See HTMLPurifier_HTMLModule::addBlankElement for detailed
-     *       parameter and return value descriptions.
-     */
-    public function addBlankElement($element_name) {
-        $module  = $this->getAnonymousModule();
-        $element = $module->addBlankElement($element_name);
-        return $element;
-    }
-
-    /**
-     * Retrieves a reference to the anonymous module, so you can
-     * bust out advanced features without having to make your own
-     * module.
-     */
-    public function getAnonymousModule() {
-        if (!$this->_anonModule) {
-            $this->_anonModule = new HTMLPurifier_HTMLModule();
-            $this->_anonModule->name = 'Anonymous';
-        }
-        return $this->_anonModule;
-    }
-
-    private $_anonModule;
-
-
-    // PUBLIC BUT INTERNAL VARIABLES --------------------------------------
-
-    public $type = 'HTML';
-    public $manager; /**< Instance of HTMLPurifier_HTMLModuleManager */
-
-    /**
-     * Performs low-cost, preliminary initialization.
-     */
-    public function __construct() {
-        $this->manager = new HTMLPurifier_HTMLModuleManager();
-    }
-
-    protected function doSetup($config) {
-        $this->processModules($config);
-        $this->setupConfigStuff($config);
-        unset($this->manager);
-
-        // cleanup some of the element definitions
-        foreach ($this->info as $k => $v) {
-            unset($this->info[$k]->content_model);
-            unset($this->info[$k]->content_model_type);
-        }
-    }
-
-    /**
-     * Extract out the information from the manager
-     */
-    protected function processModules($config) {
-
-        if ($this->_anonModule) {
-            // for user specific changes
-            // this is late-loaded so we don't have to deal with PHP4
-            // reference wonky-ness
-            $this->manager->addModule($this->_anonModule);
-            unset($this->_anonModule);
-        }
-
-        $this->manager->setup($config);
-        $this->doctype = $this->manager->doctype;
-
-        foreach ($this->manager->modules as $module) {
-            foreach($module->info_tag_transform as $k => $v) {
-                if ($v === false) unset($this->info_tag_transform[$k]);
-                else $this->info_tag_transform[$k] = $v;
-            }
-            foreach($module->info_attr_transform_pre as $k => $v) {
-                if ($v === false) unset($this->info_attr_transform_pre[$k]);
-                else $this->info_attr_transform_pre[$k] = $v;
-            }
-            foreach($module->info_attr_transform_post as $k => $v) {
-                if ($v === false) unset($this->info_attr_transform_post[$k]);
-                else $this->info_attr_transform_post[$k] = $v;
-            }
-            foreach ($module->info_injector as $k => $v) {
-                if ($v === false) unset($this->info_injector[$k]);
-                else $this->info_injector[$k] = $v;
-            }
-        }
-
-        $this->info = $this->manager->getElements();
-        $this->info_content_sets = $this->manager->contentSets->lookup;
-
-    }
-
-    /**
-     * Sets up stuff based on config. We need a better way of doing this.
-     */
-    protected function setupConfigStuff($config) {
-
-        $block_wrapper = $config->get('HTML.BlockWrapper');
-        if (isset($this->info_content_sets['Block'][$block_wrapper])) {
-            $this->info_block_wrapper = $block_wrapper;
-        } else {
-            trigger_error('Cannot use non-block element as block wrapper',
-                E_USER_ERROR);
-        }
-
-        $parent = $config->get('HTML.Parent');
-        $def = $this->manager->getElement($parent, true);
-        if ($def) {
-            $this->info_parent = $parent;
-            $this->info_parent_def = $def;
-        } else {
-            trigger_error('Cannot use unrecognized element as parent',
-                E_USER_ERROR);
-            $this->info_parent_def = $this->manager->getElement($this->info_parent, true);
-        }
-
-        // support template text
-        $support = "(for information on implementing this, see the ".
-                   "support forums) ";
-
-        // setup allowed elements -----------------------------------------
-
-        $allowed_elements = $config->get('HTML.AllowedElements');
-        $allowed_attributes = $config->get('HTML.AllowedAttributes'); // retrieve early
-
-        if (!is_array($allowed_elements) && !is_array($allowed_attributes)) {
-            $allowed = $config->get('HTML.Allowed');
-            if (is_string($allowed)) {
-                list($allowed_elements, $allowed_attributes) = $this->parseTinyMCEAllowedList($allowed);
-            }
-        }
-
-        if (is_array($allowed_elements)) {
-            foreach ($this->info as $name => $d) {
-                if(!isset($allowed_elements[$name])) unset($this->info[$name]);
-                unset($allowed_elements[$name]);
-            }
-            // emit errors
-            foreach ($allowed_elements as $element => $d) {
-                $element = htmlspecialchars($element); // PHP doesn't escape errors, be careful!
-                trigger_error("Element '$element' is not supported $support", E_USER_WARNING);
-            }
-        }
-
-        // setup allowed attributes ---------------------------------------
-
-        $allowed_attributes_mutable = $allowed_attributes; // by copy!
-        if (is_array($allowed_attributes)) {
-
-            // This actually doesn't do anything, since we went away from
-            // global attributes. It's possible that userland code uses
-            // it, but HTMLModuleManager doesn't!
-            foreach ($this->info_global_attr as $attr => $x) {
-                $keys = array($attr, "*@$attr", "*.$attr");
-                $delete = true;
-                foreach ($keys as $key) {
-                    if ($delete && isset($allowed_attributes[$key])) {
-                        $delete = false;
-                    }
-                    if (isset($allowed_attributes_mutable[$key])) {
-                        unset($allowed_attributes_mutable[$key]);
-                    }
-                }
-                if ($delete) unset($this->info_global_attr[$attr]);
-            }
-
-            foreach ($this->info as $tag => $info) {
-                foreach ($info->attr as $attr => $x) {
-                    $keys = array("$tag@$attr", $attr, "*@$attr", "$tag.$attr", "*.$attr");
-                    $delete = true;
-                    foreach ($keys as $key) {
-                        if ($delete && isset($allowed_attributes[$key])) {
-                            $delete = false;
-                        }
-                        if (isset($allowed_attributes_mutable[$key])) {
-                            unset($allowed_attributes_mutable[$key]);
-                        }
-                    }
-                    if ($delete) unset($this->info[$tag]->attr[$attr]);
-                }
-            }
-            // emit errors
-            foreach ($allowed_attributes_mutable as $elattr => $d) {
-                $bits = preg_split('/[.@]/', $elattr, 2);
-                $c = count($bits);
-                switch ($c) {
-                    case 2:
-                        if ($bits[0] !== '*') {
-                            $element = htmlspecialchars($bits[0]);
-                            $attribute = htmlspecialchars($bits[1]);
-                            if (!isset($this->info[$element])) {
-                                trigger_error("Cannot allow attribute '$attribute' if element '$element' is not allowed/supported $support");
-                            } else {
-                                trigger_error("Attribute '$attribute' in element '$element' not supported $support",
-                                    E_USER_WARNING);
-                            }
-                            break;
-                        }
-                        // otherwise fall through
-                    case 1:
-                        $attribute = htmlspecialchars($bits[0]);
-                        trigger_error("Global attribute '$attribute' is not ".
-                            "supported in any elements $support",
-                            E_USER_WARNING);
-                        break;
-                }
-            }
-
-        }
-
-        // setup forbidden elements ---------------------------------------
-
-        $forbidden_elements   = $config->get('HTML.ForbiddenElements');
-        $forbidden_attributes = $config->get('HTML.ForbiddenAttributes');
-
-        foreach ($this->info as $tag => $info) {
-            if (isset($forbidden_elements[$tag])) {
-                unset($this->info[$tag]);
-                continue;
-            }
-            foreach ($info->attr as $attr => $x) {
-                if (
-                    isset($forbidden_attributes["$tag@$attr"]) ||
-                    isset($forbidden_attributes["*@$attr"]) ||
-                    isset($forbidden_attributes[$attr])
-                ) {
-                    unset($this->info[$tag]->attr[$attr]);
-                    continue;
-                } // this segment might get removed eventually
-                elseif (isset($forbidden_attributes["$tag.$attr"])) {
-                    // $tag.$attr are not user supplied, so no worries!
-                    trigger_error("Error with $tag.$attr: tag.attr syntax not supported for HTML.ForbiddenAttributes; use tag@attr instead", E_USER_WARNING);
-                }
-            }
-        }
-        foreach ($forbidden_attributes as $key => $v) {
-            if (strlen($key) < 2) continue;
-            if ($key[0] != '*') continue;
-            if ($key[1] == '.') {
-                trigger_error("Error with $key: *.attr syntax not supported for HTML.ForbiddenAttributes; use attr instead", E_USER_WARNING);
-            }
-        }
-
-        // setup injectors -----------------------------------------------------
-        foreach ($this->info_injector as $i => $injector) {
-            if ($injector->checkNeeded($config) !== false) {
-                // remove injector that does not have it's required
-                // elements/attributes present, and is thus not needed.
-                unset($this->info_injector[$i]);
-            }
-        }
-    }
-
-    /**
-     * Parses a TinyMCE-flavored Allowed Elements and Attributes list into
-     * separate lists for processing. Format is element[attr1|attr2],element2...
-     * @warning Although it's largely drawn from TinyMCE's implementation,
-     *      it is different, and you'll probably have to modify your lists
-     * @param $list String list to parse
-     * @param array($allowed_elements, $allowed_attributes)
-     * @todo Give this its own class, probably static interface
-     */
-    public function parseTinyMCEAllowedList($list) {
-
-        $list = str_replace(array(' ', "\t"), '', $list);
-
-        $elements = array();
-        $attributes = array();
-
-        $chunks = preg_split('/(,|[\n\r]+)/', $list);
-        foreach ($chunks as $chunk) {
-            if (empty($chunk)) continue;
-            // remove TinyMCE element control characters
-            if (!strpos($chunk, '[')) {
-                $element = $chunk;
-                $attr = false;
-            } else {
-                list($element, $attr) = explode('[', $chunk);
-            }
-            if ($element !== '*') $elements[$element] = true;
-            if (!$attr) continue;
-            $attr = substr($attr, 0, strlen($attr) - 1); // remove trailing ]
-            $attr = explode('|', $attr);
-            foreach ($attr as $key) {
-                $attributes["$element.$key"] = true;
-            }
-        }
-
-        return array($elements, $attributes);
-
-    }
-
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule.php b/lib/php/HTMLPurifier/HTMLModule.php
deleted file mode 100644
index 072cf68084aff232148e8416ffdfda993d89011d..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-
-/**
- * Represents an XHTML 1.1 module, with information on elements, tags
- * and attributes.
- * @note Even though this is technically XHTML 1.1, it is also used for
- *       regular HTML parsing. We are using modulization as a convenient
- *       way to represent the internals of HTMLDefinition, and our
- *       implementation is by no means conforming and does not directly
- *       use the normative DTDs or XML schemas.
- * @note The public variables in a module should almost directly
- *       correspond to the variables in HTMLPurifier_HTMLDefinition.
- *       However, the prefix info carries no special meaning in these
- *       objects (include it anyway if that's the correspondence though).
- * @todo Consider making some member functions protected
- */
-
-class HTMLPurifier_HTMLModule
-{
-
-    // -- Overloadable ----------------------------------------------------
-
-    /**
-     * Short unique string identifier of the module
-     */
-    public $name;
-
-    /**
-     * Informally, a list of elements this module changes. Not used in
-     * any significant way.
-     */
-    public $elements = array();
-
-    /**
-     * Associative array of element names to element definitions.
-     * Some definitions may be incomplete, to be merged in later
-     * with the full definition.
-     */
-    public $info = array();
-
-    /**
-     * Associative array of content set names to content set additions.
-     * This is commonly used to, say, add an A element to the Inline
-     * content set. This corresponds to an internal variable $content_sets
-     * and NOT info_content_sets member variable of HTMLDefinition.
-     */
-    public $content_sets = array();
-
-    /**
-     * Associative array of attribute collection names to attribute
-     * collection additions. More rarely used for adding attributes to
-     * the global collections. Example is the StyleAttribute module adding
-     * the style attribute to the Core. Corresponds to HTMLDefinition's
-     * attr_collections->info, since the object's data is only info,
-     * with extra behavior associated with it.
-     */
-    public $attr_collections = array();
-
-    /**
-     * Associative array of deprecated tag name to HTMLPurifier_TagTransform
-     */
-    public $info_tag_transform = array();
-
-    /**
-     * List of HTMLPurifier_AttrTransform to be performed before validation.
-     */
-    public $info_attr_transform_pre = array();
-
-    /**
-     * List of HTMLPurifier_AttrTransform to be performed after validation.
-     */
-    public $info_attr_transform_post = array();
-
-    /**
-     * List of HTMLPurifier_Injector to be performed during well-formedness fixing.
-     * An injector will only be invoked if all of it's pre-requisites are met;
-     * if an injector fails setup, there will be no error; it will simply be
-     * silently disabled.
-     */
-    public $info_injector = array();
-
-    /**
-     * Boolean flag that indicates whether or not getChildDef is implemented.
-     * For optimization reasons: may save a call to a function. Be sure
-     * to set it if you do implement getChildDef(), otherwise it will have
-     * no effect!
-     */
-    public $defines_child_def = false;
-
-    /**
-     * Boolean flag whether or not this module is safe. If it is not safe, all
-     * of its members are unsafe. Modules are safe by default (this might be
-     * slightly dangerous, but it doesn't make much sense to force HTML Purifier,
-     * which is based off of safe HTML, to explicitly say, "This is safe," even
-     * though there are modules which are "unsafe")
-     *
-     * @note Previously, safety could be applied at an element level granularity.
-     *       We've removed this ability, so in order to add "unsafe" elements
-     *       or attributes, a dedicated module with this property set to false
-     *       must be used.
-     */
-    public $safe = true;
-
-    /**
-     * Retrieves a proper HTMLPurifier_ChildDef subclass based on
-     * content_model and content_model_type member variables of
-     * the HTMLPurifier_ElementDef class. There is a similar function
-     * in HTMLPurifier_HTMLDefinition.
-     * @param $def HTMLPurifier_ElementDef instance
-     * @return HTMLPurifier_ChildDef subclass
-     */
-    public function getChildDef($def) {return false;}
-
-    // -- Convenience -----------------------------------------------------
-
-    /**
-     * Convenience function that sets up a new element
-     * @param $element Name of element to add
-     * @param $type What content set should element be registered to?
-     *              Set as false to skip this step.
-     * @param $contents Allowed children in form of:
-     *              "$content_model_type: $content_model"
-     * @param $attr_includes What attribute collections to register to
-     *              element?
-     * @param $attr What unique attributes does the element define?
-     * @note See ElementDef for in-depth descriptions of these parameters.
-     * @return Created element definition object, so you
-     *         can set advanced parameters
-     */
-    public function addElement($element, $type, $contents, $attr_includes = array(), $attr = array()) {
-        $this->elements[] = $element;
-        // parse content_model
-        list($content_model_type, $content_model) = $this->parseContents($contents);
-        // merge in attribute inclusions
-        $this->mergeInAttrIncludes($attr, $attr_includes);
-        // add element to content sets
-        if ($type) $this->addElementToContentSet($element, $type);
-        // create element
-        $this->info[$element] = HTMLPurifier_ElementDef::create(
-            $content_model, $content_model_type, $attr
-        );
-        // literal object $contents means direct child manipulation
-        if (!is_string($contents)) $this->info[$element]->child = $contents;
-        return $this->info[$element];
-    }
-
-    /**
-     * Convenience function that creates a totally blank, non-standalone
-     * element.
-     * @param $element Name of element to create
-     * @return Created element
-     */
-    public function addBlankElement($element) {
-        if (!isset($this->info[$element])) {
-            $this->elements[] = $element;
-            $this->info[$element] = new HTMLPurifier_ElementDef();
-            $this->info[$element]->standalone = false;
-        } else {
-            trigger_error("Definition for $element already exists in module, cannot redefine");
-        }
-        return $this->info[$element];
-    }
-
-    /**
-     * Convenience function that registers an element to a content set
-     * @param Element to register
-     * @param Name content set (warning: case sensitive, usually upper-case
-     *        first letter)
-     */
-    public function addElementToContentSet($element, $type) {
-        if (!isset($this->content_sets[$type])) $this->content_sets[$type] = '';
-        else $this->content_sets[$type] .= ' | ';
-        $this->content_sets[$type] .= $element;
-    }
-
-    /**
-     * Convenience function that transforms single-string contents
-     * into separate content model and content model type
-     * @param $contents Allowed children in form of:
-     *                  "$content_model_type: $content_model"
-     * @note If contents is an object, an array of two nulls will be
-     *       returned, and the callee needs to take the original $contents
-     *       and use it directly.
-     */
-    public function parseContents($contents) {
-        if (!is_string($contents)) return array(null, null); // defer
-        switch ($contents) {
-            // check for shorthand content model forms
-            case 'Empty':
-                return array('empty', '');
-            case 'Inline':
-                return array('optional', 'Inline | #PCDATA');
-            case 'Flow':
-                return array('optional', 'Flow | #PCDATA');
-        }
-        list($content_model_type, $content_model) = explode(':', $contents);
-        $content_model_type = strtolower(trim($content_model_type));
-        $content_model = trim($content_model);
-        return array($content_model_type, $content_model);
-    }
-
-    /**
-     * Convenience function that merges a list of attribute includes into
-     * an attribute array.
-     * @param $attr Reference to attr array to modify
-     * @param $attr_includes Array of includes / string include to merge in
-     */
-    public function mergeInAttrIncludes(&$attr, $attr_includes) {
-        if (!is_array($attr_includes)) {
-            if (empty($attr_includes)) $attr_includes = array();
-            else $attr_includes = array($attr_includes);
-        }
-        $attr[0] = $attr_includes;
-    }
-
-    /**
-     * Convenience function that generates a lookup table with boolean
-     * true as value.
-     * @param $list List of values to turn into a lookup
-     * @note You can also pass an arbitrary number of arguments in
-     *       place of the regular argument
-     * @return Lookup array equivalent of list
-     */
-    public function makeLookup($list) {
-        if (is_string($list)) $list = func_get_args();
-        $ret = array();
-        foreach ($list as $value) {
-            if (is_null($value)) continue;
-            $ret[$value] = true;
-        }
-        return $ret;
-    }
-
-    /**
-     * Lazy load construction of the module after determining whether
-     * or not it's needed, and also when a finalized configuration object
-     * is available.
-     * @param $config Instance of HTMLPurifier_Config
-     */
-    public function setup($config) {}
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Bdo.php b/lib/php/HTMLPurifier/HTMLModule/Bdo.php
deleted file mode 100644
index 3d66f1b4e124681986fff442250006ab874dd009..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Bdo.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Bi-directional Text Module, defines elements that
- * declare directionality of content. Text Extension Module.
- */
-class HTMLPurifier_HTMLModule_Bdo extends HTMLPurifier_HTMLModule
-{
-
-    public $name = 'Bdo';
-    public $attr_collections = array(
-        'I18N' => array('dir' => false)
-    );
-
-    public function setup($config) {
-        $bdo = $this->addElement(
-            'bdo', 'Inline', 'Inline', array('Core', 'Lang'),
-            array(
-                'dir' => 'Enum#ltr,rtl', // required
-                // The Abstract Module specification has the attribute
-                // inclusions wrong for bdo: bdo allows Lang
-            )
-        );
-        $bdo->attr_transform_post['required-dir'] = new HTMLPurifier_AttrTransform_BdoDir();
-
-        $this->attr_collections['I18N']['dir'] = 'Enum#ltr,rtl';
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/CommonAttributes.php b/lib/php/HTMLPurifier/HTMLModule/CommonAttributes.php
deleted file mode 100644
index 7c15da84fc32938d97f879332eb5dfa17a893dae..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/CommonAttributes.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_CommonAttributes extends HTMLPurifier_HTMLModule
-{
-    public $name = 'CommonAttributes';
-
-    public $attr_collections = array(
-        'Core' => array(
-            0 => array('Style'),
-            // 'xml:space' => false,
-            'class' => 'Class',
-            'id' => 'ID',
-            'title' => 'CDATA',
-        ),
-        'Lang' => array(),
-        'I18N' => array(
-            0 => array('Lang'), // proprietary, for xml:lang/lang
-        ),
-        'Common' => array(
-            0 => array('Core', 'I18N')
-        )
-    );
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Edit.php b/lib/php/HTMLPurifier/HTMLModule/Edit.php
deleted file mode 100644
index ff93690555fc76ce60c598d7e18df0c53dc5afc3..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Edit.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Edit Module, defines editing-related elements. Text Extension
- * Module.
- */
-class HTMLPurifier_HTMLModule_Edit extends HTMLPurifier_HTMLModule
-{
-
-    public $name = 'Edit';
-
-    public function setup($config) {
-        $contents = 'Chameleon: #PCDATA | Inline ! #PCDATA | Flow';
-        $attr = array(
-            'cite' => 'URI',
-            // 'datetime' => 'Datetime', // not implemented
-        );
-        $this->addElement('del', 'Inline', $contents, 'Common', $attr);
-        $this->addElement('ins', 'Inline', $contents, 'Common', $attr);
-    }
-
-    // HTML 4.01 specifies that ins/del must not contain block
-    // elements when used in an inline context, chameleon is
-    // a complicated workaround to acheive this effect
-
-    // Inline context ! Block context (exclamation mark is
-    // separator, see getChildDef for parsing)
-
-    public $defines_child_def = true;
-    public function getChildDef($def) {
-        if ($def->content_model_type != 'chameleon') return false;
-        $value = explode('!', $def->content_model);
-        return new HTMLPurifier_ChildDef_Chameleon($value[0], $value[1]);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Forms.php b/lib/php/HTMLPurifier/HTMLModule/Forms.php
deleted file mode 100644
index 44c22f6f8b53283d5bc2a28608d5b997d9cb2fb1..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Forms.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Forms module, defines all form-related elements found in HTML 4.
- */
-class HTMLPurifier_HTMLModule_Forms extends HTMLPurifier_HTMLModule
-{
-    public $name = 'Forms';
-    public $safe = false;
-
-    public $content_sets = array(
-        'Block' => 'Form',
-        'Inline' => 'Formctrl',
-    );
-
-    public function setup($config) {
-        $form = $this->addElement('form', 'Form',
-          'Required: Heading | List | Block | fieldset', 'Common', array(
-            'accept' => 'ContentTypes',
-            'accept-charset' => 'Charsets',
-            'action*' => 'URI',
-            'method' => 'Enum#get,post',
-            // really ContentType, but these two are the only ones used today
-            'enctype' => 'Enum#application/x-www-form-urlencoded,multipart/form-data',
-        ));
-        $form->excludes = array('form' => true);
-
-        $input = $this->addElement('input', 'Formctrl', 'Empty', 'Common', array(
-            'accept' => 'ContentTypes',
-            'accesskey' => 'Character',
-            'alt' => 'Text',
-            'checked' => 'Bool#checked',
-            'disabled' => 'Bool#disabled',
-            'maxlength' => 'Number',
-            'name' => 'CDATA',
-            'readonly' => 'Bool#readonly',
-            'size' => 'Number',
-            'src' => 'URI#embeds',
-            'tabindex' => 'Number',
-            'type' => 'Enum#text,password,checkbox,button,radio,submit,reset,file,hidden,image',
-            'value' => 'CDATA',
-        ));
-        $input->attr_transform_post[] = new HTMLPurifier_AttrTransform_Input();
-
-        $this->addElement('select', 'Formctrl', 'Required: optgroup | option', 'Common', array(
-            'disabled' => 'Bool#disabled',
-            'multiple' => 'Bool#multiple',
-            'name' => 'CDATA',
-            'size' => 'Number',
-            'tabindex' => 'Number',
-        ));
-
-        $this->addElement('option', false, 'Optional: #PCDATA', 'Common', array(
-            'disabled' => 'Bool#disabled',
-            'label' => 'Text',
-            'selected' => 'Bool#selected',
-            'value' => 'CDATA',
-        ));
-        // It's illegal for there to be more than one selected, but not
-        // be multiple. Also, no selected means undefined behavior. This might
-        // be difficult to implement; perhaps an injector, or a context variable.
-
-        $textarea = $this->addElement('textarea', 'Formctrl', 'Optional: #PCDATA', 'Common', array(
-            'accesskey' => 'Character',
-            'cols*' => 'Number',
-            'disabled' => 'Bool#disabled',
-            'name' => 'CDATA',
-            'readonly' => 'Bool#readonly',
-            'rows*' => 'Number',
-            'tabindex' => 'Number',
-        ));
-        $textarea->attr_transform_pre[] = new HTMLPurifier_AttrTransform_Textarea();
-
-        $button = $this->addElement('button', 'Formctrl', 'Optional: #PCDATA | Heading | List | Block | Inline', 'Common', array(
-            'accesskey' => 'Character',
-            'disabled' => 'Bool#disabled',
-            'name' => 'CDATA',
-            'tabindex' => 'Number',
-            'type' => 'Enum#button,submit,reset',
-            'value' => 'CDATA',
-        ));
-
-        // For exclusions, ideally we'd specify content sets, not literal elements
-        $button->excludes = $this->makeLookup(
-            'form', 'fieldset', // Form
-            'input', 'select', 'textarea', 'label', 'button', // Formctrl
-            'a' // as per HTML 4.01 spec, this is omitted by modularization
-        );
-
-        // Extra exclusion: img usemap="" is not permitted within this element.
-        // We'll omit this for now, since we don't have any good way of
-        // indicating it yet.
-
-        // This is HIGHLY user-unfriendly; we need a custom child-def for this
-        $this->addElement('fieldset', 'Form', 'Custom: (#WS?,legend,(Flow|#PCDATA)*)', 'Common');
-
-        $label = $this->addElement('label', 'Formctrl', 'Optional: #PCDATA | Inline', 'Common', array(
-            'accesskey' => 'Character',
-            // 'for' => 'IDREF', // IDREF not implemented, cannot allow
-        ));
-        $label->excludes = array('label' => true);
-
-        $this->addElement('legend', false, 'Optional: #PCDATA | Inline', 'Common', array(
-            'accesskey' => 'Character',
-        ));
-
-        $this->addElement('optgroup', false, 'Required: option', 'Common', array(
-            'disabled' => 'Bool#disabled',
-            'label*' => 'Text',
-        ));
-
-        // Don't forget an injector for <isindex>. This one's a little complex
-        // because it maps to multiple elements.
-
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Hypertext.php b/lib/php/HTMLPurifier/HTMLModule/Hypertext.php
deleted file mode 100644
index d7e9bdd27ee1814fe8fc054707ea4779608b6ad7..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Hypertext.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Hypertext Module, defines hypertext links. Core Module.
- */
-class HTMLPurifier_HTMLModule_Hypertext extends HTMLPurifier_HTMLModule
-{
-
-    public $name = 'Hypertext';
-
-    public function setup($config) {
-        $a = $this->addElement(
-            'a', 'Inline', 'Inline', 'Common',
-            array(
-                // 'accesskey' => 'Character',
-                // 'charset' => 'Charset',
-                'href' => 'URI',
-                // 'hreflang' => 'LanguageCode',
-                'rel' => new HTMLPurifier_AttrDef_HTML_LinkTypes('rel'),
-                'rev' => new HTMLPurifier_AttrDef_HTML_LinkTypes('rev'),
-                // 'tabindex' => 'Number',
-                // 'type' => 'ContentType',
-            )
-        );
-        $a->formatting = true;
-        $a->excludes = array('a' => true);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Image.php b/lib/php/HTMLPurifier/HTMLModule/Image.php
deleted file mode 100644
index 948d435bcda99e04c30b25ab6402bbb2da8e3716..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Image.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Image Module provides basic image embedding.
- * @note There is specialized code for removing empty images in
- *       HTMLPurifier_Strategy_RemoveForeignElements
- */
-class HTMLPurifier_HTMLModule_Image extends HTMLPurifier_HTMLModule
-{
-
-    public $name = 'Image';
-
-    public function setup($config) {
-        $max = $config->get('HTML.MaxImgLength');
-        $img = $this->addElement(
-            'img', 'Inline', 'Empty', 'Common',
-            array(
-                'alt*' => 'Text',
-                // According to the spec, it's Length, but percents can
-                // be abused, so we allow only Pixels.
-                'height' => 'Pixels#' . $max,
-                'width'  => 'Pixels#' . $max,
-                'longdesc' => 'URI',
-                'src*' => new HTMLPurifier_AttrDef_URI(true), // embedded
-            )
-        );
-        if ($max === null || $config->get('HTML.Trusted')) {
-            $img->attr['height'] =
-            $img->attr['width'] = 'Length';
-        }
-
-        // kind of strange, but splitting things up would be inefficient
-        $img->attr_transform_pre[] =
-        $img->attr_transform_post[] =
-            new HTMLPurifier_AttrTransform_ImgRequired();
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Legacy.php b/lib/php/HTMLPurifier/HTMLModule/Legacy.php
deleted file mode 100644
index df33927ba6b27d6e7f0151545bd3a9cda929eb60..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Legacy.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Legacy module defines elements that were previously
- * deprecated.
- *
- * @note Not all legacy elements have been implemented yet, which
- *       is a bit of a reverse problem as compared to browsers! In
- *       addition, this legacy module may implement a bit more than
- *       mandated by XHTML 1.1.
- *
- * This module can be used in combination with TransformToStrict in order
- * to transform as many deprecated elements as possible, but retain
- * questionably deprecated elements that do not have good alternatives
- * as well as transform elements that don't have an implementation.
- * See docs/ref-strictness.txt for more details.
- */
-
-class HTMLPurifier_HTMLModule_Legacy extends HTMLPurifier_HTMLModule
-{
-
-    public $name = 'Legacy';
-
-    public function setup($config) {
-
-        $this->addElement('basefont', 'Inline', 'Empty', false, array(
-            'color' => 'Color',
-            'face' => 'Text', // extremely broad, we should
-            'size' => 'Text', // tighten it
-            'id' => 'ID'
-        ));
-        $this->addElement('center', 'Block', 'Flow', 'Common');
-        $this->addElement('dir', 'Block', 'Required: li', 'Common', array(
-            'compact' => 'Bool#compact'
-        ));
-        $this->addElement('font', 'Inline', 'Inline', array('Core', 'I18N'), array(
-            'color' => 'Color',
-            'face' => 'Text', // extremely broad, we should
-            'size' => 'Text', // tighten it
-        ));
-        $this->addElement('menu', 'Block', 'Required: li', 'Common', array(
-            'compact' => 'Bool#compact'
-        ));
-
-        $s = $this->addElement('s', 'Inline', 'Inline', 'Common');
-        $s->formatting = true;
-
-        $strike = $this->addElement('strike', 'Inline', 'Inline', 'Common');
-        $strike->formatting = true;
-
-        $u = $this->addElement('u', 'Inline', 'Inline', 'Common');
-        $u->formatting = true;
-
-        // setup modifications to old elements
-
-        $align = 'Enum#left,right,center,justify';
-
-        $address = $this->addBlankElement('address');
-        $address->content_model = 'Inline | #PCDATA | p';
-        $address->content_model_type = 'optional';
-        $address->child = false;
-
-        $blockquote = $this->addBlankElement('blockquote');
-        $blockquote->content_model = 'Flow | #PCDATA';
-        $blockquote->content_model_type = 'optional';
-        $blockquote->child = false;
-
-        $br = $this->addBlankElement('br');
-        $br->attr['clear'] = 'Enum#left,all,right,none';
-
-        $caption = $this->addBlankElement('caption');
-        $caption->attr['align'] = 'Enum#top,bottom,left,right';
-
-        $div = $this->addBlankElement('div');
-        $div->attr['align'] = $align;
-
-        $dl = $this->addBlankElement('dl');
-        $dl->attr['compact'] = 'Bool#compact';
-
-        for ($i = 1; $i <= 6; $i++) {
-            $h = $this->addBlankElement("h$i");
-            $h->attr['align'] = $align;
-        }
-
-        $hr = $this->addBlankElement('hr');
-        $hr->attr['align'] = $align;
-        $hr->attr['noshade'] = 'Bool#noshade';
-        $hr->attr['size'] = 'Pixels';
-        $hr->attr['width'] = 'Length';
-
-        $img = $this->addBlankElement('img');
-        $img->attr['align'] = 'Enum#top,middle,bottom,left,right';
-        $img->attr['border'] = 'Pixels';
-        $img->attr['hspace'] = 'Pixels';
-        $img->attr['vspace'] = 'Pixels';
-
-        // figure out this integer business
-
-        $li = $this->addBlankElement('li');
-        $li->attr['value'] = new HTMLPurifier_AttrDef_Integer();
-        $li->attr['type']  = 'Enum#s:1,i,I,a,A,disc,square,circle';
-
-        $ol = $this->addBlankElement('ol');
-        $ol->attr['compact'] = 'Bool#compact';
-        $ol->attr['start'] = new HTMLPurifier_AttrDef_Integer();
-        $ol->attr['type'] = 'Enum#s:1,i,I,a,A';
-
-        $p = $this->addBlankElement('p');
-        $p->attr['align'] = $align;
-
-        $pre = $this->addBlankElement('pre');
-        $pre->attr['width'] = 'Number';
-
-        // script omitted
-
-        $table = $this->addBlankElement('table');
-        $table->attr['align'] = 'Enum#left,center,right';
-        $table->attr['bgcolor'] = 'Color';
-
-        $tr = $this->addBlankElement('tr');
-        $tr->attr['bgcolor'] = 'Color';
-
-        $th = $this->addBlankElement('th');
-        $th->attr['bgcolor'] = 'Color';
-        $th->attr['height'] = 'Length';
-        $th->attr['nowrap'] = 'Bool#nowrap';
-        $th->attr['width'] = 'Length';
-
-        $td = $this->addBlankElement('td');
-        $td->attr['bgcolor'] = 'Color';
-        $td->attr['height'] = 'Length';
-        $td->attr['nowrap'] = 'Bool#nowrap';
-        $td->attr['width'] = 'Length';
-
-        $ul = $this->addBlankElement('ul');
-        $ul->attr['compact'] = 'Bool#compact';
-        $ul->attr['type'] = 'Enum#square,disc,circle';
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/List.php b/lib/php/HTMLPurifier/HTMLModule/List.php
deleted file mode 100644
index 1d15f27293df88085fda3e9ef8aba988bfa25c18..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/List.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 List Module, defines list-oriented elements. Core Module.
- */
-class HTMLPurifier_HTMLModule_List extends HTMLPurifier_HTMLModule
-{
-
-    public $name = 'List';
-
-    // According to the abstract schema, the List content set is a fully formed
-    // one or more expr, but it invariably occurs in an optional declaration
-    // so we're not going to do that subtlety. It might cause trouble
-    // if a user defines "List" and expects that multiple lists are
-    // allowed to be specified, but then again, that's not very intuitive.
-    // Furthermore, the actual XML Schema may disagree. Regardless,
-    // we don't have support for such nested expressions without using
-    // the incredibly inefficient and draconic Custom ChildDef.
-
-    public $content_sets = array('Flow' => 'List');
-
-    public function setup($config) {
-        $this->addElement('ol', 'List', 'Required: li', 'Common');
-        $this->addElement('ul', 'List', 'Required: li', 'Common');
-        $this->addElement('dl', 'List', 'Required: dt | dd', 'Common');
-
-        $this->addElement('li', false, 'Flow', 'Common');
-
-        $this->addElement('dd', false, 'Flow', 'Common');
-        $this->addElement('dt', false, 'Inline', 'Common');
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Name.php b/lib/php/HTMLPurifier/HTMLModule/Name.php
deleted file mode 100644
index 05694b450424e0a63a00e52c21930955b3699776..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Name.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Name extends HTMLPurifier_HTMLModule
-{
-
-    public $name = 'Name';
-
-    public function setup($config) {
-        $elements = array('a', 'applet', 'form', 'frame', 'iframe', 'img', 'map');
-        foreach ($elements as $name) {
-            $element = $this->addBlankElement($name);
-            $element->attr['name'] = 'CDATA';
-            if (!$config->get('HTML.Attr.Name.UseCDATA')) {
-                $element->attr_transform_post['NameSync'] = new HTMLPurifier_AttrTransform_NameSync();
-            }
-        }
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php b/lib/php/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
deleted file mode 100644
index 5f1b14abb8a572f84614429a3020aefff1f6f718..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_NonXMLCommonAttributes extends HTMLPurifier_HTMLModule
-{
-    public $name = 'NonXMLCommonAttributes';
-
-    public $attr_collections = array(
-        'Lang' => array(
-            'lang' => 'LanguageCode',
-        )
-    );
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Object.php b/lib/php/HTMLPurifier/HTMLModule/Object.php
deleted file mode 100644
index 193c1011f84e532adb1ae4da33b039c43157a2c0..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Object.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Object Module, defines elements for generic object inclusion
- * @warning Users will commonly use <embed> to cater to legacy browsers: this
- *      module does not allow this sort of behavior
- */
-class HTMLPurifier_HTMLModule_Object extends HTMLPurifier_HTMLModule
-{
-
-    public $name = 'Object';
-    public $safe = false;
-
-    public function setup($config) {
-
-        $this->addElement('object', 'Inline', 'Optional: #PCDATA | Flow | param', 'Common',
-            array(
-                'archive' => 'URI',
-                'classid' => 'URI',
-                'codebase' => 'URI',
-                'codetype' => 'Text',
-                'data' => 'URI',
-                'declare' => 'Bool#declare',
-                'height' => 'Length',
-                'name' => 'CDATA',
-                'standby' => 'Text',
-                'tabindex' => 'Number',
-                'type' => 'ContentType',
-                'width' => 'Length'
-            )
-        );
-
-        $this->addElement('param', false, 'Empty', false,
-            array(
-                'id' => 'ID',
-                'name*' => 'Text',
-                'type' => 'Text',
-                'value' => 'Text',
-                'valuetype' => 'Enum#data,ref,object'
-           )
-        );
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Presentation.php b/lib/php/HTMLPurifier/HTMLModule/Presentation.php
deleted file mode 100644
index 8ff0b5ed7848e9872354e53ddb05d44d74f2713d..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Presentation.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Presentation Module, defines simple presentation-related
- * markup. Text Extension Module.
- * @note The official XML Schema and DTD specs further divide this into
- *       two modules:
- *          - Block Presentation (hr)
- *          - Inline Presentation (b, big, i, small, sub, sup, tt)
- *       We have chosen not to heed this distinction, as content_sets
- *       provides satisfactory disambiguation.
- */
-class HTMLPurifier_HTMLModule_Presentation extends HTMLPurifier_HTMLModule
-{
-
-    public $name = 'Presentation';
-
-    public function setup($config) {
-        $this->addElement('hr',     'Block',  'Empty',  'Common');
-        $this->addElement('sub',    'Inline', 'Inline', 'Common');
-        $this->addElement('sup',    'Inline', 'Inline', 'Common');
-        $b = $this->addElement('b',      'Inline', 'Inline', 'Common');
-        $b->formatting = true;
-        $big = $this->addElement('big',    'Inline', 'Inline', 'Common');
-        $big->formatting = true;
-        $i = $this->addElement('i',      'Inline', 'Inline', 'Common');
-        $i->formatting = true;
-        $small = $this->addElement('small',  'Inline', 'Inline', 'Common');
-        $small->formatting = true;
-        $tt = $this->addElement('tt',     'Inline', 'Inline', 'Common');
-        $tt->formatting = true;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Proprietary.php b/lib/php/HTMLPurifier/HTMLModule/Proprietary.php
deleted file mode 100644
index dd36a3de0efc0d45f36dd5d9f3868f487b5d1cc5..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Proprietary.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Module defines proprietary tags and attributes in HTML.
- * @warning If this module is enabled, standards-compliance is off!
- */
-class HTMLPurifier_HTMLModule_Proprietary extends HTMLPurifier_HTMLModule
-{
-
-    public $name = 'Proprietary';
-
-    public function setup($config) {
-
-        $this->addElement('marquee', 'Inline', 'Flow', 'Common',
-            array(
-                'direction' => 'Enum#left,right,up,down',
-                'behavior' => 'Enum#alternate',
-                'width' => 'Length',
-                'height' => 'Length',
-                'scrolldelay' => 'Number',
-                'scrollamount' => 'Number',
-                'loop' => 'Number',
-                'bgcolor' => 'Color',
-                'hspace' => 'Pixels',
-                'vspace' => 'Pixels',
-            )
-        );
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Ruby.php b/lib/php/HTMLPurifier/HTMLModule/Ruby.php
deleted file mode 100644
index b26a0a30a0e1f4c3fefcddd457231d1ee1f164f0..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Ruby.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Ruby Annotation Module, defines elements that indicate
- * short runs of text alongside base text for annotation or pronounciation.
- */
-class HTMLPurifier_HTMLModule_Ruby extends HTMLPurifier_HTMLModule
-{
-
-    public $name = 'Ruby';
-
-    public function setup($config) {
-        $this->addElement('ruby', 'Inline',
-            'Custom: ((rb, (rt | (rp, rt, rp))) | (rbc, rtc, rtc?))',
-            'Common');
-        $this->addElement('rbc', false, 'Required: rb', 'Common');
-        $this->addElement('rtc', false, 'Required: rt', 'Common');
-        $rb = $this->addElement('rb', false, 'Inline', 'Common');
-        $rb->excludes = array('ruby' => true);
-        $rt = $this->addElement('rt', false, 'Inline', 'Common', array('rbspan' => 'Number'));
-        $rt->excludes = array('ruby' => true);
-        $this->addElement('rp', false, 'Optional: #PCDATA', 'Common');
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/SafeEmbed.php b/lib/php/HTMLPurifier/HTMLModule/SafeEmbed.php
deleted file mode 100644
index 8fc03cb1c7eaa924c89ea814f9f7ce719616a2f0..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/SafeEmbed.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * A "safe" embed module. See SafeObject. This is a proprietary element.
- */
-class HTMLPurifier_HTMLModule_SafeEmbed extends HTMLPurifier_HTMLModule
-{
-
-    public $name = 'SafeEmbed';
-
-    public function setup($config) {
-
-        $max = $config->get('HTML.MaxImgLength');
-        $embed = $this->addElement(
-            'embed', 'Inline', 'Empty', 'Common',
-            array(
-                'src*' => 'URI#embedded',
-                'type' => 'Enum#application/x-shockwave-flash',
-                'width' => 'Pixels#' . $max,
-                'height' => 'Pixels#' . $max,
-                'allowscriptaccess' => 'Enum#never',
-                'allownetworking' => 'Enum#internal',
-                'wmode' => 'Enum#window',
-                'name' => 'ID',
-            )
-        );
-        $embed->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeEmbed();
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/SafeObject.php b/lib/php/HTMLPurifier/HTMLModule/SafeObject.php
deleted file mode 100644
index 33bac00cf24e2a37f4b543524f1b49d184d5732d..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/SafeObject.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * A "safe" object module. In theory, objects permitted by this module will
- * be safe, and untrusted users can be allowed to embed arbitrary flash objects
- * (maybe other types too, but only Flash is supported as of right now).
- * Highly experimental.
- */
-class HTMLPurifier_HTMLModule_SafeObject extends HTMLPurifier_HTMLModule
-{
-
-    public $name = 'SafeObject';
-
-    public function setup($config) {
-
-        // These definitions are not intrinsically safe: the attribute transforms
-        // are a vital part of ensuring safety.
-
-        $max = $config->get('HTML.MaxImgLength');
-        $object = $this->addElement(
-            'object',
-            'Inline',
-            'Optional: param | Flow | #PCDATA',
-            'Common',
-            array(
-                // While technically not required by the spec, we're forcing
-                // it to this value.
-                'type'   => 'Enum#application/x-shockwave-flash',
-                'width'  => 'Pixels#' . $max,
-                'height' => 'Pixels#' . $max,
-                'data'   => 'URI#embedded'
-            )
-        );
-        $object->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeObject();
-
-        $param = $this->addElement('param', false, 'Empty', false,
-            array(
-                'id' => 'ID',
-                'name*' => 'Text',
-                'value' => 'Text'
-            )
-        );
-        $param->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeParam();
-        $this->info_injector[] = 'SafeObject';
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Scripting.php b/lib/php/HTMLPurifier/HTMLModule/Scripting.php
deleted file mode 100644
index cecdea6c30a88a5d6e5556fdbf450705c434f09d..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Scripting.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
-
-WARNING: THIS MODULE IS EXTREMELY DANGEROUS AS IT ENABLES INLINE SCRIPTING
-INSIDE HTML PURIFIER DOCUMENTS. USE ONLY WITH TRUSTED USER INPUT!!!
-
-*/
-
-/**
- * XHTML 1.1 Scripting module, defines elements that are used to contain
- * information pertaining to executable scripts or the lack of support
- * for executable scripts.
- * @note This module does not contain inline scripting elements
- */
-class HTMLPurifier_HTMLModule_Scripting extends HTMLPurifier_HTMLModule
-{
-    public $name = 'Scripting';
-    public $elements = array('script', 'noscript');
-    public $content_sets = array('Block' => 'script | noscript', 'Inline' => 'script | noscript');
-    public $safe = false;
-
-    public function setup($config) {
-        // TODO: create custom child-definition for noscript that
-        // auto-wraps stray #PCDATA in a similar manner to
-        // blockquote's custom definition (we would use it but
-        // blockquote's contents are optional while noscript's contents
-        // are required)
-
-        // TODO: convert this to new syntax, main problem is getting
-        // both content sets working
-
-        // In theory, this could be safe, but I don't see any reason to
-        // allow it.
-        $this->info['noscript'] = new HTMLPurifier_ElementDef();
-        $this->info['noscript']->attr = array( 0 => array('Common') );
-        $this->info['noscript']->content_model = 'Heading | List | Block';
-        $this->info['noscript']->content_model_type = 'required';
-
-        $this->info['script'] = new HTMLPurifier_ElementDef();
-        $this->info['script']->attr = array(
-            'defer' => new HTMLPurifier_AttrDef_Enum(array('defer')),
-            'src'   => new HTMLPurifier_AttrDef_URI(true),
-            'type'  => new HTMLPurifier_AttrDef_Enum(array('text/javascript'))
-        );
-        $this->info['script']->content_model = '#PCDATA';
-        $this->info['script']->content_model_type = 'optional';
-        $this->info['script']->attr_transform_pre['type'] =
-        $this->info['script']->attr_transform_post['type'] =
-            new HTMLPurifier_AttrTransform_ScriptRequired();
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/StyleAttribute.php b/lib/php/HTMLPurifier/HTMLModule/StyleAttribute.php
deleted file mode 100644
index eb78464cc0d6ae1450b1f5c9edc3f9844a6b9f8d..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/StyleAttribute.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Edit Module, defines editing-related elements. Text Extension
- * Module.
- */
-class HTMLPurifier_HTMLModule_StyleAttribute extends HTMLPurifier_HTMLModule
-{
-
-    public $name = 'StyleAttribute';
-    public $attr_collections = array(
-        // The inclusion routine differs from the Abstract Modules but
-        // is in line with the DTD and XML Schemas.
-        'Style' => array('style' => false), // see constructor
-        'Core' => array(0 => array('Style'))
-    );
-
-    public function setup($config) {
-        $this->attr_collections['Style']['style'] = new HTMLPurifier_AttrDef_CSS();
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Tables.php b/lib/php/HTMLPurifier/HTMLModule/Tables.php
deleted file mode 100644
index f314ced3f82ea6e36346d057f6404252b78c74f1..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Tables.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Tables Module, fully defines accessible table elements.
- */
-class HTMLPurifier_HTMLModule_Tables extends HTMLPurifier_HTMLModule
-{
-
-    public $name = 'Tables';
-
-    public function setup($config) {
-
-        $this->addElement('caption', false, 'Inline', 'Common');
-
-        $this->addElement('table', 'Block',
-            new HTMLPurifier_ChildDef_Table(),  'Common',
-            array(
-                'border' => 'Pixels',
-                'cellpadding' => 'Length',
-                'cellspacing' => 'Length',
-                'frame' => 'Enum#void,above,below,hsides,lhs,rhs,vsides,box,border',
-                'rules' => 'Enum#none,groups,rows,cols,all',
-                'summary' => 'Text',
-                'width' => 'Length'
-            )
-        );
-
-        // common attributes
-        $cell_align = array(
-            'align' => 'Enum#left,center,right,justify,char',
-            'charoff' => 'Length',
-            'valign' => 'Enum#top,middle,bottom,baseline',
-        );
-
-        $cell_t = array_merge(
-            array(
-                'abbr'    => 'Text',
-                'colspan' => 'Number',
-                'rowspan' => 'Number',
-            ),
-            $cell_align
-        );
-        $this->addElement('td', false, 'Flow', 'Common', $cell_t);
-        $this->addElement('th', false, 'Flow', 'Common', $cell_t);
-
-        $this->addElement('tr', false, 'Required: td | th', 'Common', $cell_align);
-
-        $cell_col = array_merge(
-            array(
-                'span'  => 'Number',
-                'width' => 'MultiLength',
-            ),
-            $cell_align
-        );
-        $this->addElement('col',      false, 'Empty',         'Common', $cell_col);
-        $this->addElement('colgroup', false, 'Optional: col', 'Common', $cell_col);
-
-        $this->addElement('tbody', false, 'Required: tr', 'Common', $cell_align);
-        $this->addElement('thead', false, 'Required: tr', 'Common', $cell_align);
-        $this->addElement('tfoot', false, 'Required: tr', 'Common', $cell_align);
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Target.php b/lib/php/HTMLPurifier/HTMLModule/Target.php
deleted file mode 100644
index 2b844ecc45dbe591d4019e93621ac8d2f68994a6..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Target.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Target Module, defines target attribute in link elements.
- */
-class HTMLPurifier_HTMLModule_Target extends HTMLPurifier_HTMLModule
-{
-
-    public $name = 'Target';
-
-    public function setup($config) {
-        $elements = array('a');
-        foreach ($elements as $name) {
-            $e = $this->addBlankElement($name);
-            $e->attr = array(
-                'target' => new HTMLPurifier_AttrDef_HTML_FrameTarget()
-            );
-        }
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Text.php b/lib/php/HTMLPurifier/HTMLModule/Text.php
deleted file mode 100644
index ae77c71886e09a10e5311eda78aeb718263c583b..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Text.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * XHTML 1.1 Text Module, defines basic text containers. Core Module.
- * @note In the normative XML Schema specification, this module
- *       is further abstracted into the following modules:
- *          - Block Phrasal (address, blockquote, pre, h1, h2, h3, h4, h5, h6)
- *          - Block Structural (div, p)
- *          - Inline Phrasal (abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var)
- *          - Inline Structural (br, span)
- *       This module, functionally, does not distinguish between these
- *       sub-modules, but the code is internally structured to reflect
- *       these distinctions.
- */
-class HTMLPurifier_HTMLModule_Text extends HTMLPurifier_HTMLModule
-{
-
-    public $name = 'Text';
-    public $content_sets = array(
-        'Flow' => 'Heading | Block | Inline'
-    );
-
-    public function setup($config) {
-
-        // Inline Phrasal -------------------------------------------------
-        $this->addElement('abbr',    'Inline', 'Inline', 'Common');
-        $this->addElement('acronym', 'Inline', 'Inline', 'Common');
-        $this->addElement('cite',    'Inline', 'Inline', 'Common');
-        $this->addElement('dfn',     'Inline', 'Inline', 'Common');
-        $this->addElement('kbd',     'Inline', 'Inline', 'Common');
-        $this->addElement('q',       'Inline', 'Inline', 'Common', array('cite' => 'URI'));
-        $this->addElement('samp',    'Inline', 'Inline', 'Common');
-        $this->addElement('var',     'Inline', 'Inline', 'Common');
-
-        $em = $this->addElement('em',      'Inline', 'Inline', 'Common');
-        $em->formatting = true;
-
-        $strong = $this->addElement('strong',  'Inline', 'Inline', 'Common');
-        $strong->formatting = true;
-
-        $code = $this->addElement('code',    'Inline', 'Inline', 'Common');
-        $code->formatting = true;
-
-        // Inline Structural ----------------------------------------------
-        $this->addElement('span', 'Inline', 'Inline', 'Common');
-        $this->addElement('br',   'Inline', 'Empty',  'Core');
-
-        // Block Phrasal --------------------------------------------------
-        $this->addElement('address',     'Block', 'Inline', 'Common');
-        $this->addElement('blockquote',  'Block', 'Optional: Heading | Block | List', 'Common', array('cite' => 'URI') );
-        $pre = $this->addElement('pre', 'Block', 'Inline', 'Common');
-        $pre->excludes = $this->makeLookup(
-            'img', 'big', 'small', 'object', 'applet', 'font', 'basefont' );
-        $this->addElement('h1', 'Heading', 'Inline', 'Common');
-        $this->addElement('h2', 'Heading', 'Inline', 'Common');
-        $this->addElement('h3', 'Heading', 'Inline', 'Common');
-        $this->addElement('h4', 'Heading', 'Inline', 'Common');
-        $this->addElement('h5', 'Heading', 'Inline', 'Common');
-        $this->addElement('h6', 'Heading', 'Inline', 'Common');
-
-        // Block Structural -----------------------------------------------
-        $p = $this->addElement('p', 'Block', 'Inline', 'Common');
-        $p->autoclose = array_flip(array("address", "blockquote", "center", "dir", "div", "dl", "fieldset", "ol", "p", "ul"));
-
-        $this->addElement('div', 'Block', 'Flow', 'Common');
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Tidy.php b/lib/php/HTMLPurifier/HTMLModule/Tidy.php
deleted file mode 100644
index 21783f18eb82bf9de772ce2d0d8f807cba93944c..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Tidy.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-
-/**
- * Abstract class for a set of proprietary modules that clean up (tidy)
- * poorly written HTML.
- * @todo Figure out how to protect some of these methods/properties
- */
-class HTMLPurifier_HTMLModule_Tidy extends HTMLPurifier_HTMLModule
-{
-
-    /**
-     * List of supported levels. Index zero is a special case "no fixes"
-     * level.
-     */
-    public $levels = array(0 => 'none', 'light', 'medium', 'heavy');
-
-    /**
-     * Default level to place all fixes in. Disabled by default
-     */
-    public $defaultLevel = null;
-
-    /**
-     * Lists of fixes used by getFixesForLevel(). Format is:
-     *      HTMLModule_Tidy->fixesForLevel[$level] = array('fix-1', 'fix-2');
-     */
-    public $fixesForLevel = array(
-        'light'  => array(),
-        'medium' => array(),
-        'heavy'  => array()
-    );
-
-    /**
-     * Lazy load constructs the module by determining the necessary
-     * fixes to create and then delegating to the populate() function.
-     * @todo Wildcard matching and error reporting when an added or
-     *       subtracted fix has no effect.
-     */
-    public function setup($config) {
-
-        // create fixes, initialize fixesForLevel
-        $fixes = $this->makeFixes();
-        $this->makeFixesForLevel($fixes);
-
-        // figure out which fixes to use
-        $level = $config->get('HTML.TidyLevel');
-        $fixes_lookup = $this->getFixesForLevel($level);
-
-        // get custom fix declarations: these need namespace processing
-        $add_fixes    = $config->get('HTML.TidyAdd');
-        $remove_fixes = $config->get('HTML.TidyRemove');
-
-        foreach ($fixes as $name => $fix) {
-            // needs to be refactored a little to implement globbing
-            if (
-                isset($remove_fixes[$name]) ||
-                (!isset($add_fixes[$name]) && !isset($fixes_lookup[$name]))
-            ) {
-                unset($fixes[$name]);
-            }
-        }
-
-        // populate this module with necessary fixes
-        $this->populate($fixes);
-
-    }
-
-    /**
-     * Retrieves all fixes per a level, returning fixes for that specific
-     * level as well as all levels below it.
-     * @param $level String level identifier, see $levels for valid values
-     * @return Lookup up table of fixes
-     */
-    public function getFixesForLevel($level) {
-        if ($level == $this->levels[0]) {
-            return array();
-        }
-        $activated_levels = array();
-        for ($i = 1, $c = count($this->levels); $i < $c; $i++) {
-            $activated_levels[] = $this->levels[$i];
-            if ($this->levels[$i] == $level) break;
-        }
-        if ($i == $c) {
-            trigger_error(
-                'Tidy level ' . htmlspecialchars($level) . ' not recognized',
-                E_USER_WARNING
-            );
-            return array();
-        }
-        $ret = array();
-        foreach ($activated_levels as $level) {
-            foreach ($this->fixesForLevel[$level] as $fix) {
-                $ret[$fix] = true;
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Dynamically populates the $fixesForLevel member variable using
-     * the fixes array. It may be custom overloaded, used in conjunction
-     * with $defaultLevel, or not used at all.
-     */
-    public function makeFixesForLevel($fixes) {
-        if (!isset($this->defaultLevel)) return;
-        if (!isset($this->fixesForLevel[$this->defaultLevel])) {
-            trigger_error(
-                'Default level ' . $this->defaultLevel . ' does not exist',
-                E_USER_ERROR
-            );
-            return;
-        }
-        $this->fixesForLevel[$this->defaultLevel] = array_keys($fixes);
-    }
-
-    /**
-     * Populates the module with transforms and other special-case code
-     * based on a list of fixes passed to it
-     * @param $lookup Lookup table of fixes to activate
-     */
-    public function populate($fixes) {
-        foreach ($fixes as $name => $fix) {
-            // determine what the fix is for
-            list($type, $params) = $this->getFixType($name);
-            switch ($type) {
-                case 'attr_transform_pre':
-                case 'attr_transform_post':
-                    $attr = $params['attr'];
-                    if (isset($params['element'])) {
-                        $element = $params['element'];
-                        if (empty($this->info[$element])) {
-                            $e = $this->addBlankElement($element);
-                        } else {
-                            $e = $this->info[$element];
-                        }
-                    } else {
-                        $type = "info_$type";
-                        $e = $this;
-                    }
-                    // PHP does some weird parsing when I do
-                    // $e->$type[$attr], so I have to assign a ref.
-                    $f =& $e->$type;
-                    $f[$attr] = $fix;
-                    break;
-                case 'tag_transform':
-                    $this->info_tag_transform[$params['element']] = $fix;
-                    break;
-                case 'child':
-                case 'content_model_type':
-                    $element = $params['element'];
-                    if (empty($this->info[$element])) {
-                        $e = $this->addBlankElement($element);
-                    } else {
-                        $e = $this->info[$element];
-                    }
-                    $e->$type = $fix;
-                    break;
-                default:
-                    trigger_error("Fix type $type not supported", E_USER_ERROR);
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Parses a fix name and determines what kind of fix it is, as well
-     * as other information defined by the fix
-     * @param $name String name of fix
-     * @return array(string $fix_type, array $fix_parameters)
-     * @note $fix_parameters is type dependant, see populate() for usage
-     *       of these parameters
-     */
-    public function getFixType($name) {
-        // parse it
-        $property = $attr = null;
-        if (strpos($name, '#') !== false) list($name, $property) = explode('#', $name);
-        if (strpos($name, '@') !== false) list($name, $attr)     = explode('@', $name);
-
-        // figure out the parameters
-        $params = array();
-        if ($name !== '')    $params['element'] = $name;
-        if (!is_null($attr)) $params['attr'] = $attr;
-
-        // special case: attribute transform
-        if (!is_null($attr)) {
-            if (is_null($property)) $property = 'pre';
-            $type = 'attr_transform_' . $property;
-            return array($type, $params);
-        }
-
-        // special case: tag transform
-        if (is_null($property)) {
-            return array('tag_transform', $params);
-        }
-
-        return array($property, $params);
-
-    }
-
-    /**
-     * Defines all fixes the module will perform in a compact
-     * associative array of fix name to fix implementation.
-     */
-    public function makeFixes() {}
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Tidy/Name.php b/lib/php/HTMLPurifier/HTMLModule/Tidy/Name.php
deleted file mode 100644
index 61ff85ce2fa66e66bf1227b35c506ceb9ca2c365..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Tidy/Name.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * Name is deprecated, but allowed in strict doctypes, so onl
- */
-class HTMLPurifier_HTMLModule_Tidy_Name extends HTMLPurifier_HTMLModule_Tidy
-{
-    public $name = 'Tidy_Name';
-    public $defaultLevel = 'heavy';
-    public function makeFixes() {
-
-        $r = array();
-
-        // @name for img, a -----------------------------------------------
-        // Technically, it's allowed even on strict, so we allow authors to use
-        // it. However, it's deprecated in future versions of XHTML.
-        $r['img@name'] =
-        $r['a@name'] = new HTMLPurifier_AttrTransform_Name();
-
-        return $r;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Tidy/Proprietary.php b/lib/php/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
deleted file mode 100644
index 85fa90a942d89a5b1c5240c508d07e4980ce4951..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Tidy/Proprietary.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_Proprietary extends HTMLPurifier_HTMLModule_Tidy
-{
-
-    public $name = 'Tidy_Proprietary';
-    public $defaultLevel = 'light';
-
-    public function makeFixes() {
-        $r = array();
-        $r['table@background'] = new HTMLPurifier_AttrTransform_Background();
-        $r['td@background']    = new HTMLPurifier_AttrTransform_Background();
-        $r['th@background']    = new HTMLPurifier_AttrTransform_Background();
-        $r['tr@background']    = new HTMLPurifier_AttrTransform_Background();
-        $r['thead@background'] = new HTMLPurifier_AttrTransform_Background();
-        $r['tfoot@background'] = new HTMLPurifier_AttrTransform_Background();
-        $r['tbody@background'] = new HTMLPurifier_AttrTransform_Background();
-        return $r;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Tidy/Strict.php b/lib/php/HTMLPurifier/HTMLModule/Tidy/Strict.php
deleted file mode 100644
index c73dc3c4d19a93715f674a0eb7d2acb1185bd258..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Tidy/Strict.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_Strict extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4
-{
-    public $name = 'Tidy_Strict';
-    public $defaultLevel = 'light';
-
-    public function makeFixes() {
-        $r = parent::makeFixes();
-        $r['blockquote#content_model_type'] = 'strictblockquote';
-        return $r;
-    }
-
-    public $defines_child_def = true;
-    public function getChildDef($def) {
-        if ($def->content_model_type != 'strictblockquote') return parent::getChildDef($def);
-        return new HTMLPurifier_ChildDef_StrictBlockquote($def->content_model);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Tidy/Transitional.php b/lib/php/HTMLPurifier/HTMLModule/Tidy/Transitional.php
deleted file mode 100644
index 9960b1dd10b18103d9069ce100a0b38d5a742692..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Tidy/Transitional.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_Transitional extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4
-{
-    public $name = 'Tidy_Transitional';
-    public $defaultLevel = 'heavy';
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Tidy/XHTML.php b/lib/php/HTMLPurifier/HTMLModule/Tidy/XHTML.php
deleted file mode 100644
index db5a378e53973ccba20b749a3a50e4320bb775d2..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Tidy/XHTML.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_XHTML extends HTMLPurifier_HTMLModule_Tidy
-{
-
-    public $name = 'Tidy_XHTML';
-    public $defaultLevel = 'medium';
-
-    public function makeFixes() {
-        $r = array();
-        $r['@lang'] = new HTMLPurifier_AttrTransform_Lang();
-        return $r;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php b/lib/php/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
deleted file mode 100644
index 02e9438139704f5876fa347afc1725802fdc92ee..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4 extends HTMLPurifier_HTMLModule_Tidy
-{
-
-    public function makeFixes() {
-
-        $r = array();
-
-        // == deprecated tag transforms ===================================
-
-        $r['font']   = new HTMLPurifier_TagTransform_Font();
-        $r['menu']   = new HTMLPurifier_TagTransform_Simple('ul');
-        $r['dir']    = new HTMLPurifier_TagTransform_Simple('ul');
-        $r['center'] = new HTMLPurifier_TagTransform_Simple('div',  'text-align:center;');
-        $r['u']      = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:underline;');
-        $r['s']      = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;');
-        $r['strike'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;');
-
-        // == deprecated attribute transforms =============================
-
-        $r['caption@align'] =
-            new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
-                // we're following IE's behavior, not Firefox's, due
-                // to the fact that no one supports caption-side:right,
-                // W3C included (with CSS 2.1). This is a slightly
-                // unreasonable attribute!
-                'left'   => 'text-align:left;',
-                'right'  => 'text-align:right;',
-                'top'    => 'caption-side:top;',
-                'bottom' => 'caption-side:bottom;' // not supported by IE
-            ));
-
-        // @align for img -------------------------------------------------
-        $r['img@align'] =
-            new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
-                'left'   => 'float:left;',
-                'right'  => 'float:right;',
-                'top'    => 'vertical-align:top;',
-                'middle' => 'vertical-align:middle;',
-                'bottom' => 'vertical-align:baseline;',
-            ));
-
-        // @align for table -----------------------------------------------
-        $r['table@align'] =
-            new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
-                'left'   => 'float:left;',
-                'center' => 'margin-left:auto;margin-right:auto;',
-                'right'  => 'float:right;'
-            ));
-
-        // @align for hr -----------------------------------------------
-        $r['hr@align'] =
-            new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
-                // we use both text-align and margin because these work
-                // for different browsers (IE and Firefox, respectively)
-                // and the melange makes for a pretty cross-compatible
-                // solution
-                'left'   => 'margin-left:0;margin-right:auto;text-align:left;',
-                'center' => 'margin-left:auto;margin-right:auto;text-align:center;',
-                'right'  => 'margin-left:auto;margin-right:0;text-align:right;'
-            ));
-
-        // @align for h1, h2, h3, h4, h5, h6, p, div ----------------------
-        // {{{
-            $align_lookup = array();
-            $align_values = array('left', 'right', 'center', 'justify');
-            foreach ($align_values as $v) $align_lookup[$v] = "text-align:$v;";
-        // }}}
-        $r['h1@align'] =
-        $r['h2@align'] =
-        $r['h3@align'] =
-        $r['h4@align'] =
-        $r['h5@align'] =
-        $r['h6@align'] =
-        $r['p@align']  =
-        $r['div@align'] =
-            new HTMLPurifier_AttrTransform_EnumToCSS('align', $align_lookup);
-
-        // @bgcolor for table, tr, td, th ---------------------------------
-        $r['table@bgcolor'] =
-        $r['td@bgcolor'] =
-        $r['th@bgcolor'] =
-            new HTMLPurifier_AttrTransform_BgColor();
-
-        // @border for img ------------------------------------------------
-        $r['img@border'] = new HTMLPurifier_AttrTransform_Border();
-
-        // @clear for br --------------------------------------------------
-        $r['br@clear'] =
-            new HTMLPurifier_AttrTransform_EnumToCSS('clear', array(
-                'left'  => 'clear:left;',
-                'right' => 'clear:right;',
-                'all'   => 'clear:both;',
-                'none'  => 'clear:none;',
-            ));
-
-        // @height for td, th ---------------------------------------------
-        $r['td@height'] =
-        $r['th@height'] =
-            new HTMLPurifier_AttrTransform_Length('height');
-
-        // @hspace for img ------------------------------------------------
-        $r['img@hspace'] = new HTMLPurifier_AttrTransform_ImgSpace('hspace');
-
-        // @noshade for hr ------------------------------------------------
-        // this transformation is not precise but often good enough.
-        // different browsers use different styles to designate noshade
-        $r['hr@noshade'] =
-            new HTMLPurifier_AttrTransform_BoolToCSS(
-                'noshade',
-                'color:#808080;background-color:#808080;border:0;'
-            );
-
-        // @nowrap for td, th ---------------------------------------------
-        $r['td@nowrap'] =
-        $r['th@nowrap'] =
-            new HTMLPurifier_AttrTransform_BoolToCSS(
-                'nowrap',
-                'white-space:nowrap;'
-            );
-
-        // @size for hr  --------------------------------------------------
-        $r['hr@size'] = new HTMLPurifier_AttrTransform_Length('size', 'height');
-
-        // @type for li, ol, ul -------------------------------------------
-        // {{{
-            $ul_types = array(
-                'disc'   => 'list-style-type:disc;',
-                'square' => 'list-style-type:square;',
-                'circle' => 'list-style-type:circle;'
-            );
-            $ol_types = array(
-                '1'   => 'list-style-type:decimal;',
-                'i'   => 'list-style-type:lower-roman;',
-                'I'   => 'list-style-type:upper-roman;',
-                'a'   => 'list-style-type:lower-alpha;',
-                'A'   => 'list-style-type:upper-alpha;'
-            );
-            $li_types = $ul_types + $ol_types;
-        // }}}
-
-        $r['ul@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ul_types);
-        $r['ol@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ol_types, true);
-        $r['li@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $li_types, true);
-
-        // @vspace for img ------------------------------------------------
-        $r['img@vspace'] = new HTMLPurifier_AttrTransform_ImgSpace('vspace');
-
-        // @width for hr, td, th ------------------------------------------
-        $r['td@width'] =
-        $r['th@width'] =
-        $r['hr@width'] = new HTMLPurifier_AttrTransform_Length('width');
-
-        return $r;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModule/XMLCommonAttributes.php b/lib/php/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
deleted file mode 100644
index 9c0e031984169829c67bc74493d8f886f67a17ca..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModule/XMLCommonAttributes.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModule_XMLCommonAttributes extends HTMLPurifier_HTMLModule
-{
-    public $name = 'XMLCommonAttributes';
-
-    public $attr_collections = array(
-        'Lang' => array(
-            'xml:lang' => 'LanguageCode',
-        )
-    );
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/HTMLModuleManager.php b/lib/php/HTMLPurifier/HTMLModuleManager.php
deleted file mode 100644
index f5c4a1d2cbb1b23138e197e1aafb749c53698a69..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/HTMLModuleManager.php
+++ /dev/null
@@ -1,403 +0,0 @@
-<?php
-
-class HTMLPurifier_HTMLModuleManager
-{
-
-    /**
-     * Instance of HTMLPurifier_DoctypeRegistry
-     */
-    public $doctypes;
-
-    /**
-     * Instance of current doctype
-     */
-    public $doctype;
-
-    /**
-     * Instance of HTMLPurifier_AttrTypes
-     */
-    public $attrTypes;
-
-    /**
-     * Active instances of modules for the specified doctype are
-     * indexed, by name, in this array.
-     */
-    public $modules = array();
-
-    /**
-     * Array of recognized HTMLPurifier_Module instances, indexed by
-     * module's class name. This array is usually lazy loaded, but a
-     * user can overload a module by pre-emptively registering it.
-     */
-    public $registeredModules = array();
-
-    /**
-     * List of extra modules that were added by the user using addModule().
-     * These get unconditionally merged into the current doctype, whatever
-     * it may be.
-     */
-    public $userModules = array();
-
-    /**
-     * Associative array of element name to list of modules that have
-     * definitions for the element; this array is dynamically filled.
-     */
-    public $elementLookup = array();
-
-    /** List of prefixes we should use for registering small names */
-    public $prefixes = array('HTMLPurifier_HTMLModule_');
-
-    public $contentSets;     /**< Instance of HTMLPurifier_ContentSets */
-    public $attrCollections; /**< Instance of HTMLPurifier_AttrCollections */
-
-    /** If set to true, unsafe elements and attributes will be allowed */
-    public $trusted = false;
-
-    public function __construct() {
-
-        // editable internal objects
-        $this->attrTypes = new HTMLPurifier_AttrTypes();
-        $this->doctypes  = new HTMLPurifier_DoctypeRegistry();
-
-        // setup basic modules
-        $common = array(
-            'CommonAttributes', 'Text', 'Hypertext', 'List',
-            'Presentation', 'Edit', 'Bdo', 'Tables', 'Image',
-            'StyleAttribute',
-            // Unsafe:
-            'Scripting', 'Object',  'Forms',
-            // Sorta legacy, but present in strict:
-            'Name',
-        );
-        $transitional = array('Legacy', 'Target');
-        $xml = array('XMLCommonAttributes');
-        $non_xml = array('NonXMLCommonAttributes');
-
-        // setup basic doctypes
-        $this->doctypes->register(
-            'HTML 4.01 Transitional', false,
-            array_merge($common, $transitional, $non_xml),
-            array('Tidy_Transitional', 'Tidy_Proprietary'),
-            array(),
-            '-//W3C//DTD HTML 4.01 Transitional//EN',
-            'http://www.w3.org/TR/html4/loose.dtd'
-        );
-
-        $this->doctypes->register(
-            'HTML 4.01 Strict', false,
-            array_merge($common, $non_xml),
-            array('Tidy_Strict', 'Tidy_Proprietary', 'Tidy_Name'),
-            array(),
-            '-//W3C//DTD HTML 4.01//EN',
-            'http://www.w3.org/TR/html4/strict.dtd'
-        );
-
-        $this->doctypes->register(
-            'XHTML 1.0 Transitional', true,
-            array_merge($common, $transitional, $xml, $non_xml),
-            array('Tidy_Transitional', 'Tidy_XHTML', 'Tidy_Proprietary', 'Tidy_Name'),
-            array(),
-            '-//W3C//DTD XHTML 1.0 Transitional//EN',
-            'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'
-        );
-
-        $this->doctypes->register(
-            'XHTML 1.0 Strict', true,
-            array_merge($common, $xml, $non_xml),
-            array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_Strict', 'Tidy_Proprietary', 'Tidy_Name'),
-            array(),
-            '-//W3C//DTD XHTML 1.0 Strict//EN',
-            'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
-        );
-
-        $this->doctypes->register(
-            'XHTML 1.1', true,
-            array_merge($common, $xml, array('Ruby')),
-            array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_Proprietary', 'Tidy_Strict', 'Tidy_Name'), // Tidy_XHTML1_1
-            array(),
-            '-//W3C//DTD XHTML 1.1//EN',
-            'http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd'
-        );
-
-    }
-
-    /**
-     * Registers a module to the recognized module list, useful for
-     * overloading pre-existing modules.
-     * @param $module Mixed: string module name, with or without
-     *                HTMLPurifier_HTMLModule prefix, or instance of
-     *                subclass of HTMLPurifier_HTMLModule.
-     * @param $overload Boolean whether or not to overload previous modules.
-     *                  If this is not set, and you do overload a module,
-     *                  HTML Purifier will complain with a warning.
-     * @note This function will not call autoload, you must instantiate
-     *       (and thus invoke) autoload outside the method.
-     * @note If a string is passed as a module name, different variants
-     *       will be tested in this order:
-     *          - Check for HTMLPurifier_HTMLModule_$name
-     *          - Check all prefixes with $name in order they were added
-     *          - Check for literal object name
-     *          - Throw fatal error
-     *       If your object name collides with an internal class, specify
-     *       your module manually. All modules must have been included
-     *       externally: registerModule will not perform inclusions for you!
-     */
-    public function registerModule($module, $overload = false) {
-        if (is_string($module)) {
-            // attempt to load the module
-            $original_module = $module;
-            $ok = false;
-            foreach ($this->prefixes as $prefix) {
-                $module = $prefix . $original_module;
-                if (class_exists($module)) {
-                    $ok = true;
-                    break;
-                }
-            }
-            if (!$ok) {
-                $module = $original_module;
-                if (!class_exists($module)) {
-                    trigger_error($original_module . ' module does not exist',
-                        E_USER_ERROR);
-                    return;
-                }
-            }
-            $module = new $module();
-        }
-        if (empty($module->name)) {
-            trigger_error('Module instance of ' . get_class($module) . ' must have name');
-            return;
-        }
-        if (!$overload && isset($this->registeredModules[$module->name])) {
-            trigger_error('Overloading ' . $module->name . ' without explicit overload parameter', E_USER_WARNING);
-        }
-        $this->registeredModules[$module->name] = $module;
-    }
-
-    /**
-     * Adds a module to the current doctype by first registering it,
-     * and then tacking it on to the active doctype
-     */
-    public function addModule($module) {
-        $this->registerModule($module);
-        if (is_object($module)) $module = $module->name;
-        $this->userModules[] = $module;
-    }
-
-    /**
-     * Adds a class prefix that registerModule() will use to resolve a
-     * string name to a concrete class
-     */
-    public function addPrefix($prefix) {
-        $this->prefixes[] = $prefix;
-    }
-
-    /**
-     * Performs processing on modules, after being called you may
-     * use getElement() and getElements()
-     * @param $config Instance of HTMLPurifier_Config
-     */
-    public function setup($config) {
-
-        $this->trusted = $config->get('HTML.Trusted');
-
-        // generate
-        $this->doctype = $this->doctypes->make($config);
-        $modules = $this->doctype->modules;
-
-        // take out the default modules that aren't allowed
-        $lookup = $config->get('HTML.AllowedModules');
-        $special_cases = $config->get('HTML.CoreModules');
-
-        if (is_array($lookup)) {
-            foreach ($modules as $k => $m) {
-                if (isset($special_cases[$m])) continue;
-                if (!isset($lookup[$m])) unset($modules[$k]);
-            }
-        }
-
-        // add proprietary module (this gets special treatment because
-        // it is completely removed from doctypes, etc.)
-        if ($config->get('HTML.Proprietary')) {
-            $modules[] = 'Proprietary';
-        }
-
-        // add SafeObject/Safeembed modules
-        if ($config->get('HTML.SafeObject')) {
-            $modules[] = 'SafeObject';
-        }
-        if ($config->get('HTML.SafeEmbed')) {
-            $modules[] = 'SafeEmbed';
-        }
-
-        // merge in custom modules
-        $modules = array_merge($modules, $this->userModules);
-
-        foreach ($modules as $module) {
-            $this->processModule($module);
-            $this->modules[$module]->setup($config);
-        }
-
-        foreach ($this->doctype->tidyModules as $module) {
-            $this->processModule($module);
-            $this->modules[$module]->setup($config);
-        }
-
-        // prepare any injectors
-        foreach ($this->modules as $module) {
-            $n = array();
-            foreach ($module->info_injector as $i => $injector) {
-                if (!is_object($injector)) {
-                    $class = "HTMLPurifier_Injector_$injector";
-                    $injector = new $class;
-                }
-                $n[$injector->name] = $injector;
-            }
-            $module->info_injector = $n;
-        }
-
-        // setup lookup table based on all valid modules
-        foreach ($this->modules as $module) {
-            foreach ($module->info as $name => $def) {
-                if (!isset($this->elementLookup[$name])) {
-                    $this->elementLookup[$name] = array();
-                }
-                $this->elementLookup[$name][] = $module->name;
-            }
-        }
-
-        // note the different choice
-        $this->contentSets = new HTMLPurifier_ContentSets(
-            // content set assembly deals with all possible modules,
-            // not just ones deemed to be "safe"
-            $this->modules
-        );
-        $this->attrCollections = new HTMLPurifier_AttrCollections(
-            $this->attrTypes,
-            // there is no way to directly disable a global attribute,
-            // but using AllowedAttributes or simply not including
-            // the module in your custom doctype should be sufficient
-            $this->modules
-        );
-    }
-
-    /**
-     * Takes a module and adds it to the active module collection,
-     * registering it if necessary.
-     */
-    public function processModule($module) {
-        if (!isset($this->registeredModules[$module]) || is_object($module)) {
-            $this->registerModule($module);
-        }
-        $this->modules[$module] = $this->registeredModules[$module];
-    }
-
-    /**
-     * Retrieves merged element definitions.
-     * @return Array of HTMLPurifier_ElementDef
-     */
-    public function getElements() {
-
-        $elements = array();
-        foreach ($this->modules as $module) {
-            if (!$this->trusted && !$module->safe) continue;
-            foreach ($module->info as $name => $v) {
-                if (isset($elements[$name])) continue;
-                $elements[$name] = $this->getElement($name);
-            }
-        }
-
-        // remove dud elements, this happens when an element that
-        // appeared to be safe actually wasn't
-        foreach ($elements as $n => $v) {
-            if ($v === false) unset($elements[$n]);
-        }
-
-        return $elements;
-
-    }
-
-    /**
-     * Retrieves a single merged element definition
-     * @param $name Name of element
-     * @param $trusted Boolean trusted overriding parameter: set to true
-     *                 if you want the full version of an element
-     * @return Merged HTMLPurifier_ElementDef
-     * @note You may notice that modules are getting iterated over twice (once
-     *       in getElements() and once here). This
-     *       is because
-     */
-    public function getElement($name, $trusted = null) {
-
-        if (!isset($this->elementLookup[$name])) {
-            return false;
-        }
-
-        // setup global state variables
-        $def = false;
-        if ($trusted === null) $trusted = $this->trusted;
-
-        // iterate through each module that has registered itself to this
-        // element
-        foreach($this->elementLookup[$name] as $module_name) {
-
-            $module = $this->modules[$module_name];
-
-            // refuse to create/merge from a module that is deemed unsafe--
-            // pretend the module doesn't exist--when trusted mode is not on.
-            if (!$trusted && !$module->safe) {
-                continue;
-            }
-
-            // clone is used because, ideally speaking, the original
-            // definition should not be modified. Usually, this will
-            // make no difference, but for consistency's sake
-            $new_def = clone $module->info[$name];
-
-            if (!$def && $new_def->standalone) {
-                $def = $new_def;
-            } elseif ($def) {
-                // This will occur even if $new_def is standalone. In practice,
-                // this will usually result in a full replacement.
-                $def->mergeIn($new_def);
-            } else {
-                // :TODO:
-                // non-standalone definitions that don't have a standalone
-                // to merge into could be deferred to the end
-                continue;
-            }
-
-            // attribute value expansions
-            $this->attrCollections->performInclusions($def->attr);
-            $this->attrCollections->expandIdentifiers($def->attr, $this->attrTypes);
-
-            // descendants_are_inline, for ChildDef_Chameleon
-            if (is_string($def->content_model) &&
-                strpos($def->content_model, 'Inline') !== false) {
-                if ($name != 'del' && $name != 'ins') {
-                    // this is for you, ins/del
-                    $def->descendants_are_inline = true;
-                }
-            }
-
-            $this->contentSets->generateChildDef($def, $module);
-        }
-
-        // This can occur if there is a blank definition, but no base to
-        // mix it in with
-        if (!$def) return false;
-
-        // add information on required attributes
-        foreach ($def->attr as $attr_name => $attr_def) {
-            if ($attr_def->required) {
-                $def->required_attr[] = $attr_name;
-            }
-        }
-
-        return $def;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/IDAccumulator.php b/lib/php/HTMLPurifier/IDAccumulator.php
deleted file mode 100644
index 73215295a510deb0b2b9ab2efd1b68c8e187d093..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/IDAccumulator.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Component of HTMLPurifier_AttrContext that accumulates IDs to prevent dupes
- * @note In Slashdot-speak, dupe means duplicate.
- * @note The default constructor does not accept $config or $context objects:
- *       use must use the static build() factory method to perform initialization.
- */
-class HTMLPurifier_IDAccumulator
-{
-
-    /**
-     * Lookup table of IDs we've accumulated.
-     * @public
-     */
-    public $ids = array();
-
-    /**
-     * Builds an IDAccumulator, also initializing the default blacklist
-     * @param $config Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     * @return Fully initialized HTMLPurifier_IDAccumulator
-     */
-    public static function build($config, $context) {
-        $id_accumulator = new HTMLPurifier_IDAccumulator();
-        $id_accumulator->load($config->get('Attr.IDBlacklist'));
-        return $id_accumulator;
-    }
-
-    /**
-     * Add an ID to the lookup table.
-     * @param $id ID to be added.
-     * @return Bool status, true if success, false if there's a dupe
-     */
-    public function add($id) {
-        if (isset($this->ids[$id])) return false;
-        return $this->ids[$id] = true;
-    }
-
-    /**
-     * Load a list of IDs into the lookup table
-     * @param $array_of_ids Array of IDs to load
-     * @note This function doesn't care about duplicates
-     */
-    public function load($array_of_ids) {
-        foreach ($array_of_ids as $id) {
-            $this->ids[$id] = true;
-        }
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Injector.php b/lib/php/HTMLPurifier/Injector.php
deleted file mode 100644
index 5922f81305e2bc239d3de896c0a84ca672988d6e..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Injector.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-
-/**
- * Injects tokens into the document while parsing for well-formedness.
- * This enables "formatter-like" functionality such as auto-paragraphing,
- * smiley-ification and linkification to take place.
- *
- * A note on how handlers create changes; this is done by assigning a new
- * value to the $token reference. These values can take a variety of forms and
- * are best described HTMLPurifier_Strategy_MakeWellFormed->processToken()
- * documentation.
- *
- * @todo Allow injectors to request a re-run on their output. This
- *       would help if an operation is recursive.
- */
-abstract class HTMLPurifier_Injector
-{
-
-    /**
-     * Advisory name of injector, this is for friendly error messages
-     */
-    public $name;
-
-    /**
-     * Instance of HTMLPurifier_HTMLDefinition
-     */
-    protected $htmlDefinition;
-
-    /**
-     * Reference to CurrentNesting variable in Context. This is an array
-     * list of tokens that we are currently "inside"
-     */
-    protected $currentNesting;
-
-    /**
-     * Reference to InputTokens variable in Context. This is an array
-     * list of the input tokens that are being processed.
-     */
-    protected $inputTokens;
-
-    /**
-     * Reference to InputIndex variable in Context. This is an integer
-     * array index for $this->inputTokens that indicates what token
-     * is currently being processed.
-     */
-    protected $inputIndex;
-
-    /**
-     * Array of elements and attributes this injector creates and therefore
-     * need to be allowed by the definition. Takes form of
-     * array('element' => array('attr', 'attr2'), 'element2')
-     */
-    public $needed = array();
-
-    /**
-     * Index of inputTokens to rewind to.
-     */
-    protected $rewind = false;
-
-    /**
-     * Rewind to a spot to re-perform processing. This is useful if you
-     * deleted a node, and now need to see if this change affected any
-     * earlier nodes. Rewinding does not affect other injectors, and can
-     * result in infinite loops if not used carefully.
-     * @warning HTML Purifier will prevent you from fast-forwarding with this
-     *          function.
-     */
-    public function rewind($index) {
-        $this->rewind = $index;
-    }
-
-    /**
-     * Retrieves rewind, and then unsets it.
-     */
-    public function getRewind() {
-        $r = $this->rewind;
-        $this->rewind = false;
-        return $r;
-    }
-
-    /**
-     * Prepares the injector by giving it the config and context objects:
-     * this allows references to important variables to be made within
-     * the injector. This function also checks if the HTML environment
-     * will work with the Injector (see checkNeeded()).
-     * @param $config Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     * @return Boolean false if success, string of missing needed element/attribute if failure
-     */
-    public function prepare($config, $context) {
-        $this->htmlDefinition = $config->getHTMLDefinition();
-        // Even though this might fail, some unit tests ignore this and
-        // still test checkNeeded, so be careful. Maybe get rid of that
-        // dependency.
-        $result = $this->checkNeeded($config);
-        if ($result !== false) return $result;
-        $this->currentNesting =& $context->get('CurrentNesting');
-        $this->inputTokens    =& $context->get('InputTokens');
-        $this->inputIndex     =& $context->get('InputIndex');
-        return false;
-    }
-
-    /**
-     * This function checks if the HTML environment
-     * will work with the Injector: if p tags are not allowed, the
-     * Auto-Paragraphing injector should not be enabled.
-     * @param $config Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     * @return Boolean false if success, string of missing needed element/attribute if failure
-     */
-    public function checkNeeded($config) {
-        $def = $config->getHTMLDefinition();
-        foreach ($this->needed as $element => $attributes) {
-            if (is_int($element)) $element = $attributes;
-            if (!isset($def->info[$element])) return $element;
-            if (!is_array($attributes)) continue;
-            foreach ($attributes as $name) {
-                if (!isset($def->info[$element]->attr[$name])) return "$element.$name";
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Tests if the context node allows a certain element
-     * @param $name Name of element to test for
-     * @return True if element is allowed, false if it is not
-     */
-    public function allowsElement($name) {
-        if (!empty($this->currentNesting)) {
-            $parent_token = array_pop($this->currentNesting);
-            $this->currentNesting[] = $parent_token;
-            $parent = $this->htmlDefinition->info[$parent_token->name];
-        } else {
-            $parent = $this->htmlDefinition->info_parent_def;
-        }
-        if (!isset($parent->child->elements[$name]) || isset($parent->excludes[$name])) {
-            return false;
-        }
-        // check for exclusion
-        for ($i = count($this->currentNesting) - 2; $i >= 0; $i--) {
-            $node = $this->currentNesting[$i];
-            $def  = $this->htmlDefinition->info[$node->name];
-            if (isset($def->excludes[$name])) return false;
-        }
-        return true;
-    }
-
-    /**
-     * Iterator function, which starts with the next token and continues until
-     * you reach the end of the input tokens.
-     * @warning Please prevent previous references from interfering with this
-     *          functions by setting $i = null beforehand!
-     * @param &$i Current integer index variable for inputTokens
-     * @param &$current Current token variable. Do NOT use $token, as that variable is also a reference
-     */
-    protected function forward(&$i, &$current) {
-        if ($i === null) $i = $this->inputIndex + 1;
-        else $i++;
-        if (!isset($this->inputTokens[$i])) return false;
-        $current = $this->inputTokens[$i];
-        return true;
-    }
-
-    /**
-     * Similar to _forward, but accepts a third parameter $nesting (which
-     * should be initialized at 0) and stops when we hit the end tag
-     * for the node $this->inputIndex starts in.
-     */
-    protected function forwardUntilEndToken(&$i, &$current, &$nesting) {
-        $result = $this->forward($i, $current);
-        if (!$result) return false;
-        if ($nesting === null) $nesting = 0;
-        if     ($current instanceof HTMLPurifier_Token_Start) $nesting++;
-        elseif ($current instanceof HTMLPurifier_Token_End) {
-            if ($nesting <= 0) return false;
-            $nesting--;
-        }
-        return true;
-    }
-
-    /**
-     * Iterator function, starts with the previous token and continues until
-     * you reach the beginning of input tokens.
-     * @warning Please prevent previous references from interfering with this
-     *          functions by setting $i = null beforehand!
-     * @param &$i Current integer index variable for inputTokens
-     * @param &$current Current token variable. Do NOT use $token, as that variable is also a reference
-     */
-    protected function backward(&$i, &$current) {
-        if ($i === null) $i = $this->inputIndex - 1;
-        else $i--;
-        if ($i < 0) return false;
-        $current = $this->inputTokens[$i];
-        return true;
-    }
-
-    /**
-     * Initializes the iterator at the current position. Use in a do {} while;
-     * loop to force the _forward and _backward functions to start at the
-     * current location.
-     * @warning Please prevent previous references from interfering with this
-     *          functions by setting $i = null beforehand!
-     * @param &$i Current integer index variable for inputTokens
-     * @param &$current Current token variable. Do NOT use $token, as that variable is also a reference
-     */
-    protected function current(&$i, &$current) {
-        if ($i === null) $i = $this->inputIndex;
-        $current = $this->inputTokens[$i];
-    }
-
-    /**
-     * Handler that is called when a text token is processed
-     */
-    public function handleText(&$token) {}
-
-    /**
-     * Handler that is called when a start or empty token is processed
-     */
-    public function handleElement(&$token) {}
-
-    /**
-     * Handler that is called when an end token is processed
-     */
-    public function handleEnd(&$token) {
-        $this->notifyEnd($token);
-    }
-
-    /**
-     * Notifier that is called when an end token is processed
-     * @note This differs from handlers in that the token is read-only
-     * @deprecated
-     */
-    public function notifyEnd($token) {}
-
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Injector/AutoParagraph.php b/lib/php/HTMLPurifier/Injector/AutoParagraph.php
deleted file mode 100644
index 8cc952549cc4c05e523d6c9ef0c60c4da4aaf49e..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Injector/AutoParagraph.php
+++ /dev/null
@@ -1,340 +0,0 @@
-<?php
-
-/**
- * Injector that auto paragraphs text in the root node based on
- * double-spacing.
- * @todo Ensure all states are unit tested, including variations as well.
- * @todo Make a graph of the flow control for this Injector.
- */
-class HTMLPurifier_Injector_AutoParagraph extends HTMLPurifier_Injector
-{
-
-    public $name = 'AutoParagraph';
-    public $needed = array('p');
-
-    private function _pStart() {
-        $par = new HTMLPurifier_Token_Start('p');
-        $par->armor['MakeWellFormed_TagClosedError'] = true;
-        return $par;
-    }
-
-    public function handleText(&$token) {
-        $text = $token->data;
-        // Does the current parent allow <p> tags?
-        if ($this->allowsElement('p')) {
-            if (empty($this->currentNesting) || strpos($text, "\n\n") !== false) {
-                // Note that we have differing behavior when dealing with text
-                // in the anonymous root node, or a node inside the document.
-                // If the text as a double-newline, the treatment is the same;
-                // if it doesn't, see the next if-block if you're in the document.
-
-                $i = $nesting = null;
-                if (!$this->forwardUntilEndToken($i, $current, $nesting) && $token->is_whitespace) {
-                    // State 1.1: ...    ^ (whitespace, then document end)
-                    //               ----
-                    // This is a degenerate case
-                } else {
-                    // State 1.2: PAR1
-                    //            ----
-
-                    // State 1.3: PAR1\n\nPAR2
-                    //            ------------
-
-                    // State 1.4: <div>PAR1\n\nPAR2 (see State 2)
-                    //                 ------------
-                    $token = array($this->_pStart());
-                    $this->_splitText($text, $token);
-                }
-            } else {
-                // State 2:   <div>PAR1... (similar to 1.4)
-                //                 ----
-
-                // We're in an element that allows paragraph tags, but we're not
-                // sure if we're going to need them.
-                if ($this->_pLookAhead()) {
-                    // State 2.1: <div>PAR1<b>PAR1\n\nPAR2
-                    //                 ----
-                    // Note: This will always be the first child, since any
-                    // previous inline element would have triggered this very
-                    // same routine, and found the double newline. One possible
-                    // exception would be a comment.
-                    $token = array($this->_pStart(), $token);
-                } else {
-                    // State 2.2.1: <div>PAR1<div>
-                    //                   ----
-
-                    // State 2.2.2: <div>PAR1<b>PAR1</b></div>
-                    //                   ----
-                }
-            }
-        // Is the current parent a <p> tag?
-        } elseif (
-            !empty($this->currentNesting) &&
-            $this->currentNesting[count($this->currentNesting)-1]->name == 'p'
-        ) {
-            // State 3.1: ...<p>PAR1
-            //                  ----
-
-            // State 3.2: ...<p>PAR1\n\nPAR2
-            //                  ------------
-            $token = array();
-            $this->_splitText($text, $token);
-        // Abort!
-        } else {
-            // State 4.1: ...<b>PAR1
-            //                  ----
-
-            // State 4.2: ...<b>PAR1\n\nPAR2
-            //                  ------------
-        }
-    }
-
-    public function handleElement(&$token) {
-        // We don't have to check if we're already in a <p> tag for block
-        // tokens, because the tag would have been autoclosed by MakeWellFormed.
-        if ($this->allowsElement('p')) {
-            if (!empty($this->currentNesting)) {
-                if ($this->_isInline($token)) {
-                    // State 1: <div>...<b>
-                    //                  ---
-
-                    // Check if this token is adjacent to the parent token
-                    // (seek backwards until token isn't whitespace)
-                    $i = null;
-                    $this->backward($i, $prev);
-
-                    if (!$prev instanceof HTMLPurifier_Token_Start) {
-                        // Token wasn't adjacent
-
-                        if (
-                            $prev instanceof HTMLPurifier_Token_Text &&
-                            substr($prev->data, -2) === "\n\n"
-                        ) {
-                            // State 1.1.4: <div><p>PAR1</p>\n\n<b>
-                            //                                  ---
-
-                            // Quite frankly, this should be handled by splitText
-                            $token = array($this->_pStart(), $token);
-                        } else {
-                            // State 1.1.1: <div><p>PAR1</p><b>
-                            //                              ---
-
-                            // State 1.1.2: <div><br /><b>
-                            //                         ---
-
-                            // State 1.1.3: <div>PAR<b>
-                            //                      ---
-                        }
-
-                    } else {
-                        // State 1.2.1: <div><b>
-                        //                   ---
-
-                        // Lookahead to see if <p> is needed.
-                        if ($this->_pLookAhead()) {
-                            // State 1.3.1: <div><b>PAR1\n\nPAR2
-                            //                   ---
-                            $token = array($this->_pStart(), $token);
-                        } else {
-                            // State 1.3.2: <div><b>PAR1</b></div>
-                            //                   ---
-
-                            // State 1.3.3: <div><b>PAR1</b><div></div>\n\n</div>
-                            //                   ---
-                        }
-                    }
-                } else {
-                    // State 2.3: ...<div>
-                    //               -----
-                }
-            } else {
-                if ($this->_isInline($token)) {
-                    // State 3.1: <b>
-                    //            ---
-                    // This is where the {p} tag is inserted, not reflected in
-                    // inputTokens yet, however.
-                    $token = array($this->_pStart(), $token);
-                } else {
-                    // State 3.2: <div>
-                    //            -----
-                }
-
-                $i = null;
-                if ($this->backward($i, $prev)) {
-                    if (
-                        !$prev instanceof HTMLPurifier_Token_Text
-                    ) {
-                        // State 3.1.1: ...</p>{p}<b>
-                        //                        ---
-
-                        // State 3.2.1: ...</p><div>
-                        //                     -----
-
-                        if (!is_array($token)) $token = array($token);
-                        array_unshift($token, new HTMLPurifier_Token_Text("\n\n"));
-                    } else {
-                        // State 3.1.2: ...</p>\n\n{p}<b>
-                        //                            ---
-
-                        // State 3.2.2: ...</p>\n\n<div>
-                        //                         -----
-
-                        // Note: PAR<ELEM> cannot occur because PAR would have been
-                        // wrapped in <p> tags.
-                    }
-                }
-            }
-        } else {
-            // State 2.2: <ul><li>
-            //                ----
-
-            // State 2.4: <p><b>
-            //               ---
-        }
-    }
-
-    /**
-     * Splits up a text in paragraph tokens and appends them
-     * to the result stream that will replace the original
-     * @param $data String text data that will be processed
-     *    into paragraphs
-     * @param $result Reference to array of tokens that the
-     *    tags will be appended onto
-     * @param $config Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     */
-    private function _splitText($data, &$result) {
-        $raw_paragraphs = explode("\n\n", $data);
-        $paragraphs  = array(); // without empty paragraphs
-        $needs_start = false;
-        $needs_end   = false;
-
-        $c = count($raw_paragraphs);
-        if ($c == 1) {
-            // There were no double-newlines, abort quickly. In theory this
-            // should never happen.
-            $result[] = new HTMLPurifier_Token_Text($data);
-            return;
-        }
-        for ($i = 0; $i < $c; $i++) {
-            $par = $raw_paragraphs[$i];
-            if (trim($par) !== '') {
-                $paragraphs[] = $par;
-            } else {
-                if ($i == 0) {
-                    // Double newline at the front
-                    if (empty($result)) {
-                        // The empty result indicates that the AutoParagraph
-                        // injector did not add any start paragraph tokens.
-                        // This means that we have been in a paragraph for
-                        // a while, and the newline means we should start a new one.
-                        $result[] = new HTMLPurifier_Token_End('p');
-                        $result[] = new HTMLPurifier_Token_Text("\n\n");
-                        // However, the start token should only be added if
-                        // there is more processing to be done (i.e. there are
-                        // real paragraphs in here). If there are none, the
-                        // next start paragraph tag will be handled by the
-                        // next call to the injector
-                        $needs_start = true;
-                    } else {
-                        // We just started a new paragraph!
-                        // Reinstate a double-newline for presentation's sake, since
-                        // it was in the source code.
-                        array_unshift($result, new HTMLPurifier_Token_Text("\n\n"));
-                    }
-                } elseif ($i + 1 == $c) {
-                    // Double newline at the end
-                    // There should be a trailing </p> when we're finally done.
-                    $needs_end = true;
-                }
-            }
-        }
-
-        // Check if this was just a giant blob of whitespace. Move this earlier,
-        // perhaps?
-        if (empty($paragraphs)) {
-            return;
-        }
-
-        // Add the start tag indicated by \n\n at the beginning of $data
-        if ($needs_start) {
-            $result[] = $this->_pStart();
-        }
-
-        // Append the paragraphs onto the result
-        foreach ($paragraphs as $par) {
-            $result[] = new HTMLPurifier_Token_Text($par);
-            $result[] = new HTMLPurifier_Token_End('p');
-            $result[] = new HTMLPurifier_Token_Text("\n\n");
-            $result[] = $this->_pStart();
-        }
-
-        // Remove trailing start token; Injector will handle this later if
-        // it was indeed needed. This prevents from needing to do a lookahead,
-        // at the cost of a lookbehind later.
-        array_pop($result);
-
-        // If there is no need for an end tag, remove all of it and let
-        // MakeWellFormed close it later.
-        if (!$needs_end) {
-            array_pop($result); // removes \n\n
-            array_pop($result); // removes </p>
-        }
-
-    }
-
-    /**
-     * Returns true if passed token is inline (and, ergo, allowed in
-     * paragraph tags)
-     */
-    private function _isInline($token) {
-        return isset($this->htmlDefinition->info['p']->child->elements[$token->name]);
-    }
-
-    /**
-     * Looks ahead in the token list and determines whether or not we need
-     * to insert a <p> tag.
-     */
-    private function _pLookAhead() {
-        $this->current($i, $current);
-        if ($current instanceof HTMLPurifier_Token_Start) $nesting = 1;
-        else $nesting = 0;
-        $ok = false;
-        while ($this->forwardUntilEndToken($i, $current, $nesting)) {
-            $result = $this->_checkNeedsP($current);
-            if ($result !== null) {
-                $ok = $result;
-                break;
-            }
-        }
-        return $ok;
-    }
-
-    /**
-     * Determines if a particular token requires an earlier inline token
-     * to get a paragraph. This should be used with _forwardUntilEndToken
-     */
-    private function _checkNeedsP($current) {
-        if ($current instanceof HTMLPurifier_Token_Start){
-            if (!$this->_isInline($current)) {
-                // <div>PAR1<div>
-                //      ----
-                // Terminate early, since we hit a block element
-                return false;
-            }
-        } elseif ($current instanceof HTMLPurifier_Token_Text) {
-            if (strpos($current->data, "\n\n") !== false) {
-                // <div>PAR1<b>PAR1\n\nPAR2
-                //      ----
-                return true;
-            } else {
-                // <div>PAR1<b>PAR1...
-                //      ----
-            }
-        }
-        return null;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Injector/DisplayLinkURI.php b/lib/php/HTMLPurifier/Injector/DisplayLinkURI.php
deleted file mode 100644
index 9dce9bd0857f3b80fead39894609a7f49413be9b..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Injector/DisplayLinkURI.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Injector that displays the URL of an anchor instead of linking to it, in addition to showing the text of the link.
- */
-class HTMLPurifier_Injector_DisplayLinkURI extends HTMLPurifier_Injector
-{
-
-    public $name = 'DisplayLinkURI';
-    public $needed = array('a');
-
-    public function handleElement(&$token) {
-    }
-
-    public function handleEnd(&$token) {
-        if (isset($token->start->attr['href'])){
-            $url = $token->start->attr['href'];
-            unset($token->start->attr['href']);
-            $token = array($token, new HTMLPurifier_Token_Text(" ($url)"));
-        } else {
-            // nothing to display
-        }
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Injector/Linkify.php b/lib/php/HTMLPurifier/Injector/Linkify.php
deleted file mode 100644
index 296dac282996255c811ab9908c9ed6f512ab924d..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Injector/Linkify.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * Injector that converts http, https and ftp text URLs to actual links.
- */
-class HTMLPurifier_Injector_Linkify extends HTMLPurifier_Injector
-{
-
-    public $name = 'Linkify';
-    public $needed = array('a' => array('href'));
-
-    public function handleText(&$token) {
-        if (!$this->allowsElement('a')) return;
-
-        if (strpos($token->data, '://') === false) {
-            // our really quick heuristic failed, abort
-            // this may not work so well if we want to match things like
-            // "google.com", but then again, most people don't
-            return;
-        }
-
-        // there is/are URL(s). Let's split the string:
-        // Note: this regex is extremely permissive
-        $bits = preg_split('#((?:https?|ftp)://[^\s\'"<>()]+)#S', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
-
-        $token = array();
-
-        // $i = index
-        // $c = count
-        // $l = is link
-        for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
-            if (!$l) {
-                if ($bits[$i] === '') continue;
-                $token[] = new HTMLPurifier_Token_Text($bits[$i]);
-            } else {
-                $token[] = new HTMLPurifier_Token_Start('a', array('href' => $bits[$i]));
-                $token[] = new HTMLPurifier_Token_Text($bits[$i]);
-                $token[] = new HTMLPurifier_Token_End('a');
-            }
-        }
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Injector/PurifierLinkify.php b/lib/php/HTMLPurifier/Injector/PurifierLinkify.php
deleted file mode 100644
index ad2455a91ca3a110f96dae9c5a27948d03808807..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Injector/PurifierLinkify.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * Injector that converts configuration directive syntax %Namespace.Directive
- * to links
- */
-class HTMLPurifier_Injector_PurifierLinkify extends HTMLPurifier_Injector
-{
-
-    public $name = 'PurifierLinkify';
-    public $docURL;
-    public $needed = array('a' => array('href'));
-
-    public function prepare($config, $context) {
-        $this->docURL = $config->get('AutoFormat.PurifierLinkify.DocURL');
-        return parent::prepare($config, $context);
-    }
-
-    public function handleText(&$token) {
-        if (!$this->allowsElement('a')) return;
-        if (strpos($token->data, '%') === false) return;
-
-        $bits = preg_split('#%([a-z0-9]+\.[a-z0-9]+)#Si', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
-        $token = array();
-
-        // $i = index
-        // $c = count
-        // $l = is link
-        for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
-            if (!$l) {
-                if ($bits[$i] === '') continue;
-                $token[] = new HTMLPurifier_Token_Text($bits[$i]);
-            } else {
-                $token[] = new HTMLPurifier_Token_Start('a',
-                    array('href' => str_replace('%s', $bits[$i], $this->docURL)));
-                $token[] = new HTMLPurifier_Token_Text('%' . $bits[$i]);
-                $token[] = new HTMLPurifier_Token_End('a');
-            }
-        }
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Injector/RemoveEmpty.php b/lib/php/HTMLPurifier/Injector/RemoveEmpty.php
deleted file mode 100644
index 638bfca03b251b5a30ffcabf297f6addede383b3..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Injector/RemoveEmpty.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-class HTMLPurifier_Injector_RemoveEmpty extends HTMLPurifier_Injector
-{
-
-    private $context, $config, $attrValidator, $removeNbsp, $removeNbspExceptions;
-
-    public function prepare($config, $context) {
-        parent::prepare($config, $context);
-        $this->config = $config;
-        $this->context = $context;
-        $this->removeNbsp = $config->get('AutoFormat.RemoveEmpty.RemoveNbsp');
-        $this->removeNbspExceptions = $config->get('AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions');
-        $this->attrValidator = new HTMLPurifier_AttrValidator();
-    }
-
-    public function handleElement(&$token) {
-        if (!$token instanceof HTMLPurifier_Token_Start) return;
-        $next = false;
-        for ($i = $this->inputIndex + 1, $c = count($this->inputTokens); $i < $c; $i++) {
-            $next = $this->inputTokens[$i];
-            if ($next instanceof HTMLPurifier_Token_Text) {
-                if ($next->is_whitespace) continue;
-                if ($this->removeNbsp && !isset($this->removeNbspExceptions[$token->name])) {
-                    $plain = str_replace("\xC2\xA0", "", $next->data);
-                    $isWsOrNbsp = $plain === '' || ctype_space($plain);
-                    if ($isWsOrNbsp) continue;
-                }
-            }
-            break;
-        }
-        if (!$next || ($next instanceof HTMLPurifier_Token_End && $next->name == $token->name)) {
-            if ($token->name == 'colgroup') return;
-            $this->attrValidator->validateToken($token, $this->config, $this->context);
-            $token->armor['ValidateAttributes'] = true;
-            if (isset($token->attr['id']) || isset($token->attr['name'])) return;
-            $token = $i - $this->inputIndex + 1;
-            for ($b = $this->inputIndex - 1; $b > 0; $b--) {
-                $prev = $this->inputTokens[$b];
-                if ($prev instanceof HTMLPurifier_Token_Text && $prev->is_whitespace) continue;
-                break;
-            }
-            // This is safe because we removed the token that triggered this.
-            $this->rewind($b - 1);
-            return;
-        }
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Injector/SafeObject.php b/lib/php/HTMLPurifier/Injector/SafeObject.php
deleted file mode 100644
index 34158286858c6dcb65d85f866fadbf03a47ef988..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Injector/SafeObject.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Adds important param elements to inside of object in order to make
- * things safe.
- */
-class HTMLPurifier_Injector_SafeObject extends HTMLPurifier_Injector
-{
-    public $name = 'SafeObject';
-    public $needed = array('object', 'param');
-
-    protected $objectStack = array();
-    protected $paramStack  = array();
-
-    // Keep this synchronized with AttrTransform/SafeParam.php
-    protected $addParam = array(
-        'allowScriptAccess' => 'never',
-        'allowNetworking' => 'internal',
-    );
-    protected $allowedParam = array(
-        'wmode' => true,
-        'movie' => true,
-    );
-
-    public function prepare($config, $context) {
-        parent::prepare($config, $context);
-    }
-
-    public function handleElement(&$token) {
-        if ($token->name == 'object') {
-            $this->objectStack[] = $token;
-            $this->paramStack[] = array();
-            $new = array($token);
-            foreach ($this->addParam as $name => $value) {
-                $new[] = new HTMLPurifier_Token_Empty('param', array('name' => $name, 'value' => $value));
-            }
-            $token = $new;
-        } elseif ($token->name == 'param') {
-            $nest = count($this->currentNesting) - 1;
-            if ($nest >= 0 && $this->currentNesting[$nest]->name === 'object') {
-                $i = count($this->objectStack) - 1;
-                if (!isset($token->attr['name'])) {
-                    $token = false;
-                    return;
-                }
-                $n = $token->attr['name'];
-                // We need this fix because YouTube doesn't supply a data
-                // attribute, which we need if a type is specified. This is
-                // *very* Flash specific.
-                if (!isset($this->objectStack[$i]->attr['data']) && $token->attr['name'] == 'movie') {
-                    $this->objectStack[$i]->attr['data'] = $token->attr['value'];
-                }
-                // Check if the parameter is the correct value but has not
-                // already been added
-                if (
-                    !isset($this->paramStack[$i][$n]) &&
-                    isset($this->addParam[$n]) &&
-                    $token->attr['name'] === $this->addParam[$n]
-                ) {
-                    // keep token, and add to param stack
-                    $this->paramStack[$i][$n] = true;
-                } elseif (isset($this->allowedParam[$n])) {
-                    // keep token, don't do anything to it
-                    // (could possibly check for duplicates here)
-                } else {
-                    $token = false;
-                }
-            } else {
-                // not directly inside an object, DENY!
-                $token = false;
-            }
-        }
-    }
-
-    public function handleEnd(&$token) {
-        // This is the WRONG way of handling the object and param stacks;
-        // we should be inserting them directly on the relevant object tokens
-        // so that the global stack handling handles it.
-        if ($token->name == 'object') {
-            array_pop($this->objectStack);
-            array_pop($this->paramStack);
-        }
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Language.php b/lib/php/HTMLPurifier/Language.php
deleted file mode 100644
index 3e2be03b584578bc944c389a0b80b49220399186..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Language.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-/**
- * Represents a language and defines localizable string formatting and
- * other functions, as well as the localized messages for HTML Purifier.
- */
-class HTMLPurifier_Language
-{
-
-    /**
-     * ISO 639 language code of language. Prefers shortest possible version
-     */
-    public $code = 'en';
-
-    /**
-     * Fallback language code
-     */
-    public $fallback = false;
-
-    /**
-     * Array of localizable messages
-     */
-    public $messages = array();
-
-    /**
-     * Array of localizable error codes
-     */
-    public $errorNames = array();
-
-    /**
-     * True if no message file was found for this language, so English
-     * is being used instead. Check this if you'd like to notify the
-     * user that they've used a non-supported language.
-     */
-    public $error = false;
-
-    /**
-     * Has the language object been loaded yet?
-     * @todo Make it private, fix usage in HTMLPurifier_LanguageTest
-     */
-    public $_loaded = false;
-
-    /**
-     * Instances of HTMLPurifier_Config and HTMLPurifier_Context
-     */
-    protected $config, $context;
-
-    public function __construct($config, $context) {
-        $this->config  = $config;
-        $this->context = $context;
-    }
-
-    /**
-     * Loads language object with necessary info from factory cache
-     * @note This is a lazy loader
-     */
-    public function load() {
-        if ($this->_loaded) return;
-        $factory = HTMLPurifier_LanguageFactory::instance();
-        $factory->loadLanguage($this->code);
-        foreach ($factory->keys as $key) {
-            $this->$key = $factory->cache[$this->code][$key];
-        }
-        $this->_loaded = true;
-    }
-
-    /**
-     * Retrieves a localised message.
-     * @param $key string identifier of message
-     * @return string localised message
-     */
-    public function getMessage($key) {
-        if (!$this->_loaded) $this->load();
-        if (!isset($this->messages[$key])) return "[$key]";
-        return $this->messages[$key];
-    }
-
-    /**
-     * Retrieves a localised error name.
-     * @param $int integer error number, corresponding to PHP's error
-     *             reporting
-     * @return string localised message
-     */
-    public function getErrorName($int) {
-        if (!$this->_loaded) $this->load();
-        if (!isset($this->errorNames[$int])) return "[Error: $int]";
-        return $this->errorNames[$int];
-    }
-
-    /**
-     * Converts an array list into a string readable representation
-     */
-    public function listify($array) {
-        $sep      = $this->getMessage('Item separator');
-        $sep_last = $this->getMessage('Item separator last');
-        $ret = '';
-        for ($i = 0, $c = count($array); $i < $c; $i++) {
-            if ($i == 0) {
-            } elseif ($i + 1 < $c) {
-                $ret .= $sep;
-            } else {
-                $ret .= $sep_last;
-            }
-            $ret .= $array[$i];
-        }
-        return $ret;
-    }
-
-    /**
-     * Formats a localised message with passed parameters
-     * @param $key string identifier of message
-     * @param $args Parameters to substitute in
-     * @return string localised message
-     * @todo Implement conditionals? Right now, some messages make
-     *     reference to line numbers, but those aren't always available
-     */
-    public function formatMessage($key, $args = array()) {
-        if (!$this->_loaded) $this->load();
-        if (!isset($this->messages[$key])) return "[$key]";
-        $raw = $this->messages[$key];
-        $subst = array();
-        $generator = false;
-        foreach ($args as $i => $value) {
-            if (is_object($value)) {
-                if ($value instanceof HTMLPurifier_Token) {
-                    // factor this out some time
-                    if (!$generator) $generator = $this->context->get('Generator');
-                    if (isset($value->name)) $subst['$'.$i.'.Name'] = $value->name;
-                    if (isset($value->data)) $subst['$'.$i.'.Data'] = $value->data;
-                    $subst['$'.$i.'.Compact'] =
-                    $subst['$'.$i.'.Serialized'] = $generator->generateFromToken($value);
-                    // a more complex algorithm for compact representation
-                    // could be introduced for all types of tokens. This
-                    // may need to be factored out into a dedicated class
-                    if (!empty($value->attr)) {
-                        $stripped_token = clone $value;
-                        $stripped_token->attr = array();
-                        $subst['$'.$i.'.Compact'] = $generator->generateFromToken($stripped_token);
-                    }
-                    $subst['$'.$i.'.Line'] = $value->line ? $value->line : 'unknown';
-                }
-                continue;
-            } elseif (is_array($value)) {
-                $keys = array_keys($value);
-                if (array_keys($keys) === $keys) {
-                    // list
-                    $subst['$'.$i] = $this->listify($value);
-                } else {
-                    // associative array
-                    // no $i implementation yet, sorry
-                    $subst['$'.$i.'.Keys'] = $this->listify($keys);
-                    $subst['$'.$i.'.Values'] = $this->listify(array_values($value));
-                }
-                continue;
-            }
-            $subst['$' . $i] = $value;
-        }
-        return strtr($raw, $subst);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Language/classes/en-x-test.php b/lib/php/HTMLPurifier/Language/classes/en-x-test.php
deleted file mode 100644
index d52fcb7ac182678c7edcc123aeba30310563aecb..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Language/classes/en-x-test.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-// private class for unit testing
-
-class HTMLPurifier_Language_en_x_test extends HTMLPurifier_Language
-{
-
-
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Language/messages/en-x-test.php b/lib/php/HTMLPurifier/Language/messages/en-x-test.php
deleted file mode 100644
index 1c046f379ef6fe9f8d568b796a7b7168ed5e982f..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Language/messages/en-x-test.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-// private language message file for unit testing purposes
-
-$fallback = 'en';
-
-$messages = array(
-    'HTMLPurifier' => 'HTML Purifier X'
-);
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Language/messages/en-x-testmini.php b/lib/php/HTMLPurifier/Language/messages/en-x-testmini.php
deleted file mode 100644
index 806c83fbf751d137927f0ef6d7c7cf0d1d144473..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Language/messages/en-x-testmini.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-// private language message file for unit testing purposes
-// this language file has no class associated with it
-
-$fallback = 'en';
-
-$messages = array(
-    'HTMLPurifier' => 'HTML Purifier XNone'
-);
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Language/messages/en.php b/lib/php/HTMLPurifier/Language/messages/en.php
deleted file mode 100644
index aab2e52ebc823b4cfaf52fa9a2621dd3ee498419..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Language/messages/en.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-$fallback = false;
-
-$messages = array(
-
-'HTMLPurifier' => 'HTML Purifier',
-
-// for unit testing purposes
-'LanguageFactoryTest: Pizza' => 'Pizza',
-'LanguageTest: List' => '$1',
-'LanguageTest: Hash' => '$1.Keys; $1.Values',
-
-'Item separator' => ', ',
-'Item separator last' => ' and ', // non-Harvard style
-
-'ErrorCollector: No errors' => 'No errors detected. However, because error reporting is still incomplete, there may have been errors that the error collector was not notified of; please inspect the output HTML carefully.',
-'ErrorCollector: At line'   => ' at line $line',
-'ErrorCollector: Incidental errors'  => 'Incidental errors',
-
-'Lexer: Unclosed comment'      => 'Unclosed comment',
-'Lexer: Unescaped lt'          => 'Unescaped less-than sign (<) should be &lt;',
-'Lexer: Missing gt'            => 'Missing greater-than sign (>), previous less-than sign (<) should be escaped',
-'Lexer: Missing attribute key' => 'Attribute declaration has no key',
-'Lexer: Missing end quote'     => 'Attribute declaration has no end quote',
-
-'Strategy_RemoveForeignElements: Tag transform'              => '<$1> element transformed into $CurrentToken.Serialized',
-'Strategy_RemoveForeignElements: Missing required attribute' => '$CurrentToken.Compact element missing required attribute $1',
-'Strategy_RemoveForeignElements: Foreign element to text'    => 'Unrecognized $CurrentToken.Serialized tag converted to text',
-'Strategy_RemoveForeignElements: Foreign element removed'    => 'Unrecognized $CurrentToken.Serialized tag removed',
-'Strategy_RemoveForeignElements: Comment removed'            => 'Comment containing "$CurrentToken.Data" removed',
-'Strategy_RemoveForeignElements: Foreign meta element removed' => 'Unrecognized $CurrentToken.Serialized meta tag and all descendants removed',
-'Strategy_RemoveForeignElements: Token removed to end'       => 'Tags and text starting from $1 element where removed to end',
-'Strategy_RemoveForeignElements: Trailing hyphen in comment removed' => 'Trailing hyphen(s) in comment removed',
-'Strategy_RemoveForeignElements: Hyphens in comment collapsed' => 'Double hyphens in comments are not allowed, and were collapsed into single hyphens',
-
-'Strategy_MakeWellFormed: Unnecessary end tag removed' => 'Unnecessary $CurrentToken.Serialized tag removed',
-'Strategy_MakeWellFormed: Unnecessary end tag to text' => 'Unnecessary $CurrentToken.Serialized tag converted to text',
-'Strategy_MakeWellFormed: Tag auto closed'             => '$1.Compact started on line $1.Line auto-closed by $CurrentToken.Compact',
-'Strategy_MakeWellFormed: Tag carryover'               => '$1.Compact started on line $1.Line auto-continued into $CurrentToken.Compact',
-'Strategy_MakeWellFormed: Stray end tag removed'       => 'Stray $CurrentToken.Serialized tag removed',
-'Strategy_MakeWellFormed: Stray end tag to text'       => 'Stray $CurrentToken.Serialized tag converted to text',
-'Strategy_MakeWellFormed: Tag closed by element end'   => '$1.Compact tag started on line $1.Line closed by end of $CurrentToken.Serialized',
-'Strategy_MakeWellFormed: Tag closed by document end'  => '$1.Compact tag started on line $1.Line closed by end of document',
-
-'Strategy_FixNesting: Node removed'          => '$CurrentToken.Compact node removed',
-'Strategy_FixNesting: Node excluded'         => '$CurrentToken.Compact node removed due to descendant exclusion by ancestor element',
-'Strategy_FixNesting: Node reorganized'      => 'Contents of $CurrentToken.Compact node reorganized to enforce its content model',
-'Strategy_FixNesting: Node contents removed' => 'Contents of $CurrentToken.Compact node removed',
-
-'AttrValidator: Attributes transformed' => 'Attributes on $CurrentToken.Compact transformed from $1.Keys to $2.Keys',
-'AttrValidator: Attribute removed' => '$CurrentAttr.Name attribute on $CurrentToken.Compact removed',
-
-);
-
-$errorNames = array(
-    E_ERROR   => 'Error',
-    E_WARNING => 'Warning',
-    E_NOTICE  => 'Notice'
-);
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/LanguageFactory.php b/lib/php/HTMLPurifier/LanguageFactory.php
deleted file mode 100644
index 134ef8c745b49787890d53cb018b13edb8e76f55..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/LanguageFactory.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-
-/**
- * Class responsible for generating HTMLPurifier_Language objects, managing
- * caching and fallbacks.
- * @note Thanks to MediaWiki for the general logic, although this version
- *       has been entirely rewritten
- * @todo Serialized cache for languages
- */
-class HTMLPurifier_LanguageFactory
-{
-
-    /**
-     * Cache of language code information used to load HTMLPurifier_Language objects
-     * Structure is: $factory->cache[$language_code][$key] = $value
-     * @value array map
-     */
-    public $cache;
-
-    /**
-     * Valid keys in the HTMLPurifier_Language object. Designates which
-     * variables to slurp out of a message file.
-     * @value array list
-     */
-    public $keys = array('fallback', 'messages', 'errorNames');
-
-    /**
-     * Instance of HTMLPurifier_AttrDef_Lang to validate language codes
-     * @value object HTMLPurifier_AttrDef_Lang
-     */
-    protected $validator;
-
-    /**
-     * Cached copy of dirname(__FILE__), directory of current file without
-     * trailing slash
-     * @value string filename
-     */
-    protected $dir;
-
-    /**
-     * Keys whose contents are a hash map and can be merged
-     * @value array lookup
-     */
-    protected $mergeable_keys_map = array('messages' => true, 'errorNames' => true);
-
-    /**
-     * Keys whose contents are a list and can be merged
-     * @value array lookup
-     */
-    protected $mergeable_keys_list = array();
-
-    /**
-     * Retrieve sole instance of the factory.
-     * @param $prototype Optional prototype to overload sole instance with,
-     *                   or bool true to reset to default factory.
-     */
-    public static function instance($prototype = null) {
-        static $instance = null;
-        if ($prototype !== null) {
-            $instance = $prototype;
-        } elseif ($instance === null || $prototype == true) {
-            $instance = new HTMLPurifier_LanguageFactory();
-            $instance->setup();
-        }
-        return $instance;
-    }
-
-    /**
-     * Sets up the singleton, much like a constructor
-     * @note Prevents people from getting this outside of the singleton
-     */
-    public function setup() {
-        $this->validator = new HTMLPurifier_AttrDef_Lang();
-        $this->dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier';
-    }
-
-    /**
-     * Creates a language object, handles class fallbacks
-     * @param $config Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     * @param $code Code to override configuration with. Private parameter.
-     */
-    public function create($config, $context, $code = false) {
-
-        // validate language code
-        if ($code === false) {
-            $code = $this->validator->validate(
-              $config->get('Core.Language'), $config, $context
-            );
-        } else {
-            $code = $this->validator->validate($code, $config, $context);
-        }
-        if ($code === false) $code = 'en'; // malformed code becomes English
-
-        $pcode = str_replace('-', '_', $code); // make valid PHP classname
-        static $depth = 0; // recursion protection
-
-        if ($code == 'en') {
-            $lang = new HTMLPurifier_Language($config, $context);
-        } else {
-            $class = 'HTMLPurifier_Language_' . $pcode;
-            $file  = $this->dir . '/Language/classes/' . $code . '.php';
-            if (file_exists($file) || class_exists($class, false)) {
-                $lang = new $class($config, $context);
-            } else {
-                // Go fallback
-                $raw_fallback = $this->getFallbackFor($code);
-                $fallback = $raw_fallback ? $raw_fallback : 'en';
-                $depth++;
-                $lang = $this->create($config, $context, $fallback);
-                if (!$raw_fallback) {
-                    $lang->error = true;
-                }
-                $depth--;
-            }
-        }
-
-        $lang->code = $code;
-
-        return $lang;
-
-    }
-
-    /**
-     * Returns the fallback language for language
-     * @note Loads the original language into cache
-     * @param $code string language code
-     */
-    public function getFallbackFor($code) {
-        $this->loadLanguage($code);
-        return $this->cache[$code]['fallback'];
-    }
-
-    /**
-     * Loads language into the cache, handles message file and fallbacks
-     * @param $code string language code
-     */
-    public function loadLanguage($code) {
-        static $languages_seen = array(); // recursion guard
-
-        // abort if we've already loaded it
-        if (isset($this->cache[$code])) return;
-
-        // generate filename
-        $filename = $this->dir . '/Language/messages/' . $code . '.php';
-
-        // default fallback : may be overwritten by the ensuing include
-        $fallback = ($code != 'en') ? 'en' : false;
-
-        // load primary localisation
-        if (!file_exists($filename)) {
-            // skip the include: will rely solely on fallback
-            $filename = $this->dir . '/Language/messages/en.php';
-            $cache = array();
-        } else {
-            include $filename;
-            $cache = compact($this->keys);
-        }
-
-        // load fallback localisation
-        if (!empty($fallback)) {
-
-            // infinite recursion guard
-            if (isset($languages_seen[$code])) {
-                trigger_error('Circular fallback reference in language ' .
-                    $code, E_USER_ERROR);
-                $fallback = 'en';
-            }
-            $language_seen[$code] = true;
-
-            // load the fallback recursively
-            $this->loadLanguage($fallback);
-            $fallback_cache = $this->cache[$fallback];
-
-            // merge fallback with current language
-            foreach ( $this->keys as $key ) {
-                if (isset($cache[$key]) && isset($fallback_cache[$key])) {
-                    if (isset($this->mergeable_keys_map[$key])) {
-                        $cache[$key] = $cache[$key] + $fallback_cache[$key];
-                    } elseif (isset($this->mergeable_keys_list[$key])) {
-                        $cache[$key] = array_merge( $fallback_cache[$key], $cache[$key] );
-                    }
-                } else {
-                    $cache[$key] = $fallback_cache[$key];
-                }
-            }
-
-        }
-
-        // save to cache for later retrieval
-        $this->cache[$code] = $cache;
-
-        return;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Length.php b/lib/php/HTMLPurifier/Length.php
deleted file mode 100644
index 8d2a46b7da9322fa88b30ead08ed6b63ef4f7c6c..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Length.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/**
- * Represents a measurable length, with a string numeric magnitude
- * and a unit. This object is immutable.
- */
-class HTMLPurifier_Length
-{
-
-    /**
-     * String numeric magnitude.
-     */
-    protected $n;
-
-    /**
-     * String unit. False is permitted if $n = 0.
-     */
-    protected $unit;
-
-    /**
-     * Whether or not this length is valid. Null if not calculated yet.
-     */
-    protected $isValid;
-
-    /**
-     * Lookup array of units recognized by CSS 2.1
-     */
-    protected static $allowedUnits = array(
-        'em' => true, 'ex' => true, 'px' => true, 'in' => true,
-        'cm' => true, 'mm' => true, 'pt' => true, 'pc' => true
-    );
-
-    /**
-     * @param number $n Magnitude
-     * @param string $u Unit
-     */
-    public function __construct($n = '0', $u = false) {
-        $this->n = (string) $n;
-        $this->unit = $u !== false ? (string) $u : false;
-    }
-
-    /**
-     * @param string $s Unit string, like '2em' or '3.4in'
-     * @warning Does not perform validation.
-     */
-    static public function make($s) {
-        if ($s instanceof HTMLPurifier_Length) return $s;
-        $n_length = strspn($s, '1234567890.+-');
-        $n = substr($s, 0, $n_length);
-        $unit = substr($s, $n_length);
-        if ($unit === '') $unit = false;
-        return new HTMLPurifier_Length($n, $unit);
-    }
-
-    /**
-     * Validates the number and unit.
-     */
-    protected function validate() {
-        // Special case:
-        if ($this->n === '+0' || $this->n === '-0') $this->n = '0';
-        if ($this->n === '0' && $this->unit === false) return true;
-        if (!ctype_lower($this->unit)) $this->unit = strtolower($this->unit);
-        if (!isset(HTMLPurifier_Length::$allowedUnits[$this->unit])) return false;
-        // Hack:
-        $def = new HTMLPurifier_AttrDef_CSS_Number();
-        $result = $def->validate($this->n, false, false);
-        if ($result === false) return false;
-        $this->n = $result;
-        return true;
-    }
-
-    /**
-     * Returns string representation of number.
-     */
-    public function toString() {
-        if (!$this->isValid()) return false;
-        return $this->n . $this->unit;
-    }
-
-    /**
-     * Retrieves string numeric magnitude.
-     */
-    public function getN() {return $this->n;}
-
-    /**
-     * Retrieves string unit.
-     */
-    public function getUnit() {return $this->unit;}
-
-    /**
-     * Returns true if this length unit is valid.
-     */
-    public function isValid() {
-        if ($this->isValid === null) $this->isValid = $this->validate();
-        return $this->isValid;
-    }
-
-    /**
-     * Compares two lengths, and returns 1 if greater, -1 if less and 0 if equal.
-     * @warning If both values are too large or small, this calculation will
-     *          not work properly
-     */
-    public function compareTo($l) {
-        if ($l === false) return false;
-        if ($l->unit !== $this->unit) {
-            $converter = new HTMLPurifier_UnitConverter();
-            $l = $converter->convert($l, $this->unit);
-            if ($l === false) return false;
-        }
-        return $this->n - $l->n;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Lexer.php b/lib/php/HTMLPurifier/Lexer.php
deleted file mode 100644
index 8cce008d3dd2312bab7334e8f94a45812f38423c..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Lexer.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-
-/**
- * Forgivingly lexes HTML (SGML-style) markup into tokens.
- *
- * A lexer parses a string of SGML-style markup and converts them into
- * corresponding tokens.  It doesn't check for well-formedness, although its
- * internal mechanism may make this automatic (such as the case of
- * HTMLPurifier_Lexer_DOMLex).  There are several implementations to choose
- * from.
- *
- * A lexer is HTML-oriented: it might work with XML, but it's not
- * recommended, as we adhere to a subset of the specification for optimization
- * reasons. This might change in the future. Also, most tokenizers are not
- * expected to handle DTDs or PIs.
- *
- * This class should not be directly instantiated, but you may use create() to
- * retrieve a default copy of the lexer.  Being a supertype, this class
- * does not actually define any implementation, but offers commonly used
- * convenience functions for subclasses.
- *
- * @note The unit tests will instantiate this class for testing purposes, as
- *       many of the utility functions require a class to be instantiated.
- *       This means that, even though this class is not runnable, it will
- *       not be declared abstract.
- *
- * @par
- *
- * @note
- * We use tokens rather than create a DOM representation because DOM would:
- *
- * @par
- *  -# Require more processing and memory to create,
- *  -# Is not streamable, and
- *  -# Has the entire document structure (html and body not needed).
- *
- * @par
- * However, DOM is helpful in that it makes it easy to move around nodes
- * without a lot of lookaheads to see when a tag is closed. This is a
- * limitation of the token system and some workarounds would be nice.
- */
-class HTMLPurifier_Lexer
-{
-
-    /**
-     * Whether or not this lexer implements line-number/column-number tracking.
-     * If it does, set to true.
-     */
-    public $tracksLineNumbers = false;
-
-    // -- STATIC ----------------------------------------------------------
-
-    /**
-     * Retrieves or sets the default Lexer as a Prototype Factory.
-     *
-     * By default HTMLPurifier_Lexer_DOMLex will be returned. There are
-     * a few exceptions involving special features that only DirectLex
-     * implements.
-     *
-     * @note The behavior of this class has changed, rather than accepting
-     *       a prototype object, it now accepts a configuration object.
-     *       To specify your own prototype, set %Core.LexerImpl to it.
-     *       This change in behavior de-singletonizes the lexer object.
-     *
-     * @param $config Instance of HTMLPurifier_Config
-     * @return Concrete lexer.
-     */
-    public static function create($config) {
-
-        if (!($config instanceof HTMLPurifier_Config)) {
-            $lexer = $config;
-            trigger_error("Passing a prototype to
-              HTMLPurifier_Lexer::create() is deprecated, please instead
-              use %Core.LexerImpl", E_USER_WARNING);
-        } else {
-            $lexer = $config->get('Core.LexerImpl');
-        }
-
-        $needs_tracking =
-            $config->get('Core.MaintainLineNumbers') ||
-            $config->get('Core.CollectErrors');
-
-        $inst = null;
-        if (is_object($lexer)) {
-            $inst = $lexer;
-        } else {
-
-            if (is_null($lexer)) { do {
-                // auto-detection algorithm
-
-                if ($needs_tracking) {
-                    $lexer = 'DirectLex';
-                    break;
-                }
-
-                if (
-                    class_exists('DOMDocument') &&
-                    method_exists('DOMDocument', 'loadHTML') &&
-                    !extension_loaded('domxml')
-                ) {
-                    // check for DOM support, because while it's part of the
-                    // core, it can be disabled compile time. Also, the PECL
-                    // domxml extension overrides the default DOM, and is evil
-                    // and nasty and we shan't bother to support it
-                    $lexer = 'DOMLex';
-                } else {
-                    $lexer = 'DirectLex';
-                }
-
-            } while(0); } // do..while so we can break
-
-            // instantiate recognized string names
-            switch ($lexer) {
-                case 'DOMLex':
-                    $inst = new HTMLPurifier_Lexer_DOMLex();
-                    break;
-                case 'DirectLex':
-                    $inst = new HTMLPurifier_Lexer_DirectLex();
-                    break;
-                case 'PH5P':
-                    $inst = new HTMLPurifier_Lexer_PH5P();
-                    break;
-                default:
-                    throw new HTMLPurifier_Exception("Cannot instantiate unrecognized Lexer type " . htmlspecialchars($lexer));
-            }
-        }
-
-        if (!$inst) throw new HTMLPurifier_Exception('No lexer was instantiated');
-
-        // once PHP DOM implements native line numbers, or we
-        // hack out something using XSLT, remove this stipulation
-        if ($needs_tracking && !$inst->tracksLineNumbers) {
-            throw new HTMLPurifier_Exception('Cannot use lexer that does not support line numbers with Core.MaintainLineNumbers or Core.CollectErrors (use DirectLex instead)');
-        }
-
-        return $inst;
-
-    }
-
-    // -- CONVENIENCE MEMBERS ---------------------------------------------
-
-    public function __construct() {
-        $this->_entity_parser = new HTMLPurifier_EntityParser();
-    }
-
-    /**
-     * Most common entity to raw value conversion table for special entities.
-     */
-    protected $_special_entity2str =
-            array(
-                    '&quot;' => '"',
-                    '&amp;'  => '&',
-                    '&lt;'   => '<',
-                    '&gt;'   => '>',
-                    '&#39;'  => "'",
-                    '&#039;' => "'",
-                    '&#x27;' => "'"
-            );
-
-    /**
-     * Parses special entities into the proper characters.
-     *
-     * This string will translate escaped versions of the special characters
-     * into the correct ones.
-     *
-     * @warning
-     * You should be able to treat the output of this function as
-     * completely parsed, but that's only because all other entities should
-     * have been handled previously in substituteNonSpecialEntities()
-     *
-     * @param $string String character data to be parsed.
-     * @returns Parsed character data.
-     */
-    public function parseData($string) {
-
-        // following functions require at least one character
-        if ($string === '') return '';
-
-        // subtracts amps that cannot possibly be escaped
-        $num_amp = substr_count($string, '&') - substr_count($string, '& ') -
-            ($string[strlen($string)-1] === '&' ? 1 : 0);
-
-        if (!$num_amp) return $string; // abort if no entities
-        $num_esc_amp = substr_count($string, '&amp;');
-        $string = strtr($string, $this->_special_entity2str);
-
-        // code duplication for sake of optimization, see above
-        $num_amp_2 = substr_count($string, '&') - substr_count($string, '& ') -
-            ($string[strlen($string)-1] === '&' ? 1 : 0);
-
-        if ($num_amp_2 <= $num_esc_amp) return $string;
-
-        // hmm... now we have some uncommon entities. Use the callback.
-        $string = $this->_entity_parser->substituteSpecialEntities($string);
-        return $string;
-    }
-
-    /**
-     * Lexes an HTML string into tokens.
-     *
-     * @param $string String HTML.
-     * @return HTMLPurifier_Token array representation of HTML.
-     */
-    public function tokenizeHTML($string, $config, $context) {
-        trigger_error('Call to abstract class', E_USER_ERROR);
-    }
-
-    /**
-     * Translates CDATA sections into regular sections (through escaping).
-     *
-     * @param $string HTML string to process.
-     * @returns HTML with CDATA sections escaped.
-     */
-    protected static function escapeCDATA($string) {
-        return preg_replace_callback(
-            '/<!\[CDATA\[(.+?)\]\]>/s',
-            array('HTMLPurifier_Lexer', 'CDATACallback'),
-            $string
-        );
-    }
-
-    /**
-     * Special CDATA case that is especially convoluted for <script>
-     */
-    protected static function escapeCommentedCDATA($string) {
-        return preg_replace_callback(
-            '#<!--//--><!\[CDATA\[//><!--(.+?)//--><!\]\]>#s',
-            array('HTMLPurifier_Lexer', 'CDATACallback'),
-            $string
-        );
-    }
-
-    /**
-     * Callback function for escapeCDATA() that does the work.
-     *
-     * @warning Though this is public in order to let the callback happen,
-     *          calling it directly is not recommended.
-     * @params $matches PCRE matches array, with index 0 the entire match
-     *                  and 1 the inside of the CDATA section.
-     * @returns Escaped internals of the CDATA section.
-     */
-    protected static function CDATACallback($matches) {
-        // not exactly sure why the character set is needed, but whatever
-        return htmlspecialchars($matches[1], ENT_COMPAT, 'UTF-8');
-    }
-
-    /**
-     * Takes a piece of HTML and normalizes it by converting entities, fixing
-     * encoding, extracting bits, and other good stuff.
-     * @todo Consider making protected
-     */
-    public function normalize($html, $config, $context) {
-
-        // normalize newlines to \n
-        $html = str_replace("\r\n", "\n", $html);
-        $html = str_replace("\r", "\n", $html);
-
-        if ($config->get('HTML.Trusted')) {
-            // escape convoluted CDATA
-            $html = $this->escapeCommentedCDATA($html);
-        }
-
-        // escape CDATA
-        $html = $this->escapeCDATA($html);
-
-        // extract body from document if applicable
-        if ($config->get('Core.ConvertDocumentToFragment')) {
-            $html = $this->extractBody($html);
-        }
-
-        // expand entities that aren't the big five
-        $html = $this->_entity_parser->substituteNonSpecialEntities($html);
-
-        // clean into wellformed UTF-8 string for an SGML context: this has
-        // to be done after entity expansion because the entities sometimes
-        // represent non-SGML characters (horror, horror!)
-        $html = HTMLPurifier_Encoder::cleanUTF8($html);
-
-        return $html;
-    }
-
-    /**
-     * Takes a string of HTML (fragment or document) and returns the content
-     * @todo Consider making protected
-     */
-    public function extractBody($html) {
-        $matches = array();
-        $result = preg_match('!<body[^>]*>(.*)</body>!is', $html, $matches);
-        if ($result) {
-            return $matches[1];
-        } else {
-            return $html;
-        }
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Lexer/DOMLex.php b/lib/php/HTMLPurifier/Lexer/DOMLex.php
deleted file mode 100644
index 20dc2ed48c138402372000214fca3afe463a7655..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Lexer/DOMLex.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-
-/**
- * Parser that uses PHP 5's DOM extension (part of the core).
- *
- * In PHP 5, the DOM XML extension was revamped into DOM and added to the core.
- * It gives us a forgiving HTML parser, which we use to transform the HTML
- * into a DOM, and then into the tokens.  It is blazingly fast (for large
- * documents, it performs twenty times faster than
- * HTMLPurifier_Lexer_DirectLex,and is the default choice for PHP 5.
- *
- * @note Any empty elements will have empty tokens associated with them, even if
- * this is prohibited by the spec. This is cannot be fixed until the spec
- * comes into play.
- *
- * @note PHP's DOM extension does not actually parse any entities, we use
- *       our own function to do that.
- *
- * @warning DOM tends to drop whitespace, which may wreak havoc on indenting.
- *          If this is a huge problem, due to the fact that HTML is hand
- *          edited and you are unable to get a parser cache that caches the
- *          the output of HTML Purifier while keeping the original HTML lying
- *          around, you may want to run Tidy on the resulting output or use
- *          HTMLPurifier_DirectLex
- */
-
-class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
-{
-
-    private $factory;
-
-    public function __construct() {
-        // setup the factory
-        parent::__construct();
-        $this->factory = new HTMLPurifier_TokenFactory();
-    }
-
-    public function tokenizeHTML($html, $config, $context) {
-
-        $html = $this->normalize($html, $config, $context);
-
-        // attempt to armor stray angled brackets that cannot possibly
-        // form tags and thus are probably being used as emoticons
-        if ($config->get('Core.AggressivelyFixLt')) {
-            $char = '[^a-z!\/]';
-            $comment = "/<!--(.*?)(-->|\z)/is";
-            $html = preg_replace_callback($comment, array($this, 'callbackArmorCommentEntities'), $html);
-            do {
-                $old = $html;
-                $html = preg_replace("/<($char)/i", '&lt;\\1', $html);
-            } while ($html !== $old);
-            $html = preg_replace_callback($comment, array($this, 'callbackUndoCommentSubst'), $html); // fix comments
-        }
-
-        // preprocess html, essential for UTF-8
-        $html = $this->wrapHTML($html, $config, $context);
-
-        $doc = new DOMDocument();
-        $doc->encoding = 'UTF-8'; // theoretically, the above has this covered
-
-        set_error_handler(array($this, 'muteErrorHandler'));
-        $doc->loadHTML($html);
-        restore_error_handler();
-
-        $tokens = array();
-        $this->tokenizeDOM(
-            $doc->getElementsByTagName('html')->item(0)-> // <html>
-                  getElementsByTagName('body')->item(0)-> //   <body>
-                  getElementsByTagName('div')->item(0)    //     <div>
-            , $tokens);
-        return $tokens;
-    }
-
-    /**
-     * Recursive function that tokenizes a node, putting it into an accumulator.
-     *
-     * @param $node     DOMNode to be tokenized.
-     * @param $tokens   Array-list of already tokenized tokens.
-     * @param $collect  Says whether or start and close are collected, set to
-     *                  false at first recursion because it's the implicit DIV
-     *                  tag you're dealing with.
-     * @returns Tokens of node appended to previously passed tokens.
-     */
-    protected function tokenizeDOM($node, &$tokens, $collect = false) {
-
-        // intercept non element nodes. WE MUST catch all of them,
-        // but we're not getting the character reference nodes because
-        // those should have been preprocessed
-        if ($node->nodeType === XML_TEXT_NODE) {
-            $tokens[] = $this->factory->createText($node->data);
-            return;
-        } elseif ($node->nodeType === XML_CDATA_SECTION_NODE) {
-            // undo libxml's special treatment of <script> and <style> tags
-            $last = end($tokens);
-            $data = $node->data;
-            // (note $node->tagname is already normalized)
-            if ($last instanceof HTMLPurifier_Token_Start && ($last->name == 'script' || $last->name == 'style')) {
-                $new_data = trim($data);
-                if (substr($new_data, 0, 4) === '<!--') {
-                    $data = substr($new_data, 4);
-                    if (substr($data, -3) === '-->') {
-                        $data = substr($data, 0, -3);
-                    } else {
-                        // Highly suspicious! Not sure what to do...
-                    }
-                }
-            }
-            $tokens[] = $this->factory->createText($this->parseData($data));
-            return;
-        } elseif ($node->nodeType === XML_COMMENT_NODE) {
-            // this is code is only invoked for comments in script/style in versions
-            // of libxml pre-2.6.28 (regular comments, of course, are still
-            // handled regularly)
-            $tokens[] = $this->factory->createComment($node->data);
-            return;
-        } elseif (
-            // not-well tested: there may be other nodes we have to grab
-            $node->nodeType !== XML_ELEMENT_NODE
-        ) {
-            return;
-        }
-
-        $attr = $node->hasAttributes() ?
-            $this->transformAttrToAssoc($node->attributes) :
-            array();
-
-        // We still have to make sure that the element actually IS empty
-        if (!$node->childNodes->length) {
-            if ($collect) {
-                $tokens[] = $this->factory->createEmpty($node->tagName, $attr);
-            }
-        } else {
-            if ($collect) { // don't wrap on first iteration
-                $tokens[] = $this->factory->createStart(
-                    $tag_name = $node->tagName, // somehow, it get's dropped
-                    $attr
-                );
-            }
-            foreach ($node->childNodes as $node) {
-                // remember, it's an accumulator. Otherwise, we'd have
-                // to use array_merge
-                $this->tokenizeDOM($node, $tokens, true);
-            }
-            if ($collect) {
-                $tokens[] = $this->factory->createEnd($tag_name);
-            }
-        }
-
-    }
-
-    /**
-     * Converts a DOMNamedNodeMap of DOMAttr objects into an assoc array.
-     *
-     * @param $attribute_list DOMNamedNodeMap of DOMAttr objects.
-     * @returns Associative array of attributes.
-     */
-    protected function transformAttrToAssoc($node_map) {
-        // NamedNodeMap is documented very well, so we're using undocumented
-        // features, namely, the fact that it implements Iterator and
-        // has a ->length attribute
-        if ($node_map->length === 0) return array();
-        $array = array();
-        foreach ($node_map as $attr) {
-            $array[$attr->name] = $attr->value;
-        }
-        return $array;
-    }
-
-    /**
-     * An error handler that mutes all errors
-     */
-    public function muteErrorHandler($errno, $errstr) {}
-
-    /**
-     * Callback function for undoing escaping of stray angled brackets
-     * in comments
-     */
-    public function callbackUndoCommentSubst($matches) {
-        return '<!--' . strtr($matches[1], array('&amp;'=>'&','&lt;'=>'<')) . $matches[2];
-    }
-
-    /**
-     * Callback function that entity-izes ampersands in comments so that
-     * callbackUndoCommentSubst doesn't clobber them
-     */
-    public function callbackArmorCommentEntities($matches) {
-        return '<!--' . str_replace('&', '&amp;', $matches[1]) . $matches[2];
-    }
-
-    /**
-     * Wraps an HTML fragment in the necessary HTML
-     */
-    protected function wrapHTML($html, $config, $context) {
-        $def = $config->getDefinition('HTML');
-        $ret = '';
-
-        if (!empty($def->doctype->dtdPublic) || !empty($def->doctype->dtdSystem)) {
-            $ret .= '<!DOCTYPE html ';
-            if (!empty($def->doctype->dtdPublic)) $ret .= 'PUBLIC "' . $def->doctype->dtdPublic . '" ';
-            if (!empty($def->doctype->dtdSystem)) $ret .= '"' . $def->doctype->dtdSystem . '" ';
-            $ret .= '>';
-        }
-
-        $ret .= '<html><head>';
-        $ret .= '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
-        // No protection if $html contains a stray </div>!
-        $ret .= '</head><body><div>'.$html.'</div></body></html>';
-        return $ret;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Lexer/DirectLex.php b/lib/php/HTMLPurifier/Lexer/DirectLex.php
deleted file mode 100644
index 439409d051b9275affc52fa9e69db283b097ec65..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Lexer/DirectLex.php
+++ /dev/null
@@ -1,490 +0,0 @@
-<?php
-
-/**
- * Our in-house implementation of a parser.
- *
- * A pure PHP parser, DirectLex has absolutely no dependencies, making
- * it a reasonably good default for PHP4.  Written with efficiency in mind,
- * it can be four times faster than HTMLPurifier_Lexer_PEARSax3, although it
- * pales in comparison to HTMLPurifier_Lexer_DOMLex.
- *
- * @todo Reread XML spec and document differences.
- */
-class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
-{
-
-    public $tracksLineNumbers = true;
-
-    /**
-     * Whitespace characters for str(c)spn.
-     */
-    protected $_whitespace = "\x20\x09\x0D\x0A";
-
-    /**
-     * Callback function for script CDATA fudge
-     * @param $matches, in form of array(opening tag, contents, closing tag)
-     */
-    protected function scriptCallback($matches) {
-        return $matches[1] . htmlspecialchars($matches[2], ENT_COMPAT, 'UTF-8') . $matches[3];
-    }
-
-    public function tokenizeHTML($html, $config, $context) {
-
-        // special normalization for script tags without any armor
-        // our "armor" heurstic is a < sign any number of whitespaces after
-        // the first script tag
-        if ($config->get('HTML.Trusted')) {
-            $html = preg_replace_callback('#(<script[^>]*>)(\s*[^<].+?)(</script>)#si',
-                array($this, 'scriptCallback'), $html);
-        }
-
-        $html = $this->normalize($html, $config, $context);
-
-        $cursor = 0; // our location in the text
-        $inside_tag = false; // whether or not we're parsing the inside of a tag
-        $array = array(); // result array
-
-        // This is also treated to mean maintain *column* numbers too
-        $maintain_line_numbers = $config->get('Core.MaintainLineNumbers');
-
-        if ($maintain_line_numbers === null) {
-            // automatically determine line numbering by checking
-            // if error collection is on
-            $maintain_line_numbers = $config->get('Core.CollectErrors');
-        }
-
-        if ($maintain_line_numbers) {
-            $current_line = 1;
-            $current_col  = 0;
-            $length = strlen($html);
-        } else {
-            $current_line = false;
-            $current_col  = false;
-            $length = false;
-        }
-        $context->register('CurrentLine', $current_line);
-        $context->register('CurrentCol',  $current_col);
-        $nl = "\n";
-        // how often to manually recalculate. This will ALWAYS be right,
-        // but it's pretty wasteful. Set to 0 to turn off
-        $synchronize_interval = $config->get('Core.DirectLexLineNumberSyncInterval');
-
-        $e = false;
-        if ($config->get('Core.CollectErrors')) {
-            $e =& $context->get('ErrorCollector');
-        }
-
-        // for testing synchronization
-        $loops = 0;
-
-        while(++$loops) {
-
-            // $cursor is either at the start of a token, or inside of
-            // a tag (i.e. there was a < immediately before it), as indicated
-            // by $inside_tag
-
-            if ($maintain_line_numbers) {
-
-                // $rcursor, however, is always at the start of a token.
-                $rcursor = $cursor - (int) $inside_tag;
-
-                // Column number is cheap, so we calculate it every round.
-                // We're interested at the *end* of the newline string, so
-                // we need to add strlen($nl) == 1 to $nl_pos before subtracting it
-                // from our "rcursor" position.
-                $nl_pos = strrpos($html, $nl, $rcursor - $length);
-                $current_col = $rcursor - (is_bool($nl_pos) ? 0 : $nl_pos + 1);
-
-                // recalculate lines
-                if (
-                    $synchronize_interval &&  // synchronization is on
-                    $cursor > 0 &&            // cursor is further than zero
-                    $loops % $synchronize_interval === 0 // time to synchronize!
-                ) {
-                    $current_line = 1 + $this->substrCount($html, $nl, 0, $cursor);
-                }
-
-            }
-
-            $position_next_lt = strpos($html, '<', $cursor);
-            $position_next_gt = strpos($html, '>', $cursor);
-
-            // triggers on "<b>asdf</b>" but not "asdf <b></b>"
-            // special case to set up context
-            if ($position_next_lt === $cursor) {
-                $inside_tag = true;
-                $cursor++;
-            }
-
-            if (!$inside_tag && $position_next_lt !== false) {
-                // We are not inside tag and there still is another tag to parse
-                $token = new
-                    HTMLPurifier_Token_Text(
-                        $this->parseData(
-                            substr(
-                                $html, $cursor, $position_next_lt - $cursor
-                            )
-                        )
-                    );
-                if ($maintain_line_numbers) {
-                    $token->rawPosition($current_line, $current_col);
-                    $current_line += $this->substrCount($html, $nl, $cursor, $position_next_lt - $cursor);
-                }
-                $array[] = $token;
-                $cursor  = $position_next_lt + 1;
-                $inside_tag = true;
-                continue;
-            } elseif (!$inside_tag) {
-                // We are not inside tag but there are no more tags
-                // If we're already at the end, break
-                if ($cursor === strlen($html)) break;
-                // Create Text of rest of string
-                $token = new
-                    HTMLPurifier_Token_Text(
-                        $this->parseData(
-                            substr(
-                                $html, $cursor
-                            )
-                        )
-                    );
-                if ($maintain_line_numbers) $token->rawPosition($current_line, $current_col);
-                $array[] = $token;
-                break;
-            } elseif ($inside_tag && $position_next_gt !== false) {
-                // We are in tag and it is well formed
-                // Grab the internals of the tag
-                $strlen_segment = $position_next_gt - $cursor;
-
-                if ($strlen_segment < 1) {
-                    // there's nothing to process!
-                    $token = new HTMLPurifier_Token_Text('<');
-                    $cursor++;
-                    continue;
-                }
-
-                $segment = substr($html, $cursor, $strlen_segment);
-
-                if ($segment === false) {
-                    // somehow, we attempted to access beyond the end of
-                    // the string, defense-in-depth, reported by Nate Abele
-                    break;
-                }
-
-                // Check if it's a comment
-                if (
-                    substr($segment, 0, 3) === '!--'
-                ) {
-                    // re-determine segment length, looking for -->
-                    $position_comment_end = strpos($html, '-->', $cursor);
-                    if ($position_comment_end === false) {
-                        // uh oh, we have a comment that extends to
-                        // infinity. Can't be helped: set comment
-                        // end position to end of string
-                        if ($e) $e->send(E_WARNING, 'Lexer: Unclosed comment');
-                        $position_comment_end = strlen($html);
-                        $end = true;
-                    } else {
-                        $end = false;
-                    }
-                    $strlen_segment = $position_comment_end - $cursor;
-                    $segment = substr($html, $cursor, $strlen_segment);
-                    $token = new
-                        HTMLPurifier_Token_Comment(
-                            substr(
-                                $segment, 3, $strlen_segment - 3
-                            )
-                        );
-                    if ($maintain_line_numbers) {
-                        $token->rawPosition($current_line, $current_col);
-                        $current_line += $this->substrCount($html, $nl, $cursor, $strlen_segment);
-                    }
-                    $array[] = $token;
-                    $cursor = $end ? $position_comment_end : $position_comment_end + 3;
-                    $inside_tag = false;
-                    continue;
-                }
-
-                // Check if it's an end tag
-                $is_end_tag = (strpos($segment,'/') === 0);
-                if ($is_end_tag) {
-                    $type = substr($segment, 1);
-                    $token = new HTMLPurifier_Token_End($type);
-                    if ($maintain_line_numbers) {
-                        $token->rawPosition($current_line, $current_col);
-                        $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
-                    }
-                    $array[] = $token;
-                    $inside_tag = false;
-                    $cursor = $position_next_gt + 1;
-                    continue;
-                }
-
-                // Check leading character is alnum, if not, we may
-                // have accidently grabbed an emoticon. Translate into
-                // text and go our merry way
-                if (!ctype_alpha($segment[0])) {
-                    // XML:  $segment[0] !== '_' && $segment[0] !== ':'
-                    if ($e) $e->send(E_NOTICE, 'Lexer: Unescaped lt');
-                    $token = new HTMLPurifier_Token_Text('<');
-                    if ($maintain_line_numbers) {
-                        $token->rawPosition($current_line, $current_col);
-                        $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
-                    }
-                    $array[] = $token;
-                    $inside_tag = false;
-                    continue;
-                }
-
-                // Check if it is explicitly self closing, if so, remove
-                // trailing slash. Remember, we could have a tag like <br>, so
-                // any later token processing scripts must convert improperly
-                // classified EmptyTags from StartTags.
-                $is_self_closing = (strrpos($segment,'/') === $strlen_segment-1);
-                if ($is_self_closing) {
-                    $strlen_segment--;
-                    $segment = substr($segment, 0, $strlen_segment);
-                }
-
-                // Check if there are any attributes
-                $position_first_space = strcspn($segment, $this->_whitespace);
-
-                if ($position_first_space >= $strlen_segment) {
-                    if ($is_self_closing) {
-                        $token = new HTMLPurifier_Token_Empty($segment);
-                    } else {
-                        $token = new HTMLPurifier_Token_Start($segment);
-                    }
-                    if ($maintain_line_numbers) {
-                        $token->rawPosition($current_line, $current_col);
-                        $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
-                    }
-                    $array[] = $token;
-                    $inside_tag = false;
-                    $cursor = $position_next_gt + 1;
-                    continue;
-                }
-
-                // Grab out all the data
-                $type = substr($segment, 0, $position_first_space);
-                $attribute_string =
-                    trim(
-                        substr(
-                            $segment, $position_first_space
-                        )
-                    );
-                if ($attribute_string) {
-                    $attr = $this->parseAttributeString(
-                                    $attribute_string
-                                  , $config, $context
-                              );
-                } else {
-                    $attr = array();
-                }
-
-                if ($is_self_closing) {
-                    $token = new HTMLPurifier_Token_Empty($type, $attr);
-                } else {
-                    $token = new HTMLPurifier_Token_Start($type, $attr);
-                }
-                if ($maintain_line_numbers) {
-                    $token->rawPosition($current_line, $current_col);
-                    $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
-                }
-                $array[] = $token;
-                $cursor = $position_next_gt + 1;
-                $inside_tag = false;
-                continue;
-            } else {
-                // inside tag, but there's no ending > sign
-                if ($e) $e->send(E_WARNING, 'Lexer: Missing gt');
-                $token = new
-                    HTMLPurifier_Token_Text(
-                        '<' .
-                        $this->parseData(
-                            substr($html, $cursor)
-                        )
-                    );
-                if ($maintain_line_numbers) $token->rawPosition($current_line, $current_col);
-                // no cursor scroll? Hmm...
-                $array[] = $token;
-                break;
-            }
-            break;
-        }
-
-        $context->destroy('CurrentLine');
-        $context->destroy('CurrentCol');
-        return $array;
-    }
-
-    /**
-     * PHP 5.0.x compatible substr_count that implements offset and length
-     */
-    protected function substrCount($haystack, $needle, $offset, $length) {
-        static $oldVersion;
-        if ($oldVersion === null) {
-            $oldVersion = version_compare(PHP_VERSION, '5.1', '<');
-        }
-        if ($oldVersion) {
-            $haystack = substr($haystack, $offset, $length);
-            return substr_count($haystack, $needle);
-        } else {
-            return substr_count($haystack, $needle, $offset, $length);
-        }
-    }
-
-    /**
-     * Takes the inside of an HTML tag and makes an assoc array of attributes.
-     *
-     * @param $string Inside of tag excluding name.
-     * @returns Assoc array of attributes.
-     */
-    public function parseAttributeString($string, $config, $context) {
-        $string = (string) $string; // quick typecast
-
-        if ($string == '') return array(); // no attributes
-
-        $e = false;
-        if ($config->get('Core.CollectErrors')) {
-            $e =& $context->get('ErrorCollector');
-        }
-
-        // let's see if we can abort as quickly as possible
-        // one equal sign, no spaces => one attribute
-        $num_equal = substr_count($string, '=');
-        $has_space = strpos($string, ' ');
-        if ($num_equal === 0 && !$has_space) {
-            // bool attribute
-            return array($string => $string);
-        } elseif ($num_equal === 1 && !$has_space) {
-            // only one attribute
-            list($key, $quoted_value) = explode('=', $string);
-            $quoted_value = trim($quoted_value);
-            if (!$key) {
-                if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
-                return array();
-            }
-            if (!$quoted_value) return array($key => '');
-            $first_char = @$quoted_value[0];
-            $last_char  = @$quoted_value[strlen($quoted_value)-1];
-
-            $same_quote = ($first_char == $last_char);
-            $open_quote = ($first_char == '"' || $first_char == "'");
-
-            if ( $same_quote && $open_quote) {
-                // well behaved
-                $value = substr($quoted_value, 1, strlen($quoted_value) - 2);
-            } else {
-                // not well behaved
-                if ($open_quote) {
-                    if ($e) $e->send(E_ERROR, 'Lexer: Missing end quote');
-                    $value = substr($quoted_value, 1);
-                } else {
-                    $value = $quoted_value;
-                }
-            }
-            if ($value === false) $value = '';
-            return array($key => $value);
-        }
-
-        // setup loop environment
-        $array  = array(); // return assoc array of attributes
-        $cursor = 0; // current position in string (moves forward)
-        $size   = strlen($string); // size of the string (stays the same)
-
-        // if we have unquoted attributes, the parser expects a terminating
-        // space, so let's guarantee that there's always a terminating space.
-        $string .= ' ';
-
-        while(true) {
-
-            if ($cursor >= $size) {
-                break;
-            }
-
-            $cursor += ($value = strspn($string, $this->_whitespace, $cursor));
-            // grab the key
-
-            $key_begin = $cursor; //we're currently at the start of the key
-
-            // scroll past all characters that are the key (not whitespace or =)
-            $cursor += strcspn($string, $this->_whitespace . '=', $cursor);
-
-            $key_end = $cursor; // now at the end of the key
-
-            $key = substr($string, $key_begin, $key_end - $key_begin);
-
-            if (!$key) {
-                if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
-                $cursor += strcspn($string, $this->_whitespace, $cursor + 1); // prevent infinite loop
-                continue; // empty key
-            }
-
-            // scroll past all whitespace
-            $cursor += strspn($string, $this->_whitespace, $cursor);
-
-            if ($cursor >= $size) {
-                $array[$key] = $key;
-                break;
-            }
-
-            // if the next character is an equal sign, we've got a regular
-            // pair, otherwise, it's a bool attribute
-            $first_char = @$string[$cursor];
-
-            if ($first_char == '=') {
-                // key="value"
-
-                $cursor++;
-                $cursor += strspn($string, $this->_whitespace, $cursor);
-
-                if ($cursor === false) {
-                    $array[$key] = '';
-                    break;
-                }
-
-                // we might be in front of a quote right now
-
-                $char = @$string[$cursor];
-
-                if ($char == '"' || $char == "'") {
-                    // it's quoted, end bound is $char
-                    $cursor++;
-                    $value_begin = $cursor;
-                    $cursor = strpos($string, $char, $cursor);
-                    $value_end = $cursor;
-                } else {
-                    // it's not quoted, end bound is whitespace
-                    $value_begin = $cursor;
-                    $cursor += strcspn($string, $this->_whitespace, $cursor);
-                    $value_end = $cursor;
-                }
-
-                // we reached a premature end
-                if ($cursor === false) {
-                    $cursor = $size;
-                    $value_end = $cursor;
-                }
-
-                $value = substr($string, $value_begin, $value_end - $value_begin);
-                if ($value === false) $value = '';
-                $array[$key] = $this->parseData($value);
-                $cursor++;
-
-            } else {
-                // boolattr
-                if ($key !== '') {
-                    $array[$key] = $key;
-                } else {
-                    // purely theoretical
-                    if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
-                }
-
-            }
-        }
-        return $array;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Lexer/PEARSax3.php b/lib/php/HTMLPurifier/Lexer/PEARSax3.php
deleted file mode 100644
index 57cffa82ab0488495aeda42725d581cf07ed7e70..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Lexer/PEARSax3.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * Proof-of-concept lexer that uses the PEAR package XML_HTMLSax3 to parse HTML.
- *
- * PEAR, not suprisingly, also has a SAX parser for HTML.  I don't know
- * very much about implementation, but it's fairly well written.  However, that
- * abstraction comes at a price: performance. You need to have it installed,
- * and if the API changes, it might break our adapter. Not sure whether or not
- * it's UTF-8 aware, but it has some entity parsing trouble (in all areas,
- * text and attributes).
- *
- * Quite personally, I don't recommend using the PEAR class, and the defaults
- * don't use it. The unit tests do perform the tests on the SAX parser too, but
- * whatever it does for poorly formed HTML is up to it.
- *
- * @todo Generalize so that XML_HTMLSax is also supported.
- *
- * @warning Entity-resolution inside attributes is broken.
- */
-
-class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer
-{
-
-    /**
-     * Internal accumulator array for SAX parsers.
-     */
-    protected $tokens = array();
-
-    public function tokenizeHTML($string, $config, $context) {
-
-        $this->tokens = array();
-
-        $string = $this->normalize($string, $config, $context);
-
-        $parser = new XML_HTMLSax3();
-        $parser->set_object($this);
-        $parser->set_element_handler('openHandler','closeHandler');
-        $parser->set_data_handler('dataHandler');
-        $parser->set_escape_handler('escapeHandler');
-
-        // doesn't seem to work correctly for attributes
-        $parser->set_option('XML_OPTION_ENTITIES_PARSED', 1);
-
-        $parser->parse($string);
-
-        return $this->tokens;
-
-    }
-
-    /**
-     * Open tag event handler, interface is defined by PEAR package.
-     */
-    public function openHandler(&$parser, $name, $attrs, $closed) {
-        // entities are not resolved in attrs
-        foreach ($attrs as $key => $attr) {
-            $attrs[$key] = $this->parseData($attr);
-        }
-        if ($closed) {
-            $this->tokens[] = new HTMLPurifier_Token_Empty($name, $attrs);
-        } else {
-            $this->tokens[] = new HTMLPurifier_Token_Start($name, $attrs);
-        }
-        return true;
-    }
-
-    /**
-     * Close tag event handler, interface is defined by PEAR package.
-     */
-    public function closeHandler(&$parser, $name) {
-        // HTMLSax3 seems to always send empty tags an extra close tag
-        // check and ignore if you see it:
-        // [TESTME] to make sure it doesn't overreach
-        if ($this->tokens[count($this->tokens)-1] instanceof HTMLPurifier_Token_Empty) {
-            return true;
-        }
-        $this->tokens[] = new HTMLPurifier_Token_End($name);
-        return true;
-    }
-
-    /**
-     * Data event handler, interface is defined by PEAR package.
-     */
-    public function dataHandler(&$parser, $data) {
-        $this->tokens[] = new HTMLPurifier_Token_Text($data);
-        return true;
-    }
-
-    /**
-     * Escaped text handler, interface is defined by PEAR package.
-     */
-    public function escapeHandler(&$parser, $data) {
-        if (strpos($data, '--') === 0) {
-            $this->tokens[] = new HTMLPurifier_Token_Comment($data);
-        }
-        // CDATA is handled elsewhere, but if it was handled here:
-        //if (strpos($data, '[CDATA[') === 0) {
-        //    $this->tokens[] = new HTMLPurifier_Token_Text(
-        //        substr($data, 7, strlen($data) - 9) );
-        //}
-        return true;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Lexer/PH5P.php b/lib/php/HTMLPurifier/Lexer/PH5P.php
deleted file mode 100644
index fa1bf973e0b8bac95c00d40789148d90c2f52f51..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Lexer/PH5P.php
+++ /dev/null
@@ -1,3906 +0,0 @@
-<?php
-
-/**
- * Experimental HTML5-based parser using Jeroen van der Meer's PH5P library.
- * Occupies space in the HTML5 pseudo-namespace, which may cause conflicts.
- * 
- * @note
- *    Recent changes to PHP's DOM extension have resulted in some fatal
- *    error conditions with the original version of PH5P. Pending changes,
- *    this lexer will punt to DirectLex if DOM throughs an exception.
- */
-
-class HTMLPurifier_Lexer_PH5P extends HTMLPurifier_Lexer_DOMLex {
-    
-    public function tokenizeHTML($html, $config, $context) {
-        $new_html = $this->normalize($html, $config, $context);
-        $new_html = $this->wrapHTML($new_html, $config, $context);
-        try {
-            $parser = new HTML5($new_html);
-            $doc = $parser->save();
-        } catch (DOMException $e) {
-            // Uh oh, it failed. Punt to DirectLex.
-            $lexer = new HTMLPurifier_Lexer_DirectLex();
-            $context->register('PH5PError', $e); // save the error, so we can detect it
-            return $lexer->tokenizeHTML($html, $config, $context); // use original HTML
-        }
-        $tokens = array();
-        $this->tokenizeDOM(
-            $doc->getElementsByTagName('html')->item(0)-> // <html>
-                  getElementsByTagName('body')->item(0)-> //   <body>
-                  getElementsByTagName('div')->item(0)    //     <div>
-            , $tokens);
-        return $tokens;
-    }
-    
-}
-
-/*
-
-Copyright 2007 Jeroen van der Meer <http://jero.net/> 
-
-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 HTML5 {
-    private $data;
-    private $char;
-    private $EOF;
-    private $state;
-    private $tree;
-    private $token;
-    private $content_model;
-    private $escape = false;
-    private $entities = array('AElig;','AElig','AMP;','AMP','Aacute;','Aacute',
-    'Acirc;','Acirc','Agrave;','Agrave','Alpha;','Aring;','Aring','Atilde;',
-    'Atilde','Auml;','Auml','Beta;','COPY;','COPY','Ccedil;','Ccedil','Chi;',
-    'Dagger;','Delta;','ETH;','ETH','Eacute;','Eacute','Ecirc;','Ecirc','Egrave;',
-    'Egrave','Epsilon;','Eta;','Euml;','Euml','GT;','GT','Gamma;','Iacute;',
-    'Iacute','Icirc;','Icirc','Igrave;','Igrave','Iota;','Iuml;','Iuml','Kappa;',
-    'LT;','LT','Lambda;','Mu;','Ntilde;','Ntilde','Nu;','OElig;','Oacute;',
-    'Oacute','Ocirc;','Ocirc','Ograve;','Ograve','Omega;','Omicron;','Oslash;',
-    'Oslash','Otilde;','Otilde','Ouml;','Ouml','Phi;','Pi;','Prime;','Psi;',
-    'QUOT;','QUOT','REG;','REG','Rho;','Scaron;','Sigma;','THORN;','THORN',
-    'TRADE;','Tau;','Theta;','Uacute;','Uacute','Ucirc;','Ucirc','Ugrave;',
-    'Ugrave','Upsilon;','Uuml;','Uuml','Xi;','Yacute;','Yacute','Yuml;','Zeta;',
-    'aacute;','aacute','acirc;','acirc','acute;','acute','aelig;','aelig',
-    'agrave;','agrave','alefsym;','alpha;','amp;','amp','and;','ang;','apos;',
-    'aring;','aring','asymp;','atilde;','atilde','auml;','auml','bdquo;','beta;',
-    'brvbar;','brvbar','bull;','cap;','ccedil;','ccedil','cedil;','cedil',
-    'cent;','cent','chi;','circ;','clubs;','cong;','copy;','copy','crarr;',
-    'cup;','curren;','curren','dArr;','dagger;','darr;','deg;','deg','delta;',
-    'diams;','divide;','divide','eacute;','eacute','ecirc;','ecirc','egrave;',
-    'egrave','empty;','emsp;','ensp;','epsilon;','equiv;','eta;','eth;','eth',
-    'euml;','euml','euro;','exist;','fnof;','forall;','frac12;','frac12',
-    'frac14;','frac14','frac34;','frac34','frasl;','gamma;','ge;','gt;','gt',
-    'hArr;','harr;','hearts;','hellip;','iacute;','iacute','icirc;','icirc',
-    'iexcl;','iexcl','igrave;','igrave','image;','infin;','int;','iota;',
-    'iquest;','iquest','isin;','iuml;','iuml','kappa;','lArr;','lambda;','lang;',
-    'laquo;','laquo','larr;','lceil;','ldquo;','le;','lfloor;','lowast;','loz;',
-    'lrm;','lsaquo;','lsquo;','lt;','lt','macr;','macr','mdash;','micro;','micro',
-    'middot;','middot','minus;','mu;','nabla;','nbsp;','nbsp','ndash;','ne;',
-    'ni;','not;','not','notin;','nsub;','ntilde;','ntilde','nu;','oacute;',
-    'oacute','ocirc;','ocirc','oelig;','ograve;','ograve','oline;','omega;',
-    'omicron;','oplus;','or;','ordf;','ordf','ordm;','ordm','oslash;','oslash',
-    'otilde;','otilde','otimes;','ouml;','ouml','para;','para','part;','permil;',
-    'perp;','phi;','pi;','piv;','plusmn;','plusmn','pound;','pound','prime;',
-    'prod;','prop;','psi;','quot;','quot','rArr;','radic;','rang;','raquo;',
-    'raquo','rarr;','rceil;','rdquo;','real;','reg;','reg','rfloor;','rho;',
-    'rlm;','rsaquo;','rsquo;','sbquo;','scaron;','sdot;','sect;','sect','shy;',
-    'shy','sigma;','sigmaf;','sim;','spades;','sub;','sube;','sum;','sup1;',
-    'sup1','sup2;','sup2','sup3;','sup3','sup;','supe;','szlig;','szlig','tau;',
-    'there4;','theta;','thetasym;','thinsp;','thorn;','thorn','tilde;','times;',
-    'times','trade;','uArr;','uacute;','uacute','uarr;','ucirc;','ucirc',
-    'ugrave;','ugrave','uml;','uml','upsih;','upsilon;','uuml;','uuml','weierp;',
-    'xi;','yacute;','yacute','yen;','yen','yuml;','yuml','zeta;','zwj;','zwnj;');
-
-    const PCDATA    = 0;
-    const RCDATA    = 1;
-    const CDATA     = 2;
-    const PLAINTEXT = 3;
-
-    const DOCTYPE  = 0;
-    const STARTTAG = 1;
-    const ENDTAG   = 2;
-    const COMMENT  = 3;
-    const CHARACTR = 4;
-    const EOF      = 5;
-
-    public function __construct($data) {
-        $data = str_replace("\r\n", "\n", $data);
-        $data = str_replace("\r", null, $data);
-
-        $this->data = $data;
-        $this->char = -1;
-        $this->EOF  = strlen($data);
-        $this->tree = new HTML5TreeConstructer;
-        $this->content_model = self::PCDATA;
-
-        $this->state = 'data';
-
-        while($this->state !== null) {
-            $this->{$this->state.'State'}();
-        }
-    }
-
-    public function save() {
-        return $this->tree->save();
-    }
-
-    private function char() {
-        return ($this->char < $this->EOF)
-            ? $this->data[$this->char]
-            : false;
-    }
-
-    private function character($s, $l = 0) {
-        if($s + $l < $this->EOF) {
-            if($l === 0) {
-                return $this->data[$s];
-            } else {
-                return substr($this->data, $s, $l);
-            }
-        }
-    }
-
-    private function characters($char_class, $start) {
-        return preg_replace('#^(['.$char_class.']+).*#s', '\\1', substr($this->data, $start));
-    }
-
-    private function dataState() {
-        // Consume the next input character
-        $this->char++;
-        $char = $this->char();
-
-        if($char === '&' && ($this->content_model === self::PCDATA || $this->content_model === self::RCDATA)) {
-            /* U+0026 AMPERSAND (&)
-            When the content model flag is set to one of the PCDATA or RCDATA
-            states: switch to the entity data state. Otherwise: treat it as per
-            the "anything else"    entry below. */
-            $this->state = 'entityData';
-
-        } elseif($char === '-') {
-            /* If the content model flag is set to either the RCDATA state or
-            the CDATA state, and the escape flag is false, and there are at
-            least three characters before this one in the input stream, and the
-            last four characters in the input stream, including this one, are
-            U+003C LESS-THAN SIGN, U+0021 EXCLAMATION MARK, U+002D HYPHEN-MINUS,
-            and U+002D HYPHEN-MINUS ("<!--"), then set the escape flag to true. */
-            if(($this->content_model === self::RCDATA || $this->content_model ===
-            self::CDATA) && $this->escape === false &&
-            $this->char >= 3 && $this->character($this->char - 4, 4) === '<!--') {
-                $this->escape = true;
-            }
-
-            /* In any case, emit the input character as a character token. Stay
-            in the data state. */
-            $this->emitToken(array(
-                'type' => self::CHARACTR,
-                'data' => $char
-            ));
-
-        /* U+003C LESS-THAN SIGN (<) */
-        } elseif($char === '<' && ($this->content_model === self::PCDATA ||
-        (($this->content_model === self::RCDATA ||
-        $this->content_model === self::CDATA) && $this->escape === false))) {
-            /* When the content model flag is set to the PCDATA state: switch
-            to the tag open state.
-
-            When the content model flag is set to either the RCDATA state or
-            the CDATA state and the escape flag is false: switch to the tag
-            open state.
-
-            Otherwise: treat it as per the "anything else" entry below. */
-            $this->state = 'tagOpen';
-
-        /* U+003E GREATER-THAN SIGN (>) */
-        } elseif($char === '>') {
-            /* If the content model flag is set to either the RCDATA state or
-            the CDATA state, and the escape flag is true, and the last three
-            characters in the input stream including this one are U+002D
-            HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN ("-->"),
-            set the escape flag to false. */
-            if(($this->content_model === self::RCDATA ||
-            $this->content_model === self::CDATA) && $this->escape === true &&
-            $this->character($this->char, 3) === '-->') {
-                $this->escape = false;
-            }
-
-            /* In any case, emit the input character as a character token.
-            Stay in the data state. */
-            $this->emitToken(array(
-                'type' => self::CHARACTR,
-                'data' => $char
-            ));
-
-        } elseif($this->char === $this->EOF) {
-            /* EOF
-            Emit an end-of-file token. */
-            $this->EOF();
-
-        } elseif($this->content_model === self::PLAINTEXT) {
-            /* When the content model flag is set to the PLAINTEXT state
-            THIS DIFFERS GREATLY FROM THE SPEC: Get the remaining characters of
-            the text and emit it as a character token. */
-            $this->emitToken(array(
-                'type' => self::CHARACTR,
-                'data' => substr($this->data, $this->char)
-            ));
-
-            $this->EOF();
-
-        } else {
-            /* Anything else
-            THIS DIFFERS GREATLY FROM THE SPEC: Get as many character that
-            otherwise would also be treated as a character token and emit it
-            as a single character token. Stay in the data state. */
-            $len  = strcspn($this->data, '<&', $this->char);
-            $char = substr($this->data, $this->char, $len);
-            $this->char += $len - 1;
-
-            $this->emitToken(array(
-                'type' => self::CHARACTR,
-                'data' => $char
-            ));
-
-            $this->state = 'data';
-        }
-    }
-
-    private function entityDataState() {
-        // Attempt to consume an entity.
-        $entity = $this->entity();
-
-        // If nothing is returned, emit a U+0026 AMPERSAND character token.
-        // Otherwise, emit the character token that was returned.
-        $char = (!$entity) ? '&' : $entity;
-        $this->emitToken(array(
-            'type' => self::CHARACTR,
-            'data' => $char
-        ));
-
-        // Finally, switch to the data state.
-        $this->state = 'data';
-    }
-
-    private function tagOpenState() {
-        switch($this->content_model) {
-            case self::RCDATA:
-            case self::CDATA:
-                /* If the next input character is a U+002F SOLIDUS (/) character,
-                consume it and switch to the close tag open state. If the next
-                input character is not a U+002F SOLIDUS (/) character, emit a
-                U+003C LESS-THAN SIGN character token and switch to the data
-                state to process the next input character. */
-                if($this->character($this->char + 1) === '/') {
-                    $this->char++;
-                    $this->state = 'closeTagOpen';
-
-                } else {
-                    $this->emitToken(array(
-                        'type' => self::CHARACTR,
-                        'data' => '<'
-                    ));
-
-                    $this->state = 'data';
-                }
-            break;
-
-            case self::PCDATA:
-                // If the content model flag is set to the PCDATA state
-                // Consume the next input character:
-                $this->char++;
-                $char = $this->char();
-
-                if($char === '!') {
-                    /* U+0021 EXCLAMATION MARK (!)
-                    Switch to the markup declaration open state. */
-                    $this->state = 'markupDeclarationOpen';
-
-                } elseif($char === '/') {
-                    /* U+002F SOLIDUS (/)
-                    Switch to the close tag open state. */
-                    $this->state = 'closeTagOpen';
-
-                } elseif(preg_match('/^[A-Za-z]$/', $char)) {
-                    /* U+0041 LATIN LETTER A through to U+005A LATIN LETTER Z
-                    Create a new start tag token, set its tag name to the lowercase
-                    version of the input character (add 0x0020 to the character's code
-                    point), then switch to the tag name state. (Don't emit the token
-                    yet; further details will be filled in before it is emitted.) */
-                    $this->token = array(
-                        'name'  => strtolower($char),
-                        'type'  => self::STARTTAG,
-                        'attr'  => array()
-                    );
-
-                    $this->state = 'tagName';
-
-                } elseif($char === '>') {
-                    /* U+003E GREATER-THAN SIGN (>)
-                    Parse error. Emit a U+003C LESS-THAN SIGN character token and a
-                    U+003E GREATER-THAN SIGN character token. Switch to the data state. */
-                    $this->emitToken(array(
-                        'type' => self::CHARACTR,
-                        'data' => '<>'
-                    ));
-
-                    $this->state = 'data';
-
-                } elseif($char === '?') {
-                    /* U+003F QUESTION MARK (?)
-                    Parse error. Switch to the bogus comment state. */
-                    $this->state = 'bogusComment';
-
-                } else {
-                    /* Anything else
-                    Parse error. Emit a U+003C LESS-THAN SIGN character token and
-                    reconsume the current input character in the data state. */
-                    $this->emitToken(array(
-                        'type' => self::CHARACTR,
-                        'data' => '<'
-                    ));
-
-                    $this->char--;
-                    $this->state = 'data';
-                }
-            break;
-        }
-    }
-
-    private function closeTagOpenState() {
-        $next_node = strtolower($this->characters('A-Za-z', $this->char + 1));
-        $the_same = count($this->tree->stack) > 0 && $next_node === end($this->tree->stack)->nodeName;
-
-        if(($this->content_model === self::RCDATA || $this->content_model === self::CDATA) &&
-        (!$the_same || ($the_same && (!preg_match('/[\t\n\x0b\x0c >\/]/',
-        $this->character($this->char + 1 + strlen($next_node))) || $this->EOF === $this->char)))) {
-            /* If the content model flag is set to the RCDATA or CDATA states then
-            examine the next few characters. If they do not match the tag name of
-            the last start tag token emitted (case insensitively), or if they do but
-            they are not immediately followed by one of the following characters:
-                * U+0009 CHARACTER TABULATION
-                * U+000A LINE FEED (LF)
-                * U+000B LINE TABULATION
-                * U+000C FORM FEED (FF)
-                * U+0020 SPACE
-                * U+003E GREATER-THAN SIGN (>)
-                * U+002F SOLIDUS (/)
-                * EOF
-            ...then there is a parse error. Emit a U+003C LESS-THAN SIGN character
-            token, a U+002F SOLIDUS character token, and switch to the data state
-            to process the next input character. */
-            $this->emitToken(array(
-                'type' => self::CHARACTR,
-                'data' => '</'
-            ));
-
-            $this->state = 'data';
-
-        } else {
-            /* Otherwise, if the content model flag is set to the PCDATA state,
-            or if the next few characters do match that tag name, consume the
-            next input character: */
-            $this->char++;
-            $char = $this->char();
-
-            if(preg_match('/^[A-Za-z]$/', $char)) {
-                /* U+0041 LATIN LETTER A through to U+005A LATIN LETTER Z
-                Create a new end tag token, set its tag name to the lowercase version
-                of the input character (add 0x0020 to the character's code point), then
-                switch to the tag name state. (Don't emit the token yet; further details
-                will be filled in before it is emitted.) */
-                $this->token = array(
-                    'name'  => strtolower($char),
-                    'type'  => self::ENDTAG
-                );
-
-                $this->state = 'tagName';
-
-            } elseif($char === '>') {
-                /* U+003E GREATER-THAN SIGN (>)
-                Parse error. Switch to the data state. */
-                $this->state = 'data';
-
-            } elseif($this->char === $this->EOF) {
-                /* EOF
-                Parse error. Emit a U+003C LESS-THAN SIGN character token and a U+002F
-                SOLIDUS character token. Reconsume the EOF character in the data state. */
-                $this->emitToken(array(
-                    'type' => self::CHARACTR,
-                    'data' => '</'
-                ));
-
-                $this->char--;
-                $this->state = 'data';
-
-            } else {
-                /* Parse error. Switch to the bogus comment state. */
-                $this->state = 'bogusComment';
-            }
-        }
-    }
-
-    private function tagNameState() {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            /* U+0009 CHARACTER TABULATION
-            U+000A LINE FEED (LF)
-            U+000B LINE TABULATION
-            U+000C FORM FEED (FF)
-            U+0020 SPACE
-            Switch to the before attribute name state. */
-            $this->state = 'beforeAttributeName';
-
-        } elseif($char === '>') {
-            /* U+003E GREATER-THAN SIGN (>)
-            Emit the current tag token. Switch to the data state. */
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif($this->char === $this->EOF) {
-            /* EOF
-            Parse error. Emit the current tag token. Reconsume the EOF
-            character in the data state. */
-            $this->emitToken($this->token);
-
-            $this->char--;
-            $this->state = 'data';
-
-        } elseif($char === '/') {
-            /* U+002F SOLIDUS (/)
-            Parse error unless this is a permitted slash. Switch to the before
-            attribute name state. */
-            $this->state = 'beforeAttributeName';
-
-        } else {
-            /* Anything else
-            Append the current input character to the current tag token's tag name.
-            Stay in the tag name state. */
-            $this->token['name'] .= strtolower($char);
-            $this->state = 'tagName';
-        }
-    }
-
-    private function beforeAttributeNameState() {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            /* U+0009 CHARACTER TABULATION
-            U+000A LINE FEED (LF)
-            U+000B LINE TABULATION
-            U+000C FORM FEED (FF)
-            U+0020 SPACE
-            Stay in the before attribute name state. */
-            $this->state = 'beforeAttributeName';
-
-        } elseif($char === '>') {
-            /* U+003E GREATER-THAN SIGN (>)
-            Emit the current tag token. Switch to the data state. */
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif($char === '/') {
-            /* U+002F SOLIDUS (/)
-            Parse error unless this is a permitted slash. Stay in the before
-            attribute name state. */
-            $this->state = 'beforeAttributeName';
-
-        } elseif($this->char === $this->EOF) {
-            /* EOF
-            Parse error. Emit the current tag token. Reconsume the EOF
-            character in the data state. */
-            $this->emitToken($this->token);
-
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            /* Anything else
-            Start a new attribute in the current tag token. Set that attribute's
-            name to the current input character, and its value to the empty string.
-            Switch to the attribute name state. */
-            $this->token['attr'][] = array(
-                'name'  => strtolower($char),
-                'value' => null
-            );
-
-            $this->state = 'attributeName';
-        }
-    }
-
-    private function attributeNameState() {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            /* U+0009 CHARACTER TABULATION
-            U+000A LINE FEED (LF)
-            U+000B LINE TABULATION
-            U+000C FORM FEED (FF)
-            U+0020 SPACE
-            Stay in the before attribute name state. */
-            $this->state = 'afterAttributeName';
-
-        } elseif($char === '=') {
-            /* U+003D EQUALS SIGN (=)
-            Switch to the before attribute value state. */
-            $this->state = 'beforeAttributeValue';
-
-        } elseif($char === '>') {
-            /* U+003E GREATER-THAN SIGN (>)
-            Emit the current tag token. Switch to the data state. */
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif($char === '/' && $this->character($this->char + 1) !== '>') {
-            /* U+002F SOLIDUS (/)
-            Parse error unless this is a permitted slash. Switch to the before
-            attribute name state. */
-            $this->state = 'beforeAttributeName';
-
-        } elseif($this->char === $this->EOF) {
-            /* EOF
-            Parse error. Emit the current tag token. Reconsume the EOF
-            character in the data state. */
-            $this->emitToken($this->token);
-
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            /* Anything else
-            Append the current input character to the current attribute's name.
-            Stay in the attribute name state. */
-            $last = count($this->token['attr']) - 1;
-            $this->token['attr'][$last]['name'] .= strtolower($char);
-
-            $this->state = 'attributeName';
-        }
-    }
-
-    private function afterAttributeNameState() {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            /* U+0009 CHARACTER TABULATION
-            U+000A LINE FEED (LF)
-            U+000B LINE TABULATION
-            U+000C FORM FEED (FF)
-            U+0020 SPACE
-            Stay in the after attribute name state. */
-            $this->state = 'afterAttributeName';
-
-        } elseif($char === '=') {
-            /* U+003D EQUALS SIGN (=)
-            Switch to the before attribute value state. */
-            $this->state = 'beforeAttributeValue';
-
-        } elseif($char === '>') {
-            /* U+003E GREATER-THAN SIGN (>)
-            Emit the current tag token. Switch to the data state. */
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif($char === '/' && $this->character($this->char + 1) !== '>') {
-            /* U+002F SOLIDUS (/)
-            Parse error unless this is a permitted slash. Switch to the
-            before attribute name state. */
-            $this->state = 'beforeAttributeName';
-
-        } elseif($this->char === $this->EOF) {
-            /* EOF
-            Parse error. Emit the current tag token. Reconsume the EOF
-            character in the data state. */
-            $this->emitToken($this->token);
-
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            /* Anything else
-            Start a new attribute in the current tag token. Set that attribute's
-            name to the current input character, and its value to the empty string.
-            Switch to the attribute name state. */
-            $this->token['attr'][] = array(
-                'name'  => strtolower($char),
-                'value' => null
-            );
-
-            $this->state = 'attributeName';
-        }
-    }
-
-    private function beforeAttributeValueState() {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            /* U+0009 CHARACTER TABULATION
-            U+000A LINE FEED (LF)
-            U+000B LINE TABULATION
-            U+000C FORM FEED (FF)
-            U+0020 SPACE
-            Stay in the before attribute value state. */
-            $this->state = 'beforeAttributeValue';
-
-        } elseif($char === '"') {
-            /* U+0022 QUOTATION MARK (")
-            Switch to the attribute value (double-quoted) state. */
-            $this->state = 'attributeValueDoubleQuoted';
-
-        } elseif($char === '&') {
-            /* U+0026 AMPERSAND (&)
-            Switch to the attribute value (unquoted) state and reconsume
-            this input character. */
-            $this->char--;
-            $this->state = 'attributeValueUnquoted';
-
-        } elseif($char === '\'') {
-            /* U+0027 APOSTROPHE (')
-            Switch to the attribute value (single-quoted) state. */
-            $this->state = 'attributeValueSingleQuoted';
-
-        } elseif($char === '>') {
-            /* U+003E GREATER-THAN SIGN (>)
-            Emit the current tag token. Switch to the data state. */
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } else {
-            /* Anything else
-            Append the current input character to the current attribute's value.
-            Switch to the attribute value (unquoted) state. */
-            $last = count($this->token['attr']) - 1;
-            $this->token['attr'][$last]['value'] .= $char;
-
-            $this->state = 'attributeValueUnquoted';
-        }
-    }
-
-    private function attributeValueDoubleQuotedState() {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if($char === '"') {
-            /* U+0022 QUOTATION MARK (")
-            Switch to the before attribute name state. */
-            $this->state = 'beforeAttributeName';
-
-        } elseif($char === '&') {
-            /* U+0026 AMPERSAND (&)
-            Switch to the entity in attribute value state. */
-            $this->entityInAttributeValueState('double');
-
-        } elseif($this->char === $this->EOF) {
-            /* EOF
-            Parse error. Emit the current tag token. Reconsume the character
-            in the data state. */
-            $this->emitToken($this->token);
-
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            /* Anything else
-            Append the current input character to the current attribute's value.
-            Stay in the attribute value (double-quoted) state. */
-            $last = count($this->token['attr']) - 1;
-            $this->token['attr'][$last]['value'] .= $char;
-
-            $this->state = 'attributeValueDoubleQuoted';
-        }
-    }
-
-    private function attributeValueSingleQuotedState() {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if($char === '\'') {
-            /* U+0022 QUOTATION MARK (')
-            Switch to the before attribute name state. */
-            $this->state = 'beforeAttributeName';
-
-        } elseif($char === '&') {
-            /* U+0026 AMPERSAND (&)
-            Switch to the entity in attribute value state. */
-            $this->entityInAttributeValueState('single');
-
-        } elseif($this->char === $this->EOF) {
-            /* EOF
-            Parse error. Emit the current tag token. Reconsume the character
-            in the data state. */
-            $this->emitToken($this->token);
-
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            /* Anything else
-            Append the current input character to the current attribute's value.
-            Stay in the attribute value (single-quoted) state. */
-            $last = count($this->token['attr']) - 1;
-            $this->token['attr'][$last]['value'] .= $char;
-
-            $this->state = 'attributeValueSingleQuoted';
-        }
-    }
-
-    private function attributeValueUnquotedState() {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            /* U+0009 CHARACTER TABULATION
-            U+000A LINE FEED (LF)
-            U+000B LINE TABULATION
-            U+000C FORM FEED (FF)
-            U+0020 SPACE
-            Switch to the before attribute name state. */
-            $this->state = 'beforeAttributeName';
-
-        } elseif($char === '&') {
-            /* U+0026 AMPERSAND (&)
-            Switch to the entity in attribute value state. */
-            $this->entityInAttributeValueState();
-
-        } elseif($char === '>') {
-            /* U+003E GREATER-THAN SIGN (>)
-            Emit the current tag token. Switch to the data state. */
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } else {
-            /* Anything else
-            Append the current input character to the current attribute's value.
-            Stay in the attribute value (unquoted) state. */
-            $last = count($this->token['attr']) - 1;
-            $this->token['attr'][$last]['value'] .= $char;
-
-            $this->state = 'attributeValueUnquoted';
-        }
-    }
-
-    private function entityInAttributeValueState() {
-        // Attempt to consume an entity.
-        $entity = $this->entity();
-
-        // If nothing is returned, append a U+0026 AMPERSAND character to the
-        // current attribute's value. Otherwise, emit the character token that
-        // was returned.
-        $char = (!$entity)
-            ? '&'
-            : $entity;
-
-        $last = count($this->token['attr']) - 1;
-        $this->token['attr'][$last]['value'] .= $char;
-    }
-
-    private function bogusCommentState() {
-        /* Consume every character up to the first U+003E GREATER-THAN SIGN
-        character (>) or the end of the file (EOF), whichever comes first. Emit
-        a comment token whose data is the concatenation of all the characters
-        starting from and including the character that caused the state machine
-        to switch into the bogus comment state, up to and including the last
-        consumed character before the U+003E character, if any, or up to the
-        end of the file otherwise. (If the comment was started by the end of
-        the file (EOF), the token is empty.) */
-        $data = $this->characters('^>', $this->char);
-        $this->emitToken(array(
-            'data' => $data,
-            'type' => self::COMMENT
-        ));
-
-        $this->char += strlen($data);
-
-        /* Switch to the data state. */
-        $this->state = 'data';
-
-        /* If the end of the file was reached, reconsume the EOF character. */
-        if($this->char === $this->EOF) {
-            $this->char = $this->EOF - 1;
-        }
-    }
-
-    private function markupDeclarationOpenState() {
-        /* If the next two characters are both U+002D HYPHEN-MINUS (-)
-        characters, consume those two characters, create a comment token whose
-        data is the empty string, and switch to the comment state. */
-        if($this->character($this->char + 1, 2) === '--') {
-            $this->char += 2;
-            $this->state = 'comment';
-            $this->token = array(
-                'data' => null,
-                'type' => self::COMMENT
-            );
-
-        /* Otherwise if the next seven chacacters are a case-insensitive match
-        for the word "DOCTYPE", then consume those characters and switch to the
-        DOCTYPE state. */
-        } elseif(strtolower($this->character($this->char + 1, 7)) === 'doctype') {
-            $this->char += 7;
-            $this->state = 'doctype';
-
-        /* Otherwise, is is a parse error. Switch to the bogus comment state.
-        The next character that is consumed, if any, is the first character
-        that will be in the comment. */
-        } else {
-            $this->char++;
-            $this->state = 'bogusComment';
-        }
-    }
-
-    private function commentState() {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        /* U+002D HYPHEN-MINUS (-) */
-        if($char === '-') {
-            /* Switch to the comment dash state  */
-            $this->state = 'commentDash';
-
-        /* EOF */
-        } elseif($this->char === $this->EOF) {
-            /* Parse error. Emit the comment token. Reconsume the EOF character
-            in the data state. */
-            $this->emitToken($this->token);
-            $this->char--;
-            $this->state = 'data';
-
-        /* Anything else */
-        } else {
-            /* Append the input character to the comment token's data. Stay in
-            the comment state. */
-            $this->token['data'] .= $char;
-        }
-    }
-
-    private function commentDashState() {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        /* U+002D HYPHEN-MINUS (-) */
-        if($char === '-') {
-            /* Switch to the comment end state  */
-            $this->state = 'commentEnd';
-
-        /* EOF */
-        } elseif($this->char === $this->EOF) {
-            /* Parse error. Emit the comment token. Reconsume the EOF character
-            in the data state. */
-            $this->emitToken($this->token);
-            $this->char--;
-            $this->state = 'data';
-
-        /* Anything else */
-        } else {
-            /* Append a U+002D HYPHEN-MINUS (-) character and the input
-            character to the comment token's data. Switch to the comment state. */
-            $this->token['data'] .= '-'.$char;
-            $this->state = 'comment';
-        }
-    }
-
-    private function commentEndState() {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        if($char === '>') {
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif($char === '-') {
-            $this->token['data'] .= '-';
-
-        } elseif($this->char === $this->EOF) {
-            $this->emitToken($this->token);
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            $this->token['data'] .= '--'.$char;
-            $this->state = 'comment';
-        }
-    }
-
-    private function doctypeState() {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            $this->state = 'beforeDoctypeName';
-
-        } else {
-            $this->char--;
-            $this->state = 'beforeDoctypeName';
-        }
-    }
-
-    private function beforeDoctypeNameState() {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            // Stay in the before DOCTYPE name state.
-
-        } elseif(preg_match('/^[a-z]$/', $char)) {
-            $this->token = array(
-                'name' => strtoupper($char),
-                'type' => self::DOCTYPE,
-                'error' => true
-            );
-
-            $this->state = 'doctypeName';
-
-        } elseif($char === '>') {
-            $this->emitToken(array(
-                'name' => null,
-                'type' => self::DOCTYPE,
-                'error' => true
-            ));
-
-            $this->state = 'data';
-
-        } elseif($this->char === $this->EOF) {
-            $this->emitToken(array(
-                'name' => null,
-                'type' => self::DOCTYPE,
-                'error' => true
-            ));
-
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            $this->token = array(
-                'name' => $char,
-                'type' => self::DOCTYPE,
-                'error' => true
-            );
-
-            $this->state = 'doctypeName';
-        }
-    }
-
-    private function doctypeNameState() {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            $this->state = 'AfterDoctypeName';
-
-        } elseif($char === '>') {
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif(preg_match('/^[a-z]$/', $char)) {
-            $this->token['name'] .= strtoupper($char);
-
-        } elseif($this->char === $this->EOF) {
-            $this->emitToken($this->token);
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            $this->token['name'] .= $char;
-        }
-
-        $this->token['error'] = ($this->token['name'] === 'HTML')
-            ? false
-            : true;
-    }
-
-    private function afterDoctypeNameState() {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            // Stay in the DOCTYPE name state.
-
-        } elseif($char === '>') {
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif($this->char === $this->EOF) {
-            $this->emitToken($this->token);
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            $this->token['error'] = true;
-            $this->state = 'bogusDoctype';
-        }
-    }
-
-    private function bogusDoctypeState() {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        if($char === '>') {
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif($this->char === $this->EOF) {
-            $this->emitToken($this->token);
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            // Stay in the bogus DOCTYPE state.
-        }
-    }
-
-    private function entity() {
-        $start = $this->char;
-
-        // This section defines how to consume an entity. This definition is
-        // used when parsing entities in text and in attributes.
-
-        // The behaviour depends on the identity of the next character (the
-        // one immediately after the U+0026 AMPERSAND character): 
-
-        switch($this->character($this->char + 1)) {
-            // U+0023 NUMBER SIGN (#)
-            case '#':
-
-                // The behaviour further depends on the character after the
-                // U+0023 NUMBER SIGN:
-                switch($this->character($this->char + 1)) {
-                    // U+0078 LATIN SMALL LETTER X
-                    // U+0058 LATIN CAPITAL LETTER X
-                    case 'x':
-                    case 'X':
-                        // Follow the steps below, but using the range of
-                        // characters U+0030 DIGIT ZERO through to U+0039 DIGIT
-                        // NINE, U+0061 LATIN SMALL LETTER A through to U+0066
-                        // LATIN SMALL LETTER F, and U+0041 LATIN CAPITAL LETTER
-                        // A, through to U+0046 LATIN CAPITAL LETTER F (in other
-                        // words, 0-9, A-F, a-f).
-                        $char = 1;
-                        $char_class = '0-9A-Fa-f';
-                    break;
-
-                    // Anything else
-                    default:
-                        // Follow the steps below, but using the range of
-                        // characters U+0030 DIGIT ZERO through to U+0039 DIGIT
-                        // NINE (i.e. just 0-9).
-                        $char = 0;
-                        $char_class = '0-9';
-                    break;
-                }
-
-                // Consume as many characters as match the range of characters
-                // given above.
-                $this->char++;
-                $e_name = $this->characters($char_class, $this->char + $char + 1);
-                $entity = $this->character($start, $this->char);
-                $cond = strlen($e_name) > 0;
-
-                // The rest of the parsing happens bellow.
-            break;
-
-            // Anything else
-            default:
-                // Consume the maximum number of characters possible, with the
-                // consumed characters case-sensitively matching one of the
-                // identifiers in the first column of the entities table.
-                $e_name = $this->characters('0-9A-Za-z;', $this->char + 1);
-                $len = strlen($e_name);
-
-                for($c = 1; $c <= $len; $c++) {
-                    $id = substr($e_name, 0, $c);
-                    $this->char++;
-
-                    if(in_array($id, $this->entities)) {
-                        if ($e_name[$c-1] !== ';') {
-                            if ($c < $len && $e_name[$c] == ';') {
-                                $this->char++; // consume extra semicolon
-                            }
-                        }
-                        $entity = $id;
-                        break;
-                    }
-                }
-
-                $cond = isset($entity);
-                // The rest of the parsing happens bellow.
-            break;
-        }
-
-        if(!$cond) {
-            // If no match can be made, then this is a parse error. No
-            // characters are consumed, and nothing is returned.
-            $this->char = $start;
-            return false;
-        }
-
-        // Return a character token for the character corresponding to the
-        // entity name (as given by the second column of the entities table).
-        return html_entity_decode('&'.$entity.';', ENT_QUOTES, 'UTF-8');
-    }
-
-    private function emitToken($token) {
-        $emit = $this->tree->emitToken($token);
-
-        if(is_int($emit)) {
-            $this->content_model = $emit;
-
-        } elseif($token['type'] === self::ENDTAG) {
-            $this->content_model = self::PCDATA;
-        }
-    }
-
-    private function EOF() {
-        $this->state = null;
-        $this->tree->emitToken(array(
-            'type' => self::EOF
-        ));
-    }
-}
-
-class HTML5TreeConstructer {
-    public $stack = array();
-
-    private $phase;
-    private $mode;
-    private $dom;
-    private $foster_parent = null;
-    private $a_formatting  = array();
-
-    private $head_pointer = null;
-    private $form_pointer = null;
-
-    private $scoping = array('button','caption','html','marquee','object','table','td','th');
-    private $formatting = array('a','b','big','em','font','i','nobr','s','small','strike','strong','tt','u');
-    private $special = array('address','area','base','basefont','bgsound',
-    'blockquote','body','br','center','col','colgroup','dd','dir','div','dl',
-    'dt','embed','fieldset','form','frame','frameset','h1','h2','h3','h4','h5',
-    'h6','head','hr','iframe','image','img','input','isindex','li','link',
-    'listing','menu','meta','noembed','noframes','noscript','ol','optgroup',
-    'option','p','param','plaintext','pre','script','select','spacer','style',
-    'tbody','textarea','tfoot','thead','title','tr','ul','wbr');
-
-    // The different phases.
-    const INIT_PHASE = 0;
-    const ROOT_PHASE = 1;
-    const MAIN_PHASE = 2;
-    const END_PHASE  = 3;
-
-    // The different insertion modes for the main phase.
-    const BEFOR_HEAD = 0;
-    const IN_HEAD    = 1;
-    const AFTER_HEAD = 2;
-    const IN_BODY    = 3;
-    const IN_TABLE   = 4;
-    const IN_CAPTION = 5;
-    const IN_CGROUP  = 6;
-    const IN_TBODY   = 7;
-    const IN_ROW     = 8;
-    const IN_CELL    = 9;
-    const IN_SELECT  = 10;
-    const AFTER_BODY = 11;
-    const IN_FRAME   = 12;
-    const AFTR_FRAME = 13;
-
-    // The different types of elements.
-    const SPECIAL    = 0;
-    const SCOPING    = 1;
-    const FORMATTING = 2;
-    const PHRASING   = 3;
-
-    const MARKER     = 0;
-
-    public function __construct() {
-        $this->phase = self::INIT_PHASE;
-        $this->mode = self::BEFOR_HEAD;
-        $this->dom = new DOMDocument;
-
-        $this->dom->encoding = 'UTF-8';
-        $this->dom->preserveWhiteSpace = true;
-        $this->dom->substituteEntities = true;
-        $this->dom->strictErrorChecking = false;
-    }
-
-    // Process tag tokens
-    public function emitToken($token) {
-        switch($this->phase) {
-            case self::INIT_PHASE: return $this->initPhase($token); break;
-            case self::ROOT_PHASE: return $this->rootElementPhase($token); break;
-            case self::MAIN_PHASE: return $this->mainPhase($token); break;
-            case self::END_PHASE : return $this->trailingEndPhase($token); break;
-        }
-    }
-
-    private function initPhase($token) {
-        /* Initially, the tree construction stage must handle each token
-        emitted from the tokenisation stage as follows: */
-
-        /* A DOCTYPE token that is marked as being in error
-        A comment token
-        A start tag token
-        An end tag token
-        A character token that is not one of one of U+0009 CHARACTER TABULATION,
-            U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-            or U+0020 SPACE
-        An end-of-file token */
-        if((isset($token['error']) && $token['error']) ||
-        $token['type'] === HTML5::COMMENT ||
-        $token['type'] === HTML5::STARTTAG ||
-        $token['type'] === HTML5::ENDTAG ||
-        $token['type'] === HTML5::EOF ||
-        ($token['type'] === HTML5::CHARACTR && isset($token['data']) &&
-        !preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data']))) {
-            /* This specification does not define how to handle this case. In
-            particular, user agents may ignore the entirety of this specification
-            altogether for such documents, and instead invoke special parse modes
-            with a greater emphasis on backwards compatibility. */
-
-            $this->phase = self::ROOT_PHASE;
-            return $this->rootElementPhase($token);
-
-        /* A DOCTYPE token marked as being correct */
-        } elseif(isset($token['error']) && !$token['error']) {
-            /* Append a DocumentType node to the Document  node, with the name
-            attribute set to the name given in the DOCTYPE token (which will be
-            "HTML"), and the other attributes specific to DocumentType objects
-            set to null, empty lists, or the empty string as appropriate. */
-            $doctype = new DOMDocumentType(null, null, 'HTML');
-
-            /* Then, switch to the root element phase of the tree construction
-            stage. */
-            $this->phase = self::ROOT_PHASE;
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        or U+0020 SPACE */
-        } elseif(isset($token['data']) && preg_match('/^[\t\n\x0b\x0c ]+$/',
-        $token['data'])) {
-            /* Append that character  to the Document node. */
-            $text = $this->dom->createTextNode($token['data']);
-            $this->dom->appendChild($text);
-        }
-    }
-
-    private function rootElementPhase($token) {
-        /* After the initial phase, as each token is emitted from the tokenisation
-        stage, it must be processed as described in this section. */
-
-        /* A DOCTYPE token */
-        if($token['type'] === HTML5::DOCTYPE) {
-            // Parse error. Ignore the token.
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the Document object with the data
-            attribute set to the data given in the comment token. */
-            $comment = $this->dom->createComment($token['data']);
-            $this->dom->appendChild($comment);
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        or U+0020 SPACE */
-        } elseif($token['type'] === HTML5::CHARACTR &&
-        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
-            /* Append that character  to the Document node. */
-            $text = $this->dom->createTextNode($token['data']);
-            $this->dom->appendChild($text);
-
-        /* A character token that is not one of U+0009 CHARACTER TABULATION,
-            U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED
-            (FF), or U+0020 SPACE
-        A start tag token
-        An end tag token
-        An end-of-file token */
-        } elseif(($token['type'] === HTML5::CHARACTR &&
-        !preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) ||
-        $token['type'] === HTML5::STARTTAG ||
-        $token['type'] === HTML5::ENDTAG ||
-        $token['type'] === HTML5::EOF) {
-            /* Create an HTMLElement node with the tag name html, in the HTML
-            namespace. Append it to the Document object. Switch to the main
-            phase and reprocess the current token. */
-            $html = $this->dom->createElement('html');
-            $this->dom->appendChild($html);
-            $this->stack[] = $html;
-
-            $this->phase = self::MAIN_PHASE;
-            return $this->mainPhase($token);
-        }
-    }
-
-    private function mainPhase($token) {
-        /* Tokens in the main phase must be handled as follows: */
-
-        /* A DOCTYPE token */
-        if($token['type'] === HTML5::DOCTYPE) {
-            // Parse error. Ignore the token.
-
-        /* A start tag token with the tag name "html" */
-        } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'html') {
-            /* If this start tag token was not the first start tag token, then
-            it is a parse error. */
-
-            /* For each attribute on the token, check to see if the attribute
-            is already present on the top element of the stack of open elements.
-            If it is not, add the attribute and its corresponding value to that
-            element. */
-            foreach($token['attr'] as $attr) {
-                if(!$this->stack[0]->hasAttribute($attr['name'])) {
-                    $this->stack[0]->setAttribute($attr['name'], $attr['value']);
-                }
-            }
-
-        /* An end-of-file token */
-        } elseif($token['type'] === HTML5::EOF) {
-            /* Generate implied end tags. */
-            $this->generateImpliedEndTags();
-
-        /* Anything else. */
-        } else {
-            /* Depends on the insertion mode: */
-            switch($this->mode) {
-                case self::BEFOR_HEAD: return $this->beforeHead($token); break;
-                case self::IN_HEAD:    return $this->inHead($token); break;
-                case self::AFTER_HEAD: return $this->afterHead($token); break;
-                case self::IN_BODY:    return $this->inBody($token); break;
-                case self::IN_TABLE:   return $this->inTable($token); break;
-                case self::IN_CAPTION: return $this->inCaption($token); break;
-                case self::IN_CGROUP:  return $this->inColumnGroup($token); break;
-                case self::IN_TBODY:   return $this->inTableBody($token); break;
-                case self::IN_ROW:     return $this->inRow($token); break;
-                case self::IN_CELL:    return $this->inCell($token); break;
-                case self::IN_SELECT:  return $this->inSelect($token); break;
-                case self::AFTER_BODY: return $this->afterBody($token); break;
-                case self::IN_FRAME:   return $this->inFrameset($token); break;
-                case self::AFTR_FRAME: return $this->afterFrameset($token); break;
-                case self::END_PHASE:  return $this->trailingEndPhase($token); break;
-            }
-        }
-    }
-
-    private function beforeHead($token) {
-        /* Handle the token as follows: */
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        or U+0020 SPACE */
-        if($token['type'] === HTML5::CHARACTR &&
-        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
-            /* Append the character to the current node. */
-            $this->insertText($token['data']);
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data attribute
-            set to the data given in the comment token. */
-            $this->insertComment($token['data']);
-
-        /* A start tag token with the tag name "head" */
-        } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'head') {
-            /* Create an element for the token, append the new element to the
-            current node and push it onto the stack of open elements. */
-            $element = $this->insertElement($token);
-
-            /* Set the head element pointer to this new element node. */
-            $this->head_pointer = $element;
-
-            /* Change the insertion mode to "in head". */
-            $this->mode = self::IN_HEAD;
-
-        /* A start tag token whose tag name is one of: "base", "link", "meta",
-        "script", "style", "title". Or an end tag with the tag name "html".
-        Or a character token that is not one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        or U+0020 SPACE. Or any other start tag token */
-        } elseif($token['type'] === HTML5::STARTTAG ||
-        ($token['type'] === HTML5::ENDTAG && $token['name'] === 'html') ||
-        ($token['type'] === HTML5::CHARACTR && !preg_match('/^[\t\n\x0b\x0c ]$/',
-        $token['data']))) {
-            /* Act as if a start tag token with the tag name "head" and no
-            attributes had been seen, then reprocess the current token. */
-            $this->beforeHead(array(
-                'name' => 'head',
-                'type' => HTML5::STARTTAG,
-                'attr' => array()
-            ));
-
-            return $this->inHead($token);
-
-        /* Any other end tag */
-        } elseif($token['type'] === HTML5::ENDTAG) {
-            /* Parse error. Ignore the token. */
-        }
-    }
-
-    private function inHead($token) {
-        /* Handle the token as follows: */
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        or U+0020 SPACE.
-
-        THIS DIFFERS FROM THE SPEC: If the current node is either a title, style
-        or script element, append the character to the current node regardless
-        of its content. */
-        if(($token['type'] === HTML5::CHARACTR &&
-        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) || (
-        $token['type'] === HTML5::CHARACTR && in_array(end($this->stack)->nodeName,
-        array('title', 'style', 'script')))) {
-            /* Append the character to the current node. */
-            $this->insertText($token['data']);
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data attribute
-            set to the data given in the comment token. */
-            $this->insertComment($token['data']);
-
-        } elseif($token['type'] === HTML5::ENDTAG &&
-        in_array($token['name'], array('title', 'style', 'script'))) {
-            array_pop($this->stack);
-            return HTML5::PCDATA;
-
-        /* A start tag with the tag name "title" */
-        } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'title') {
-            /* Create an element for the token and append the new element to the
-            node pointed to by the head element pointer, or, if that is null
-            (innerHTML case), to the current node. */
-            if($this->head_pointer !== null) {
-                $element = $this->insertElement($token, false);
-                $this->head_pointer->appendChild($element);
-
-            } else {
-                $element = $this->insertElement($token);
-            }
-
-            /* Switch the tokeniser's content model flag  to the RCDATA state. */
-            return HTML5::RCDATA;
-
-        /* A start tag with the tag name "style" */
-        } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'style') {
-            /* Create an element for the token and append the new element to the
-            node pointed to by the head element pointer, or, if that is null
-            (innerHTML case), to the current node. */
-            if($this->head_pointer !== null) {
-                $element = $this->insertElement($token, false);
-                $this->head_pointer->appendChild($element);
-
-            } else {
-                $this->insertElement($token);
-            }
-
-            /* Switch the tokeniser's content model flag  to the CDATA state. */
-            return HTML5::CDATA;
-
-        /* A start tag with the tag name "script" */
-        } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'script') {
-            /* Create an element for the token. */
-            $element = $this->insertElement($token, false);
-            $this->head_pointer->appendChild($element);
-
-            /* Switch the tokeniser's content model flag  to the CDATA state. */
-            return HTML5::CDATA;
-
-        /* A start tag with the tag name "base", "link", or "meta" */
-        } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
-        array('base', 'link', 'meta'))) {
-            /* Create an element for the token and append the new element to the
-            node pointed to by the head element pointer, or, if that is null
-            (innerHTML case), to the current node. */
-            if($this->head_pointer !== null) {
-                $element = $this->insertElement($token, false);
-                $this->head_pointer->appendChild($element);
-                array_pop($this->stack);
-
-            } else {
-                $this->insertElement($token);
-            }
-
-        /* An end tag with the tag name "head" */
-        } elseif($token['type'] === HTML5::ENDTAG && $token['name'] === 'head') {
-            /* If the current node is a head element, pop the current node off
-            the stack of open elements. */
-            if($this->head_pointer->isSameNode(end($this->stack))) {
-                array_pop($this->stack);
-
-            /* Otherwise, this is a parse error. */
-            } else {
-                // k
-            }
-
-            /* Change the insertion mode to "after head". */
-            $this->mode = self::AFTER_HEAD;
-
-        /* A start tag with the tag name "head" or an end tag except "html". */
-        } elseif(($token['type'] === HTML5::STARTTAG && $token['name'] === 'head') ||
-        ($token['type'] === HTML5::ENDTAG && $token['name'] !== 'html')) {
-            // Parse error. Ignore the token.
-
-        /* Anything else */
-        } else {
-            /* If the current node is a head element, act as if an end tag
-            token with the tag name "head" had been seen. */
-            if($this->head_pointer->isSameNode(end($this->stack))) {
-                $this->inHead(array(
-                    'name' => 'head',
-                    'type' => HTML5::ENDTAG
-                ));
-
-            /* Otherwise, change the insertion mode to "after head". */
-            } else {
-                $this->mode = self::AFTER_HEAD;
-            }
-
-            /* Then, reprocess the current token. */
-            return $this->afterHead($token);
-        }
-    }
-
-    private function afterHead($token) {
-        /* Handle the token as follows: */
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        or U+0020 SPACE */
-        if($token['type'] === HTML5::CHARACTR &&
-        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
-            /* Append the character to the current node. */
-            $this->insertText($token['data']);
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data attribute
-            set to the data given in the comment token. */
-            $this->insertComment($token['data']);
-
-        /* A start tag token with the tag name "body" */
-        } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'body') {
-            /* Insert a body element for the token. */
-            $this->insertElement($token);
-
-            /* Change the insertion mode to "in body". */
-            $this->mode = self::IN_BODY;
-
-        /* A start tag token with the tag name "frameset" */
-        } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'frameset') {
-            /* Insert a frameset element for the token. */
-            $this->insertElement($token);
-
-            /* Change the insertion mode to "in frameset". */
-            $this->mode = self::IN_FRAME;
-
-        /* A start tag token whose tag name is one of: "base", "link", "meta",
-        "script", "style", "title" */
-        } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
-        array('base', 'link', 'meta', 'script', 'style', 'title'))) {
-            /* Parse error. Switch the insertion mode back to "in head" and
-            reprocess the token. */
-            $this->mode = self::IN_HEAD;
-            return $this->inHead($token);
-
-        /* Anything else */
-        } else {
-            /* Act as if a start tag token with the tag name "body" and no
-            attributes had been seen, and then reprocess the current token. */
-            $this->afterHead(array(
-                'name' => 'body',
-                'type' => HTML5::STARTTAG,
-                'attr' => array()
-            ));
-
-            return $this->inBody($token);
-        }
-    }
-
-    private function inBody($token) {
-        /* Handle the token as follows: */
-
-        switch($token['type']) {
-            /* A character token */
-            case HTML5::CHARACTR:
-                /* Reconstruct the active formatting elements, if any. */
-                $this->reconstructActiveFormattingElements();
-
-                /* Append the token's character to the current node. */
-                $this->insertText($token['data']);
-            break;
-
-            /* A comment token */
-            case HTML5::COMMENT:
-                /* Append a Comment node to the current node with the data
-                attribute set to the data given in the comment token. */
-                $this->insertComment($token['data']);
-            break;
-
-            case HTML5::STARTTAG:
-            switch($token['name']) {
-                /* A start tag token whose tag name is one of: "script",
-                "style" */
-                case 'script': case 'style':
-                    /* Process the token as if the insertion mode had been "in
-                    head". */
-                    return $this->inHead($token);
-                break;
-
-                /* A start tag token whose tag name is one of: "base", "link",
-                "meta", "title" */
-                case 'base': case 'link': case 'meta': case 'title':
-                    /* Parse error. Process the token as if the insertion mode
-                    had    been "in head". */
-                    return $this->inHead($token);
-                break;
-
-                /* A start tag token with the tag name "body" */
-                case 'body':
-                    /* Parse error. If the second element on the stack of open
-                    elements is not a body element, or, if the stack of open
-                    elements has only one node on it, then ignore the token.
-                    (innerHTML case) */
-                    if(count($this->stack) === 1 || $this->stack[1]->nodeName !== 'body') {
-                        // Ignore
-
-                    /* Otherwise, for each attribute on the token, check to see
-                    if the attribute is already present on the body element (the
-                    second element)    on the stack of open elements. If it is not,
-                    add the attribute and its corresponding value to that
-                    element. */
-                    } else {
-                        foreach($token['attr'] as $attr) {
-                            if(!$this->stack[1]->hasAttribute($attr['name'])) {
-                                $this->stack[1]->setAttribute($attr['name'], $attr['value']);
-                            }
-                        }
-                    }
-                break;
-
-                /* A start tag whose tag name is one of: "address",
-                "blockquote", "center", "dir", "div", "dl", "fieldset",
-                "listing", "menu", "ol", "p", "ul" */
-                case 'address': case 'blockquote': case 'center': case 'dir':
-                case 'div': case 'dl': case 'fieldset': case 'listing':
-                case 'menu': case 'ol': case 'p': case 'ul':
-                    /* If the stack of open elements has a p element in scope,
-                    then act as if an end tag with the tag name p had been
-                    seen. */
-                    if($this->elementInScope('p')) {
-                        $this->emitToken(array(
-                            'name' => 'p',
-                            'type' => HTML5::ENDTAG
-                        ));
-                    }
-
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
-                break;
-
-                /* A start tag whose tag name is "form" */
-                case 'form':
-                    /* If the form element pointer is not null, ignore the
-                    token with a parse error. */
-                    if($this->form_pointer !== null) {
-                        // Ignore.
-
-                    /* Otherwise: */
-                    } else {
-                        /* If the stack of open elements has a p element in
-                        scope, then act as if an end tag with the tag name p
-                        had been seen. */
-                        if($this->elementInScope('p')) {
-                            $this->emitToken(array(
-                                'name' => 'p',
-                                'type' => HTML5::ENDTAG
-                            ));
-                        }
-
-                        /* Insert an HTML element for the token, and set the
-                        form element pointer to point to the element created. */
-                        $element = $this->insertElement($token);
-                        $this->form_pointer = $element;
-                    }
-                break;
-
-                /* A start tag whose tag name is "li", "dd" or "dt" */
-                case 'li': case 'dd': case 'dt':
-                    /* If the stack of open elements has a p  element in scope,
-                    then act as if an end tag with the tag name p had been
-                    seen. */
-                    if($this->elementInScope('p')) {
-                        $this->emitToken(array(
-                            'name' => 'p',
-                            'type' => HTML5::ENDTAG
-                        ));
-                    }
-
-                    $stack_length = count($this->stack) - 1;
-
-                    for($n = $stack_length; 0 <= $n; $n--) {
-                        /* 1. Initialise node to be the current node (the
-                        bottommost node of the stack). */
-                        $stop = false;
-                        $node = $this->stack[$n];
-                        $cat  = $this->getElementCategory($node->tagName);
-
-                        /* 2. If node is an li, dd or dt element, then pop all
-                        the    nodes from the current node up to node, including
-                        node, then stop this algorithm. */
-                        if($token['name'] === $node->tagName ||    ($token['name'] !== 'li'
-                        && ($node->tagName === 'dd' || $node->tagName === 'dt'))) {
-                            for($x = $stack_length; $x >= $n ; $x--) {
-                                array_pop($this->stack);
-                            }
-
-                            break;
-                        }
-
-                        /* 3. If node is not in the formatting category, and is
-                        not    in the phrasing category, and is not an address or
-                        div element, then stop this algorithm. */
-                        if($cat !== self::FORMATTING && $cat !== self::PHRASING &&
-                        $node->tagName !== 'address' && $node->tagName !== 'div') {
-                            break;
-                        }
-                    }
-
-                    /* Finally, insert an HTML element with the same tag
-                    name as the    token's. */
-                    $this->insertElement($token);
-                break;
-
-                /* A start tag token whose tag name is "plaintext" */
-                case 'plaintext':
-                    /* If the stack of open elements has a p  element in scope,
-                    then act as if an end tag with the tag name p had been
-                    seen. */
-                    if($this->elementInScope('p')) {
-                        $this->emitToken(array(
-                            'name' => 'p',
-                            'type' => HTML5::ENDTAG
-                        ));
-                    }
-
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
-
-                    return HTML5::PLAINTEXT;
-                break;
-
-                /* A start tag whose tag name is one of: "h1", "h2", "h3", "h4",
-                "h5", "h6" */
-                case 'h1': case 'h2': case 'h3': case 'h4': case 'h5': case 'h6':
-                    /* If the stack of open elements has a p  element in scope,
-                    then act as if an end tag with the tag name p had been seen. */
-                    if($this->elementInScope('p')) {
-                        $this->emitToken(array(
-                            'name' => 'p',
-                            'type' => HTML5::ENDTAG
-                        ));
-                    }
-
-                    /* If the stack of open elements has in scope an element whose
-                    tag name is one of "h1", "h2", "h3", "h4", "h5", or "h6", then
-                    this is a parse error; pop elements from the stack until an
-                    element with one of those tag names has been popped from the
-                    stack. */
-                    while($this->elementInScope(array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'))) {
-                        array_pop($this->stack);
-                    }
-
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
-                break;
-
-                /* A start tag whose tag name is "a" */
-                case 'a':
-                    /* If the list of active formatting elements contains
-                    an element whose tag name is "a" between the end of the
-                    list and the last marker on the list (or the start of
-                    the list if there is no marker on the list), then this
-                    is a parse error; act as if an end tag with the tag name
-                    "a" had been seen, then remove that element from the list
-                    of active formatting elements and the stack of open
-                    elements if the end tag didn't already remove it (it
-                    might not have if the element is not in table scope). */
-                    $leng = count($this->a_formatting);
-
-                    for($n = $leng - 1; $n >= 0; $n--) {
-                        if($this->a_formatting[$n] === self::MARKER) {
-                            break;
-
-                        } elseif($this->a_formatting[$n]->nodeName === 'a') {
-                            $this->emitToken(array(
-                                'name' => 'a',
-                                'type' => HTML5::ENDTAG
-                            ));
-                            break;
-                        }
-                    }
-
-                    /* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
-
-                    /* Insert an HTML element for the token. */
-                    $el = $this->insertElement($token);
-
-                    /* Add that element to the list of active formatting
-                    elements. */
-                    $this->a_formatting[] = $el;
-                break;
-
-                /* A start tag whose tag name is one of: "b", "big", "em", "font",
-                "i", "nobr", "s", "small", "strike", "strong", "tt", "u" */
-                case 'b': case 'big': case 'em': case 'font': case 'i':
-                case 'nobr': case 's': case 'small': case 'strike':
-                case 'strong': case 'tt': case 'u':
-                    /* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
-
-                    /* Insert an HTML element for the token. */
-                    $el = $this->insertElement($token);
-
-                    /* Add that element to the list of active formatting
-                    elements. */
-                    $this->a_formatting[] = $el;
-                break;
-
-                /* A start tag token whose tag name is "button" */
-                case 'button':
-                    /* If the stack of open elements has a button element in scope,
-                    then this is a parse error; act as if an end tag with the tag
-                    name "button" had been seen, then reprocess the token. (We don't
-                    do that. Unnecessary.) */
-                    if($this->elementInScope('button')) {
-                        $this->inBody(array(
-                            'name' => 'button',
-                            'type' => HTML5::ENDTAG
-                        ));
-                    }
-
-                    /* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
-
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
-
-                    /* Insert a marker at the end of the list of active
-                    formatting elements. */
-                    $this->a_formatting[] = self::MARKER;
-                break;
-
-                /* A start tag token whose tag name is one of: "marquee", "object" */
-                case 'marquee': case 'object':
-                    /* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
-
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
-
-                    /* Insert a marker at the end of the list of active
-                    formatting elements. */
-                    $this->a_formatting[] = self::MARKER;
-                break;
-
-                /* A start tag token whose tag name is "xmp" */
-                case 'xmp':
-                    /* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
-
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
-
-                    /* Switch the content model flag to the CDATA state. */
-                    return HTML5::CDATA;
-                break;
-
-                /* A start tag whose tag name is "table" */
-                case 'table':
-                    /* If the stack of open elements has a p element in scope,
-                    then act as if an end tag with the tag name p had been seen. */
-                    if($this->elementInScope('p')) {
-                        $this->emitToken(array(
-                            'name' => 'p',
-                            'type' => HTML5::ENDTAG
-                        ));
-                    }
-
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
-
-                    /* Change the insertion mode to "in table". */
-                    $this->mode = self::IN_TABLE;
-                break;
-
-                /* A start tag whose tag name is one of: "area", "basefont",
-                "bgsound", "br", "embed", "img", "param", "spacer", "wbr" */
-                case 'area': case 'basefont': case 'bgsound': case 'br':
-                case 'embed': case 'img': case 'param': case 'spacer':
-                case 'wbr':
-                    /* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
-
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
-
-                    /* Immediately pop the current node off the stack of open elements. */
-                    array_pop($this->stack);
-                break;
-
-                /* A start tag whose tag name is "hr" */
-                case 'hr':
-                    /* If the stack of open elements has a p element in scope,
-                    then act as if an end tag with the tag name p had been seen. */
-                    if($this->elementInScope('p')) {
-                        $this->emitToken(array(
-                            'name' => 'p',
-                            'type' => HTML5::ENDTAG
-                        ));
-                    }
-
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
-
-                    /* Immediately pop the current node off the stack of open elements. */
-                    array_pop($this->stack);
-                break;
-
-                /* A start tag whose tag name is "image" */
-                case 'image':
-                    /* Parse error. Change the token's tag name to "img" and
-                    reprocess it. (Don't ask.) */
-                    $token['name'] = 'img';
-                    return $this->inBody($token);
-                break;
-
-                /* A start tag whose tag name is "input" */
-                case 'input':
-                    /* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
-
-                    /* Insert an input element for the token. */
-                    $element = $this->insertElement($token, false);
-
-                    /* If the form element pointer is not null, then associate the
-                    input element with the form element pointed to by the form
-                    element pointer. */
-                    $this->form_pointer !== null
-                        ? $this->form_pointer->appendChild($element)
-                        : end($this->stack)->appendChild($element);
-
-                    /* Pop that input element off the stack of open elements. */
-                    array_pop($this->stack);
-                break;
-
-                /* A start tag whose tag name is "isindex" */
-                case 'isindex':
-                    /* Parse error. */
-                    // w/e
-
-                    /* If the form element pointer is not null,
-                    then ignore the token. */
-                    if($this->form_pointer === null) {
-                        /* Act as if a start tag token with the tag name "form" had
-                        been seen. */
-                        $this->inBody(array(
-                            'name' => 'body',
-                            'type' => HTML5::STARTTAG,
-                            'attr' => array()
-                        ));
-
-                        /* Act as if a start tag token with the tag name "hr" had
-                        been seen. */
-                        $this->inBody(array(
-                            'name' => 'hr',
-                            'type' => HTML5::STARTTAG,
-                            'attr' => array()
-                        ));
-
-                        /* Act as if a start tag token with the tag name "p" had
-                        been seen. */
-                        $this->inBody(array(
-                            'name' => 'p',
-                            'type' => HTML5::STARTTAG,
-                            'attr' => array()
-                        ));
-
-                        /* Act as if a start tag token with the tag name "label"
-                        had been seen. */
-                        $this->inBody(array(
-                            'name' => 'label',
-                            'type' => HTML5::STARTTAG,
-                            'attr' => array()
-                        ));
-
-                        /* Act as if a stream of character tokens had been seen. */
-                        $this->insertText('This is a searchable index. '.
-                        'Insert your search keywords here: ');
-
-                        /* Act as if a start tag token with the tag name "input"
-                        had been seen, with all the attributes from the "isindex"
-                        token, except with the "name" attribute set to the value
-                        "isindex" (ignoring any explicit "name" attribute). */
-                        $attr = $token['attr'];
-                        $attr[] = array('name' => 'name', 'value' => 'isindex');
-
-                        $this->inBody(array(
-                            'name' => 'input',
-                            'type' => HTML5::STARTTAG,
-                            'attr' => $attr
-                        ));
-
-                        /* Act as if a stream of character tokens had been seen
-                        (see below for what they should say). */
-                        $this->insertText('This is a searchable index. '.
-                        'Insert your search keywords here: ');
-
-                        /* Act as if an end tag token with the tag name "label"
-                        had been seen. */
-                        $this->inBody(array(
-                            'name' => 'label',
-                            'type' => HTML5::ENDTAG
-                        ));
-
-                        /* Act as if an end tag token with the tag name "p" had
-                        been seen. */
-                        $this->inBody(array(
-                            'name' => 'p',
-                            'type' => HTML5::ENDTAG
-                        ));
-
-                        /* Act as if a start tag token with the tag name "hr" had
-                        been seen. */
-                        $this->inBody(array(
-                            'name' => 'hr',
-                            'type' => HTML5::ENDTAG
-                        ));
-
-                        /* Act as if an end tag token with the tag name "form" had
-                        been seen. */
-                        $this->inBody(array(
-                            'name' => 'form',
-                            'type' => HTML5::ENDTAG
-                        ));
-                    }
-                break;
-
-                /* A start tag whose tag name is "textarea" */
-                case 'textarea':
-                    $this->insertElement($token);
-
-                    /* Switch the tokeniser's content model flag to the
-                    RCDATA state. */
-                    return HTML5::RCDATA;
-                break;
-
-                /* A start tag whose tag name is one of: "iframe", "noembed",
-                "noframes" */
-                case 'iframe': case 'noembed': case 'noframes':
-                    $this->insertElement($token);
-
-                    /* Switch the tokeniser's content model flag to the CDATA state. */
-                    return HTML5::CDATA;
-                break;
-
-                /* A start tag whose tag name is "select" */
-                case 'select':
-                    /* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
-
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
-
-                    /* Change the insertion mode to "in select". */
-                    $this->mode = self::IN_SELECT;
-                break;
-
-                /* A start or end tag whose tag name is one of: "caption", "col",
-                "colgroup", "frame", "frameset", "head", "option", "optgroup",
-                "tbody", "td", "tfoot", "th", "thead", "tr". */
-                case 'caption': case 'col': case 'colgroup': case 'frame':
-                case 'frameset': case 'head': case 'option': case 'optgroup':
-                case 'tbody': case 'td': case 'tfoot': case 'th': case 'thead':
-                case 'tr':
-                    // Parse error. Ignore the token.
-                break;
-
-                /* A start or end tag whose tag name is one of: "event-source",
-                "section", "nav", "article", "aside", "header", "footer",
-                "datagrid", "command" */
-                case 'event-source': case 'section': case 'nav': case 'article':
-                case 'aside': case 'header': case 'footer': case 'datagrid':
-                case 'command':
-                    // Work in progress!
-                break;
-
-                /* A start tag token not covered by the previous entries */
-                default:
-                    /* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
-
-                    $this->insertElement($token, true, true);
-                break;
-            }
-            break;
-
-            case HTML5::ENDTAG:
-            switch($token['name']) {
-                /* An end tag with the tag name "body" */
-                case 'body':
-                    /* If the second element in the stack of open elements is
-                    not a body element, this is a parse error. Ignore the token.
-                    (innerHTML case) */
-                    if(count($this->stack) < 2 || $this->stack[1]->nodeName !== 'body') {
-                        // Ignore.
-
-                    /* If the current node is not the body element, then this
-                    is a parse error. */
-                    } elseif(end($this->stack)->nodeName !== 'body') {
-                        // Parse error.
-                    }
-
-                    /* Change the insertion mode to "after body". */
-                    $this->mode = self::AFTER_BODY;
-                break;
-
-                /* An end tag with the tag name "html" */
-                case 'html':
-                    /* Act as if an end tag with tag name "body" had been seen,
-                    then, if that token wasn't ignored, reprocess the current
-                    token. */
-                    $this->inBody(array(
-                        'name' => 'body',
-                        'type' => HTML5::ENDTAG
-                    ));
-
-                    return $this->afterBody($token);
-                break;
-
-                /* An end tag whose tag name is one of: "address", "blockquote",
-                "center", "dir", "div", "dl", "fieldset", "listing", "menu",
-                "ol", "pre", "ul" */
-                case 'address': case 'blockquote': case 'center': case 'dir':
-                case 'div': case 'dl': case 'fieldset': case 'listing':
-                case 'menu': case 'ol': case 'pre': case 'ul':
-                    /* If the stack of open elements has an element in scope
-                    with the same tag name as that of the token, then generate
-                    implied end tags. */
-                    if($this->elementInScope($token['name'])) {
-                        $this->generateImpliedEndTags();
-
-                        /* Now, if the current node is not an element with
-                        the same tag name as that of the token, then this
-                        is a parse error. */
-                        // w/e
-
-                        /* If the stack of open elements has an element in
-                        scope with the same tag name as that of the token,
-                        then pop elements from this stack until an element
-                        with that tag name has been popped from the stack. */
-                        for($n = count($this->stack) - 1; $n >= 0; $n--) {
-                            if($this->stack[$n]->nodeName === $token['name']) {
-                                $n = -1;
-                            }
-
-                            array_pop($this->stack);
-                        }
-                    }
-                break;
-
-                /* An end tag whose tag name is "form" */
-                case 'form':
-                    /* If the stack of open elements has an element in scope
-                    with the same tag name as that of the token, then generate
-                    implied    end tags. */
-                    if($this->elementInScope($token['name'])) {
-                        $this->generateImpliedEndTags();
-
-                    } 
-
-                    if(end($this->stack)->nodeName !== $token['name']) {
-                        /* Now, if the current node is not an element with the
-                        same tag name as that of the token, then this is a parse
-                        error. */
-                        // w/e
-
-                    } else {
-                        /* Otherwise, if the current node is an element with
-                        the same tag name as that of the token pop that element
-                        from the stack. */
-                        array_pop($this->stack);
-                    }
-
-                    /* In any case, set the form element pointer to null. */
-                    $this->form_pointer = null;
-                break;
-
-                /* An end tag whose tag name is "p" */
-                case 'p':
-                    /* If the stack of open elements has a p element in scope,
-                    then generate implied end tags, except for p elements. */
-                    if($this->elementInScope('p')) {
-                        $this->generateImpliedEndTags(array('p'));
-
-                        /* If the current node is not a p element, then this is
-                        a parse error. */
-                        // k
-
-                        /* If the stack of open elements has a p element in
-                        scope, then pop elements from this stack until the stack
-                        no longer has a p element in scope. */
-                        for($n = count($this->stack) - 1; $n >= 0; $n--) {
-                            if($this->elementInScope('p')) {
-                                array_pop($this->stack);
-
-                            } else {
-                                break;
-                            }
-                        }
-                    }
-                break;
-
-                /* An end tag whose tag name is "dd", "dt", or "li" */
-                case 'dd': case 'dt': case 'li':
-                    /* If the stack of open elements has an element in scope
-                    whose tag name matches the tag name of the token, then
-                    generate implied end tags, except for elements with the
-                    same tag name as the token. */
-                    if($this->elementInScope($token['name'])) {
-                        $this->generateImpliedEndTags(array($token['name']));
-
-                        /* If the current node is not an element with the same
-                        tag name as the token, then this is a parse error. */
-                        // w/e
-
-                        /* If the stack of open elements has an element in scope
-                        whose tag name matches the tag name of the token, then
-                        pop elements from this stack until an element with that
-                        tag name has been popped from the stack. */
-                        for($n = count($this->stack) - 1; $n >= 0; $n--) {
-                            if($this->stack[$n]->nodeName === $token['name']) {
-                                $n = -1;
-                            }
-
-                            array_pop($this->stack);
-                        }
-                    }
-                break;
-
-                /* An end tag whose tag name is one of: "h1", "h2", "h3", "h4",
-                "h5", "h6" */
-                case 'h1': case 'h2': case 'h3': case 'h4': case 'h5': case 'h6':
-                    $elements = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6');
-
-                    /* If the stack of open elements has in scope an element whose
-                    tag name is one of "h1", "h2", "h3", "h4", "h5", or "h6", then
-                    generate implied end tags. */
-                    if($this->elementInScope($elements)) {
-                        $this->generateImpliedEndTags();
-
-                        /* Now, if the current node is not an element with the same
-                        tag name as that of the token, then this is a parse error. */
-                        // w/e
-
-                        /* If the stack of open elements has in scope an element
-                        whose tag name is one of "h1", "h2", "h3", "h4", "h5", or
-                        "h6", then pop elements from the stack until an element
-                        with one of those tag names has been popped from the stack. */
-                        while($this->elementInScope($elements)) {
-                            array_pop($this->stack);
-                        }
-                    }
-                break;
-
-                /* An end tag whose tag name is one of: "a", "b", "big", "em",
-                "font", "i", "nobr", "s", "small", "strike", "strong", "tt", "u" */
-                case 'a': case 'b': case 'big': case 'em': case 'font':
-                case 'i': case 'nobr': case 's': case 'small': case 'strike':
-                case 'strong': case 'tt': case 'u':
-                    /* 1. Let the formatting element be the last element in
-                    the list of active formatting elements that:
-                        * is between the end of the list and the last scope
-                        marker in the list, if any, or the start of the list
-                        otherwise, and
-                        * has the same tag name as the token.
-                    */
-                    while(true) {
-                        for($a = count($this->a_formatting) - 1; $a >= 0; $a--) {
-                            if($this->a_formatting[$a] === self::MARKER) {
-                                break;
-
-                            } elseif($this->a_formatting[$a]->tagName === $token['name']) {
-                                $formatting_element = $this->a_formatting[$a];
-                                $in_stack = in_array($formatting_element, $this->stack, true);
-                                $fe_af_pos = $a;
-                                break;
-                            }
-                        }
-
-                        /* If there is no such node, or, if that node is
-                        also in the stack of open elements but the element
-                        is not in scope, then this is a parse error. Abort
-                        these steps. The token is ignored. */
-                        if(!isset($formatting_element) || ($in_stack &&
-                        !$this->elementInScope($token['name']))) {
-                            break;
-
-                        /* Otherwise, if there is such a node, but that node
-                        is not in the stack of open elements, then this is a
-                        parse error; remove the element from the list, and
-                        abort these steps. */
-                        } elseif(isset($formatting_element) && !$in_stack) {
-                            unset($this->a_formatting[$fe_af_pos]);
-                            $this->a_formatting = array_merge($this->a_formatting);
-                            break;
-                        }
-
-                        /* 2. Let the furthest block be the topmost node in the
-                        stack of open elements that is lower in the stack
-                        than the formatting element, and is not an element in
-                        the phrasing or formatting categories. There might
-                        not be one. */
-                        $fe_s_pos = array_search($formatting_element, $this->stack, true);
-                        $length = count($this->stack);
-
-                        for($s = $fe_s_pos + 1; $s < $length; $s++) {
-                            $category = $this->getElementCategory($this->stack[$s]->nodeName);
-
-                            if($category !== self::PHRASING && $category !== self::FORMATTING) {
-                                $furthest_block = $this->stack[$s];
-                            }
-                        }
-
-                        /* 3. If there is no furthest block, then the UA must
-                        skip the subsequent steps and instead just pop all
-                        the nodes from the bottom of the stack of open
-                        elements, from the current node up to the formatting
-                        element, and remove the formatting element from the
-                        list of active formatting elements. */
-                        if(!isset($furthest_block)) {
-                            for($n = $length - 1; $n >= $fe_s_pos; $n--) {
-                                array_pop($this->stack);
-                            }
-
-                            unset($this->a_formatting[$fe_af_pos]);
-                            $this->a_formatting = array_merge($this->a_formatting);
-                            break;
-                        }
-
-                        /* 4. Let the common ancestor be the element
-                        immediately above the formatting element in the stack
-                        of open elements. */
-                        $common_ancestor = $this->stack[$fe_s_pos - 1];
-
-                        /* 5. If the furthest block has a parent node, then
-                        remove the furthest block from its parent node. */
-                        if($furthest_block->parentNode !== null) {
-                            $furthest_block->parentNode->removeChild($furthest_block);
-                        }
-
-                        /* 6. Let a bookmark note the position of the
-                        formatting element in the list of active formatting
-                        elements relative to the elements on either side
-                        of it in the list. */
-                        $bookmark = $fe_af_pos;
-
-                        /* 7. Let node and last node  be the furthest block.
-                        Follow these steps: */
-                        $node = $furthest_block;
-                        $last_node = $furthest_block;
-
-                        while(true) {
-                            for($n = array_search($node, $this->stack, true) - 1; $n >= 0; $n--) {
-                                /* 7.1 Let node be the element immediately
-                                prior to node in the stack of open elements. */
-                                $node = $this->stack[$n];
-
-                                /* 7.2 If node is not in the list of active
-                                formatting elements, then remove node from
-                                the stack of open elements and then go back
-                                to step 1. */
-                                if(!in_array($node, $this->a_formatting, true)) {
-                                    unset($this->stack[$n]);
-                                    $this->stack = array_merge($this->stack);
-
-                                } else {
-                                    break;
-                                }
-                            }
-
-                            /* 7.3 Otherwise, if node is the formatting
-                            element, then go to the next step in the overall
-                            algorithm. */
-                            if($node === $formatting_element) {
-                                break;
-
-                            /* 7.4 Otherwise, if last node is the furthest
-                            block, then move the aforementioned bookmark to
-                            be immediately after the node in the list of
-                            active formatting elements. */
-                            } elseif($last_node === $furthest_block) {
-                                $bookmark = array_search($node, $this->a_formatting, true) + 1;
-                            }
-
-                            /* 7.5 If node has any children, perform a
-                            shallow clone of node, replace the entry for
-                            node in the list of active formatting elements
-                            with an entry for the clone, replace the entry
-                            for node in the stack of open elements with an
-                            entry for the clone, and let node be the clone. */
-                            if($node->hasChildNodes()) {
-                                $clone = $node->cloneNode();
-                                $s_pos = array_search($node, $this->stack, true);
-                                $a_pos = array_search($node, $this->a_formatting, true);
-
-                                $this->stack[$s_pos] = $clone;
-                                $this->a_formatting[$a_pos] = $clone;
-                                $node = $clone;
-                            }
-
-                            /* 7.6 Insert last node into node, first removing
-                            it from its previous parent node if any. */
-                            if($last_node->parentNode !== null) {
-                                $last_node->parentNode->removeChild($last_node);
-                            }
-
-                            $node->appendChild($last_node);
-
-                            /* 7.7 Let last node be node. */
-                            $last_node = $node;
-                        }
-
-                        /* 8. Insert whatever last node ended up being in
-                        the previous step into the common ancestor node,
-                        first removing it from its previous parent node if
-                        any. */
-                        if($last_node->parentNode !== null) {
-                            $last_node->parentNode->removeChild($last_node);
-                        }
-
-                        $common_ancestor->appendChild($last_node);
-
-                        /* 9. Perform a shallow clone of the formatting
-                        element. */
-                        $clone = $formatting_element->cloneNode();
-
-                        /* 10. Take all of the child nodes of the furthest
-                        block and append them to the clone created in the
-                        last step. */
-                        while($furthest_block->hasChildNodes()) {
-                            $child = $furthest_block->firstChild;
-                            $furthest_block->removeChild($child);
-                            $clone->appendChild($child);
-                        }
-
-                        /* 11. Append that clone to the furthest block. */
-                        $furthest_block->appendChild($clone);
-
-                        /* 12. Remove the formatting element from the list
-                        of active formatting elements, and insert the clone
-                        into the list of active formatting elements at the
-                        position of the aforementioned bookmark. */
-                        $fe_af_pos = array_search($formatting_element, $this->a_formatting, true);
-                        unset($this->a_formatting[$fe_af_pos]);
-                        $this->a_formatting = array_merge($this->a_formatting);
-
-                        $af_part1 = array_slice($this->a_formatting, 0, $bookmark - 1);
-                        $af_part2 = array_slice($this->a_formatting, $bookmark, count($this->a_formatting));
-                        $this->a_formatting = array_merge($af_part1, array($clone), $af_part2);
-
-                        /* 13. Remove the formatting element from the stack
-                        of open elements, and insert the clone into the stack
-                        of open elements immediately after (i.e. in a more
-                        deeply nested position than) the position of the
-                        furthest block in that stack. */
-                        $fe_s_pos = array_search($formatting_element, $this->stack, true);
-                        $fb_s_pos = array_search($furthest_block, $this->stack, true);
-                        unset($this->stack[$fe_s_pos]);
-
-                        $s_part1 = array_slice($this->stack, 0, $fb_s_pos);
-                        $s_part2 = array_slice($this->stack, $fb_s_pos + 1, count($this->stack));
-                        $this->stack = array_merge($s_part1, array($clone), $s_part2);
-
-                        /* 14. Jump back to step 1 in this series of steps. */
-                        unset($formatting_element, $fe_af_pos, $fe_s_pos, $furthest_block);
-                    }
-                break;
-
-                /* An end tag token whose tag name is one of: "button",
-                "marquee", "object" */
-                case 'button': case 'marquee': case 'object':
-                    /* If the stack of open elements has an element in scope whose
-                    tag name matches the tag name of the token, then generate implied
-                    tags. */
-                    if($this->elementInScope($token['name'])) {
-                        $this->generateImpliedEndTags();
-
-                        /* Now, if the current node is not an element with the same
-                        tag name as the token, then this is a parse error. */
-                        // k
-
-                        /* Now, if the stack of open elements has an element in scope
-                        whose tag name matches the tag name of the token, then pop
-                        elements from the stack until that element has been popped from
-                        the stack, and clear the list of active formatting elements up
-                        to the last marker. */
-                        for($n = count($this->stack) - 1; $n >= 0; $n--) {
-                            if($this->stack[$n]->nodeName === $token['name']) {
-                                $n = -1;
-                            }
-
-                            array_pop($this->stack);
-                        }
-
-                        $marker = end(array_keys($this->a_formatting, self::MARKER, true));
-
-                        for($n = count($this->a_formatting) - 1; $n > $marker; $n--) {
-                            array_pop($this->a_formatting);
-                        }
-                    }
-                break;
-
-                /* Or an end tag whose tag name is one of: "area", "basefont",
-                "bgsound", "br", "embed", "hr", "iframe", "image", "img",
-                "input", "isindex", "noembed", "noframes", "param", "select",
-                "spacer", "table", "textarea", "wbr" */
-                case 'area': case 'basefont': case 'bgsound': case 'br':
-                case 'embed': case 'hr': case 'iframe': case 'image':
-                case 'img': case 'input': case 'isindex': case 'noembed':
-                case 'noframes': case 'param': case 'select': case 'spacer':
-                case 'table': case 'textarea': case 'wbr':
-                    // Parse error. Ignore the token.
-                break;
-
-                /* An end tag token not covered by the previous entries */
-                default:
-                    for($n = count($this->stack) - 1; $n >= 0; $n--) {
-                        /* Initialise node to be the current node (the bottommost
-                        node of the stack). */
-                        $node = end($this->stack);
-
-                        /* If node has the same tag name as the end tag token,
-                        then: */
-                        if($token['name'] === $node->nodeName) {
-                            /* Generate implied end tags. */
-                            $this->generateImpliedEndTags();
-
-                            /* If the tag name of the end tag token does not
-                            match the tag name of the current node, this is a
-                            parse error. */
-                            // k
-
-                            /* Pop all the nodes from the current node up to
-                            node, including node, then stop this algorithm. */
-                            for($x = count($this->stack) - $n; $x >= $n; $x--) {
-                                array_pop($this->stack);
-                            }
-                                    
-                        } else {
-                            $category = $this->getElementCategory($node);
-
-                            if($category !== self::SPECIAL && $category !== self::SCOPING) {
-                                /* Otherwise, if node is in neither the formatting
-                                category nor the phrasing category, then this is a
-                                parse error. Stop this algorithm. The end tag token
-                                is ignored. */
-                                return false;
-                            }
-                        }
-                    }
-                break;
-            }
-            break;
-        }
-    }
-
-    private function inTable($token) {
-        $clear = array('html', 'table');
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        or U+0020 SPACE */
-        if($token['type'] === HTML5::CHARACTR &&
-        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
-            /* Append the character to the current node. */
-            $text = $this->dom->createTextNode($token['data']);
-            end($this->stack)->appendChild($text);
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data
-            attribute set to the data given in the comment token. */
-            $comment = $this->dom->createComment($token['data']);
-            end($this->stack)->appendChild($comment);
-
-        /* A start tag whose tag name is "caption" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
-        $token['name'] === 'caption') {
-            /* Clear the stack back to a table context. */
-            $this->clearStackToTableContext($clear);
-
-            /* Insert a marker at the end of the list of active
-            formatting elements. */
-            $this->a_formatting[] = self::MARKER;
-
-            /* Insert an HTML element for the token, then switch the
-            insertion mode to "in caption". */
-            $this->insertElement($token);
-            $this->mode = self::IN_CAPTION;
-
-        /* A start tag whose tag name is "colgroup" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
-        $token['name'] === 'colgroup') {
-            /* Clear the stack back to a table context. */
-            $this->clearStackToTableContext($clear);
-
-            /* Insert an HTML element for the token, then switch the
-            insertion mode to "in column group". */
-            $this->insertElement($token);
-            $this->mode = self::IN_CGROUP;
-
-        /* A start tag whose tag name is "col" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
-        $token['name'] === 'col') {
-            $this->inTable(array(
-                'name' => 'colgroup',
-                'type' => HTML5::STARTTAG,
-                'attr' => array()
-            ));
-
-            $this->inColumnGroup($token);
-
-        /* A start tag whose tag name is one of: "tbody", "tfoot", "thead" */
-        } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
-        array('tbody', 'tfoot', 'thead'))) {
-            /* Clear the stack back to a table context. */
-            $this->clearStackToTableContext($clear);
-
-            /* Insert an HTML element for the token, then switch the insertion
-            mode to "in table body". */
-            $this->insertElement($token);
-            $this->mode = self::IN_TBODY;
-
-        /* A start tag whose tag name is one of: "td", "th", "tr" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
-        in_array($token['name'], array('td', 'th', 'tr'))) {
-            /* Act as if a start tag token with the tag name "tbody" had been
-            seen, then reprocess the current token. */
-            $this->inTable(array(
-                'name' => 'tbody',
-                'type' => HTML5::STARTTAG,
-                'attr' => array()
-            ));
-
-            return $this->inTableBody($token);
-
-        /* A start tag whose tag name is "table" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
-        $token['name'] === 'table') {
-            /* Parse error. Act as if an end tag token with the tag name "table"
-            had been seen, then, if that token wasn't ignored, reprocess the
-            current token. */
-            $this->inTable(array(
-                'name' => 'table',
-                'type' => HTML5::ENDTAG
-            ));
-
-            return $this->mainPhase($token);
-
-        /* An end tag whose tag name is "table" */
-        } elseif($token['type'] === HTML5::ENDTAG &&
-        $token['name'] === 'table') {
-            /* If the stack of open elements does not have an element in table
-            scope with the same tag name as the token, this is a parse error.
-            Ignore the token. (innerHTML case) */
-            if(!$this->elementInScope($token['name'], true)) {
-                return false;
-
-            /* Otherwise: */
-            } else {
-                /* Generate implied end tags. */
-                $this->generateImpliedEndTags();
-
-                /* Now, if the current node is not a table element, then this
-                is a parse error. */
-                // w/e
-
-                /* Pop elements from this stack until a table element has been
-                popped from the stack. */
-                while(true) {
-                    $current = end($this->stack)->nodeName;
-                    array_pop($this->stack);
-
-                    if($current === 'table') {
-                        break;
-                    }
-                }
-
-                /* Reset the insertion mode appropriately. */
-                $this->resetInsertionMode();
-            }
-
-        /* An end tag whose tag name is one of: "body", "caption", "col",
-        "colgroup", "html", "tbody", "td", "tfoot", "th", "thead", "tr" */
-        } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
-        array('body', 'caption', 'col', 'colgroup', 'html', 'tbody', 'td',
-        'tfoot', 'th', 'thead', 'tr'))) {
-            // Parse error. Ignore the token.
-
-        /* Anything else */
-        } else {
-            /* Parse error. Process the token as if the insertion mode was "in
-            body", with the following exception: */
-
-            /* If the current node is a table, tbody, tfoot, thead, or tr
-            element, then, whenever a node would be inserted into the current
-            node, it must instead be inserted into the foster parent element. */
-            if(in_array(end($this->stack)->nodeName,
-            array('table', 'tbody', 'tfoot', 'thead', 'tr'))) {
-                /* The foster parent element is the parent element of the last
-                table element in the stack of open elements, if there is a
-                table element and it has such a parent element. If there is no
-                table element in the stack of open elements (innerHTML case),
-                then the foster parent element is the first element in the
-                stack of open elements (the html  element). Otherwise, if there
-                is a table element in the stack of open elements, but the last
-                table element in the stack of open elements has no parent, or
-                its parent node is not an element, then the foster parent
-                element is the element before the last table element in the
-                stack of open elements. */
-                for($n = count($this->stack) - 1; $n >= 0; $n--) {
-                    if($this->stack[$n]->nodeName === 'table') {
-                        $table = $this->stack[$n];
-                        break;
-                    }
-                }
-
-                if(isset($table) && $table->parentNode !== null) {
-                    $this->foster_parent = $table->parentNode;
-
-                } elseif(!isset($table)) {
-                    $this->foster_parent = $this->stack[0];
-
-                } elseif(isset($table) && ($table->parentNode === null ||
-                $table->parentNode->nodeType !== XML_ELEMENT_NODE)) {
-                    $this->foster_parent = $this->stack[$n - 1];
-                }
-            }
-
-            $this->inBody($token);
-        }
-    }
-
-    private function inCaption($token) {
-        /* An end tag whose tag name is "caption" */
-        if($token['type'] === HTML5::ENDTAG && $token['name'] === 'caption') {
-            /* If the stack of open elements does not have an element in table
-            scope with the same tag name as the token, this is a parse error.
-            Ignore the token. (innerHTML case) */
-            if(!$this->elementInScope($token['name'], true)) {
-                // Ignore
-
-            /* Otherwise: */
-            } else {
-                /* Generate implied end tags. */
-                $this->generateImpliedEndTags();
-
-                /* Now, if the current node is not a caption element, then this
-                is a parse error. */
-                // w/e
-
-                /* Pop elements from this stack until a caption element has
-                been popped from the stack. */
-                while(true) {
-                    $node = end($this->stack)->nodeName;
-                    array_pop($this->stack);
-
-                    if($node === 'caption') {
-                        break;
-                    }
-                }
-
-                /* Clear the list of active formatting elements up to the last
-                marker. */
-                $this->clearTheActiveFormattingElementsUpToTheLastMarker();
-
-                /* Switch the insertion mode to "in table". */
-                $this->mode = self::IN_TABLE;
-            }
-
-        /* A start tag whose tag name is one of: "caption", "col", "colgroup",
-        "tbody", "td", "tfoot", "th", "thead", "tr", or an end tag whose tag
-        name is "table" */
-        } elseif(($token['type'] === HTML5::STARTTAG && in_array($token['name'],
-        array('caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
-        'thead', 'tr'))) || ($token['type'] === HTML5::ENDTAG &&
-        $token['name'] === 'table')) {
-            /* Parse error. Act as if an end tag with the tag name "caption"
-            had been seen, then, if that token wasn't ignored, reprocess the
-            current token. */
-            $this->inCaption(array(
-                'name' => 'caption',
-                'type' => HTML5::ENDTAG
-            ));
-
-            return $this->inTable($token);
-
-        /* An end tag whose tag name is one of: "body", "col", "colgroup",
-        "html", "tbody", "td", "tfoot", "th", "thead", "tr" */
-        } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
-        array('body', 'col', 'colgroup', 'html', 'tbody', 'tfoot', 'th',
-        'thead', 'tr'))) {
-            // Parse error. Ignore the token.
-
-        /* Anything else */
-        } else {
-            /* Process the token as if the insertion mode was "in body". */
-            $this->inBody($token);
-        }
-    }
-
-    private function inColumnGroup($token) {
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        or U+0020 SPACE */
-        if($token['type'] === HTML5::CHARACTR &&
-        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
-            /* Append the character to the current node. */
-            $text = $this->dom->createTextNode($token['data']);
-            end($this->stack)->appendChild($text);
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data
-            attribute set to the data given in the comment token. */
-            $comment = $this->dom->createComment($token['data']);
-            end($this->stack)->appendChild($comment);
-
-        /* A start tag whose tag name is "col" */
-        } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'col') {
-            /* Insert a col element for the token. Immediately pop the current
-            node off the stack of open elements. */
-            $this->insertElement($token);
-            array_pop($this->stack);
-
-        /* An end tag whose tag name is "colgroup" */
-        } elseif($token['type'] === HTML5::ENDTAG &&
-        $token['name'] === 'colgroup') {
-            /* If the current node is the root html element, then this is a
-            parse error, ignore the token. (innerHTML case) */
-            if(end($this->stack)->nodeName === 'html') {
-                // Ignore
-
-            /* Otherwise, pop the current node (which will be a colgroup
-            element) from the stack of open elements. Switch the insertion
-            mode to "in table". */
-            } else {
-                array_pop($this->stack);
-                $this->mode = self::IN_TABLE;
-            }
-
-        /* An end tag whose tag name is "col" */
-        } elseif($token['type'] === HTML5::ENDTAG && $token['name'] === 'col') {
-            /* Parse error. Ignore the token. */
-
-        /* Anything else */
-        } else {
-            /* Act as if an end tag with the tag name "colgroup" had been seen,
-            and then, if that token wasn't ignored, reprocess the current token. */
-            $this->inColumnGroup(array(
-                'name' => 'colgroup',
-                'type' => HTML5::ENDTAG
-            ));
-
-            return $this->inTable($token);
-        }
-    }
-
-    private function inTableBody($token) {
-        $clear = array('tbody', 'tfoot', 'thead', 'html');
-
-        /* A start tag whose tag name is "tr" */
-        if($token['type'] === HTML5::STARTTAG && $token['name'] === 'tr') {
-            /* Clear the stack back to a table body context. */
-            $this->clearStackToTableContext($clear);
-
-            /* Insert a tr element for the token, then switch the insertion
-            mode to "in row". */
-            $this->insertElement($token);
-            $this->mode = self::IN_ROW;
-
-        /* A start tag whose tag name is one of: "th", "td" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
-        ($token['name'] === 'th' ||    $token['name'] === 'td')) {
-            /* Parse error. Act as if a start tag with the tag name "tr" had
-            been seen, then reprocess the current token. */
-            $this->inTableBody(array(
-                'name' => 'tr',
-                'type' => HTML5::STARTTAG,
-                'attr' => array()
-            ));
-
-            return $this->inRow($token);
-
-        /* An end tag whose tag name is one of: "tbody", "tfoot", "thead" */
-        } elseif($token['type'] === HTML5::ENDTAG &&
-        in_array($token['name'], array('tbody', 'tfoot', 'thead'))) {
-            /* If the stack of open elements does not have an element in table
-            scope with the same tag name as the token, this is a parse error.
-            Ignore the token. */
-            if(!$this->elementInScope($token['name'], true)) {
-                // Ignore
-
-            /* Otherwise: */
-            } else {
-                /* Clear the stack back to a table body context. */
-                $this->clearStackToTableContext($clear);
-
-                /* Pop the current node from the stack of open elements. Switch
-                the insertion mode to "in table". */
-                array_pop($this->stack);
-                $this->mode = self::IN_TABLE;
-            }
-
-        /* A start tag whose tag name is one of: "caption", "col", "colgroup",
-        "tbody", "tfoot", "thead", or an end tag whose tag name is "table" */
-        } elseif(($token['type'] === HTML5::STARTTAG && in_array($token['name'],
-        array('caption', 'col', 'colgroup', 'tbody', 'tfoor', 'thead'))) ||
-        ($token['type'] === HTML5::STARTTAG && $token['name'] === 'table')) {
-            /* If the stack of open elements does not have a tbody, thead, or
-            tfoot element in table scope, this is a parse error. Ignore the
-            token. (innerHTML case) */
-            if(!$this->elementInScope(array('tbody', 'thead', 'tfoot'), true)) {
-                // Ignore.
-
-            /* Otherwise: */
-            } else {
-                /* Clear the stack back to a table body context. */
-                $this->clearStackToTableContext($clear);
-
-                /* Act as if an end tag with the same tag name as the current
-                node ("tbody", "tfoot", or "thead") had been seen, then
-                reprocess the current token. */
-                $this->inTableBody(array(
-                    'name' => end($this->stack)->nodeName,
-                    'type' => HTML5::ENDTAG
-                ));
-
-                return $this->mainPhase($token);
-            }
-
-        /* An end tag whose tag name is one of: "body", "caption", "col",
-        "colgroup", "html", "td", "th", "tr" */
-        } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
-        array('body', 'caption', 'col', 'colgroup', 'html', 'td', 'th', 'tr'))) {
-            /* Parse error. Ignore the token. */
-
-        /* Anything else */
-        } else {
-            /* Process the token as if the insertion mode was "in table". */
-            $this->inTable($token);
-        }
-    }
-
-    private function inRow($token) {
-        $clear = array('tr', 'html');
-
-        /* A start tag whose tag name is one of: "th", "td" */
-        if($token['type'] === HTML5::STARTTAG &&
-        ($token['name'] === 'th' || $token['name'] === 'td')) {
-            /* Clear the stack back to a table row context. */
-            $this->clearStackToTableContext($clear);
-
-            /* Insert an HTML element for the token, then switch the insertion
-            mode to "in cell". */
-            $this->insertElement($token);
-            $this->mode = self::IN_CELL;
-
-            /* Insert a marker at the end of the list of active formatting
-            elements. */
-            $this->a_formatting[] = self::MARKER;
-
-        /* An end tag whose tag name is "tr" */
-        } elseif($token['type'] === HTML5::ENDTAG && $token['name'] === 'tr') {
-            /* If the stack of open elements does not have an element in table
-            scope with the same tag name as the token, this is a parse error.
-            Ignore the token. (innerHTML case) */
-            if(!$this->elementInScope($token['name'], true)) {
-                // Ignore.
-
-            /* Otherwise: */
-            } else {
-                /* Clear the stack back to a table row context. */
-                $this->clearStackToTableContext($clear);
-
-                /* Pop the current node (which will be a tr element) from the
-                stack of open elements. Switch the insertion mode to "in table
-                body". */
-                array_pop($this->stack);
-                $this->mode = self::IN_TBODY;
-            }
-
-        /* A start tag whose tag name is one of: "caption", "col", "colgroup",
-        "tbody", "tfoot", "thead", "tr" or an end tag whose tag name is "table" */
-        } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
-        array('caption', 'col', 'colgroup', 'tbody', 'tfoot', 'thead', 'tr'))) {
-            /* Act as if an end tag with the tag name "tr" had been seen, then,
-            if that token wasn't ignored, reprocess the current token. */
-            $this->inRow(array(
-                'name' => 'tr',
-                'type' => HTML5::ENDTAG
-            ));
-
-            return $this->inCell($token);
-
-        /* An end tag whose tag name is one of: "tbody", "tfoot", "thead" */
-        } elseif($token['type'] === HTML5::ENDTAG &&
-        in_array($token['name'], array('tbody', 'tfoot', 'thead'))) {
-            /* If the stack of open elements does not have an element in table
-            scope with the same tag name as the token, this is a parse error.
-            Ignore the token. */
-            if(!$this->elementInScope($token['name'], true)) {
-                // Ignore.
-
-            /* Otherwise: */
-            } else {
-                /* Otherwise, act as if an end tag with the tag name "tr" had
-                been seen, then reprocess the current token. */
-                $this->inRow(array(
-                    'name' => 'tr',
-                    'type' => HTML5::ENDTAG
-                ));
-
-                return $this->inCell($token);
-            }
-
-        /* An end tag whose tag name is one of: "body", "caption", "col",
-        "colgroup", "html", "td", "th" */
-        } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
-        array('body', 'caption', 'col', 'colgroup', 'html', 'td', 'th', 'tr'))) {
-            /* Parse error. Ignore the token. */
-
-        /* Anything else */
-        } else {
-            /* Process the token as if the insertion mode was "in table". */
-            $this->inTable($token);
-        }
-    }
-
-    private function inCell($token) {
-        /* An end tag whose tag name is one of: "td", "th" */
-        if($token['type'] === HTML5::ENDTAG &&
-        ($token['name'] === 'td' || $token['name'] === 'th')) {
-            /* If the stack of open elements does not have an element in table
-            scope with the same tag name as that of the token, then this is a
-            parse error and the token must be ignored. */
-            if(!$this->elementInScope($token['name'], true)) {
-                // Ignore.
-
-            /* Otherwise: */
-            } else {
-                /* Generate implied end tags, except for elements with the same
-                tag name as the token. */
-                $this->generateImpliedEndTags(array($token['name']));
-
-                /* Now, if the current node is not an element with the same tag
-                name as the token, then this is a parse error. */
-                // k
-
-                /* Pop elements from this stack until an element with the same
-                tag name as the token has been popped from the stack. */
-                while(true) {
-                    $node = end($this->stack)->nodeName;
-                    array_pop($this->stack);
-
-                    if($node === $token['name']) {
-                        break;
-                    }
-                }
-
-                /* Clear the list of active formatting elements up to the last
-                marker. */
-                $this->clearTheActiveFormattingElementsUpToTheLastMarker();
-
-                /* Switch the insertion mode to "in row". (The current node
-                will be a tr element at this point.) */
-                $this->mode = self::IN_ROW;
-            }
-
-        /* A start tag whose tag name is one of: "caption", "col", "colgroup",
-        "tbody", "td", "tfoot", "th", "thead", "tr" */
-        } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
-        array('caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
-        'thead', 'tr'))) {
-            /* If the stack of open elements does not have a td or th element
-            in table scope, then this is a parse error; ignore the token.
-            (innerHTML case) */
-            if(!$this->elementInScope(array('td', 'th'), true)) {
-                // Ignore.
-
-            /* Otherwise, close the cell (see below) and reprocess the current
-            token. */
-            } else {
-                $this->closeCell();
-                return $this->inRow($token);
-            }
-
-        /* A start tag whose tag name is one of: "caption", "col", "colgroup",
-        "tbody", "td", "tfoot", "th", "thead", "tr" */
-        } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
-        array('caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
-        'thead', 'tr'))) {
-            /* If the stack of open elements does not have a td or th element
-            in table scope, then this is a parse error; ignore the token.
-            (innerHTML case) */
-            if(!$this->elementInScope(array('td', 'th'), true)) {
-                // Ignore.
-
-            /* Otherwise, close the cell (see below) and reprocess the current
-            token. */
-            } else {
-                $this->closeCell();
-                return $this->inRow($token);
-            }
-
-        /* An end tag whose tag name is one of: "body", "caption", "col",
-        "colgroup", "html" */
-        } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
-        array('body', 'caption', 'col', 'colgroup', 'html'))) {
-            /* Parse error. Ignore the token. */
-
-        /* An end tag whose tag name is one of: "table", "tbody", "tfoot",
-        "thead", "tr" */
-        } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
-        array('table', 'tbody', 'tfoot', 'thead', 'tr'))) {
-            /* If the stack of open elements does not have an element in table
-            scope with the same tag name as that of the token (which can only
-            happen for "tbody", "tfoot" and "thead", or, in the innerHTML case),
-            then this is a parse error and the token must be ignored. */
-            if(!$this->elementInScope($token['name'], true)) {
-                // Ignore.
-
-            /* Otherwise, close the cell (see below) and reprocess the current
-            token. */
-            } else {
-                $this->closeCell();
-                return $this->inRow($token);
-            }
-
-        /* Anything else */
-        } else {
-            /* Process the token as if the insertion mode was "in body". */
-            $this->inBody($token);
-        }
-    }
-
-    private function inSelect($token) {
-        /* Handle the token as follows: */
-
-        /* A character token */
-        if($token['type'] === HTML5::CHARACTR) {
-            /* Append the token's character to the current node. */
-            $this->insertText($token['data']);
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data
-            attribute set to the data given in the comment token. */
-            $this->insertComment($token['data']);
-
-        /* A start tag token whose tag name is "option" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
-        $token['name'] === 'option') {
-            /* If the current node is an option element, act as if an end tag
-            with the tag name "option" had been seen. */
-            if(end($this->stack)->nodeName === 'option') {
-                $this->inSelect(array(
-                    'name' => 'option',
-                    'type' => HTML5::ENDTAG
-                ));
-            }
-
-            /* Insert an HTML element for the token. */
-            $this->insertElement($token);
-
-        /* A start tag token whose tag name is "optgroup" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
-        $token['name'] === 'optgroup') {
-            /* If the current node is an option element, act as if an end tag
-            with the tag name "option" had been seen. */
-            if(end($this->stack)->nodeName === 'option') {
-                $this->inSelect(array(
-                    'name' => 'option',
-                    'type' => HTML5::ENDTAG
-                ));
-            }
-
-            /* If the current node is an optgroup element, act as if an end tag
-            with the tag name "optgroup" had been seen. */
-            if(end($this->stack)->nodeName === 'optgroup') {
-                $this->inSelect(array(
-                    'name' => 'optgroup',
-                    'type' => HTML5::ENDTAG
-                ));
-            }
-
-            /* Insert an HTML element for the token. */
-            $this->insertElement($token);
-
-        /* An end tag token whose tag name is "optgroup" */
-        } elseif($token['type'] === HTML5::ENDTAG &&
-        $token['name'] === 'optgroup') {
-            /* First, if the current node is an option element, and the node
-            immediately before it in the stack of open elements is an optgroup
-            element, then act as if an end tag with the tag name "option" had
-            been seen. */
-            $elements_in_stack = count($this->stack);
-
-            if($this->stack[$elements_in_stack - 1]->nodeName === 'option' &&
-            $this->stack[$elements_in_stack - 2]->nodeName === 'optgroup') {
-                $this->inSelect(array(
-                    'name' => 'option',
-                    'type' => HTML5::ENDTAG
-                ));
-            }
-
-            /* If the current node is an optgroup element, then pop that node
-            from the stack of open elements. Otherwise, this is a parse error,
-            ignore the token. */
-            if($this->stack[$elements_in_stack - 1] === 'optgroup') {
-                array_pop($this->stack);
-            }
-
-        /* An end tag token whose tag name is "option" */
-        } elseif($token['type'] === HTML5::ENDTAG &&
-        $token['name'] === 'option') {
-            /* If the current node is an option element, then pop that node
-            from the stack of open elements. Otherwise, this is a parse error,
-            ignore the token. */
-            if(end($this->stack)->nodeName === 'option') {
-                array_pop($this->stack);
-            }
-
-        /* An end tag whose tag name is "select" */
-        } elseif($token['type'] === HTML5::ENDTAG &&
-        $token['name'] === 'select') {
-            /* If the stack of open elements does not have an element in table
-            scope with the same tag name as the token, this is a parse error.
-            Ignore the token. (innerHTML case) */
-            if(!$this->elementInScope($token['name'], true)) {
-                // w/e
-
-            /* Otherwise: */
-            } else {
-                /* Pop elements from the stack of open elements until a select
-                element has been popped from the stack. */
-                while(true) {
-                    $current = end($this->stack)->nodeName;
-                    array_pop($this->stack);
-
-                    if($current === 'select') {
-                        break;
-                    }
-                }
-
-                /* Reset the insertion mode appropriately. */
-                $this->resetInsertionMode();
-            }
-
-        /* A start tag whose tag name is "select" */
-        } elseif($token['name'] === 'select' &&
-        $token['type'] === HTML5::STARTTAG) {
-            /* Parse error. Act as if the token had been an end tag with the
-            tag name "select" instead. */
-            $this->inSelect(array(
-                'name' => 'select',
-                'type' => HTML5::ENDTAG
-            ));
-
-        /* An end tag whose tag name is one of: "caption", "table", "tbody",
-        "tfoot", "thead", "tr", "td", "th" */
-        } elseif(in_array($token['name'], array('caption', 'table', 'tbody',
-        'tfoot', 'thead', 'tr', 'td', 'th')) && $token['type'] === HTML5::ENDTAG) {
-            /* Parse error. */
-            // w/e
-
-            /* If the stack of open elements has an element in table scope with
-            the same tag name as that of the token, then act as if an end tag
-            with the tag name "select" had been seen, and reprocess the token.
-            Otherwise, ignore the token. */
-            if($this->elementInScope($token['name'], true)) {
-                $this->inSelect(array(
-                    'name' => 'select',
-                    'type' => HTML5::ENDTAG
-                ));
-
-                $this->mainPhase($token);
-            }
-
-        /* Anything else */
-        } else {
-            /* Parse error. Ignore the token. */
-        }
-    }
-
-    private function afterBody($token) {
-        /* Handle the token as follows: */
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        or U+0020 SPACE */
-        if($token['type'] === HTML5::CHARACTR &&
-        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
-            /* Process the token as it would be processed if the insertion mode
-            was "in body". */
-            $this->inBody($token);
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the first element in the stack of open
-            elements (the html element), with the data attribute set to the
-            data given in the comment token. */
-            $comment = $this->dom->createComment($token['data']);
-            $this->stack[0]->appendChild($comment);
-
-        /* An end tag with the tag name "html" */
-        } elseif($token['type'] === HTML5::ENDTAG && $token['name'] === 'html') {
-            /* If the parser was originally created in order to handle the
-            setting of an element's innerHTML attribute, this is a parse error;
-            ignore the token. (The element will be an html element in this
-            case.) (innerHTML case) */
-
-            /* Otherwise, switch to the trailing end phase. */
-            $this->phase = self::END_PHASE;
-
-        /* Anything else */
-        } else {
-            /* Parse error. Set the insertion mode to "in body" and reprocess
-            the token. */
-            $this->mode = self::IN_BODY;
-            return $this->inBody($token);
-        }
-    }
-
-    private function inFrameset($token) {
-        /* Handle the token as follows: */
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        U+000D CARRIAGE RETURN (CR), or U+0020 SPACE */
-        if($token['type'] === HTML5::CHARACTR &&
-        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
-            /* Append the character to the current node. */
-            $this->insertText($token['data']);
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data
-            attribute set to the data given in the comment token. */
-            $this->insertComment($token['data']);
-
-        /* A start tag with the tag name "frameset" */
-        } elseif($token['name'] === 'frameset' &&
-        $token['type'] === HTML5::STARTTAG) {
-            $this->insertElement($token);
-
-        /* An end tag with the tag name "frameset" */
-        } elseif($token['name'] === 'frameset' &&
-        $token['type'] === HTML5::ENDTAG) {
-            /* If the current node is the root html element, then this is a
-            parse error; ignore the token. (innerHTML case) */
-            if(end($this->stack)->nodeName === 'html') {
-                // Ignore
-
-            } else {
-                /* Otherwise, pop the current node from the stack of open
-                elements. */
-                array_pop($this->stack);
-
-                /* If the parser was not originally created in order to handle
-                the setting of an element's innerHTML attribute (innerHTML case),
-                and the current node is no longer a frameset element, then change
-                the insertion mode to "after frameset". */
-                $this->mode = self::AFTR_FRAME;
-            }
-
-        /* A start tag with the tag name "frame" */
-        } elseif($token['name'] === 'frame' &&
-        $token['type'] === HTML5::STARTTAG) {
-            /* Insert an HTML element for the token. */
-            $this->insertElement($token);
-
-            /* Immediately pop the current node off the stack of open elements. */
-            array_pop($this->stack);
-
-        /* A start tag with the tag name "noframes" */
-        } elseif($token['name'] === 'noframes' &&
-        $token['type'] === HTML5::STARTTAG) {
-            /* Process the token as if the insertion mode had been "in body". */
-            $this->inBody($token);
-
-        /* Anything else */
-        } else {
-            /* Parse error. Ignore the token. */
-        }
-    }
-
-    private function afterFrameset($token) {
-        /* Handle the token as follows: */
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        U+000D CARRIAGE RETURN (CR), or U+0020 SPACE */
-        if($token['type'] === HTML5::CHARACTR &&
-        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
-            /* Append the character to the current node. */
-            $this->insertText($token['data']);
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data
-            attribute set to the data given in the comment token. */
-            $this->insertComment($token['data']);
-
-        /* An end tag with the tag name "html" */
-        } elseif($token['name'] === 'html' &&
-        $token['type'] === HTML5::ENDTAG) {
-            /* Switch to the trailing end phase. */
-            $this->phase = self::END_PHASE;
-
-        /* A start tag with the tag name "noframes" */
-        } elseif($token['name'] === 'noframes' &&
-        $token['type'] === HTML5::STARTTAG) {
-            /* Process the token as if the insertion mode had been "in body". */
-            $this->inBody($token);
-
-        /* Anything else */
-        } else {
-            /* Parse error. Ignore the token. */
-        }
-    }
-
-    private function trailingEndPhase($token) {
-        /* After the main phase, as each token is emitted from the tokenisation
-        stage, it must be processed as described in this section. */
-
-        /* A DOCTYPE token */
-        if($token['type'] === HTML5::DOCTYPE) {
-            // Parse error. Ignore the token.
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the Document object with the data
-            attribute set to the data given in the comment token. */
-            $comment = $this->dom->createComment($token['data']);
-            $this->dom->appendChild($comment);
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        or U+0020 SPACE */
-        } elseif($token['type'] === HTML5::CHARACTR &&
-        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
-            /* Process the token as it would be processed in the main phase. */
-            $this->mainPhase($token);
-
-        /* A character token that is not one of U+0009 CHARACTER TABULATION,
-        U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
-        or U+0020 SPACE. Or a start tag token. Or an end tag token. */
-        } elseif(($token['type'] === HTML5::CHARACTR &&
-        preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) ||
-        $token['type'] === HTML5::STARTTAG || $token['type'] === HTML5::ENDTAG) {
-            /* Parse error. Switch back to the main phase and reprocess the
-            token. */
-            $this->phase = self::MAIN_PHASE;
-            return $this->mainPhase($token);
-
-        /* An end-of-file token */
-        } elseif($token['type'] === HTML5::EOF) {
-            /* OMG DONE!! */
-        }
-    }
-
-    private function insertElement($token, $append = true, $check = false) {
-        // Proprietary workaround for libxml2's limitations with tag names
-        if ($check) {
-            // Slightly modified HTML5 tag-name modification,
-            // removing anything that's not an ASCII letter, digit, or hyphen
-            $token['name'] = preg_replace('/[^a-z0-9-]/i', '', $token['name']);
-            // Remove leading hyphens and numbers
-            $token['name'] = ltrim($token['name'], '-0..9');
-            // In theory, this should ever be needed, but just in case
-            if ($token['name'] === '') $token['name'] = 'span'; // arbitrary generic choice
-        }
-        
-        $el = $this->dom->createElement($token['name']);
-
-        foreach($token['attr'] as $attr) {
-            if(!$el->hasAttribute($attr['name'])) {
-                $el->setAttribute($attr['name'], $attr['value']);
-            }
-        }
-
-        $this->appendToRealParent($el);
-        $this->stack[] = $el;
-
-        return $el;
-    }
-
-    private function insertText($data) {
-        $text = $this->dom->createTextNode($data);
-        $this->appendToRealParent($text);
-    }
-
-    private function insertComment($data) {
-        $comment = $this->dom->createComment($data);
-        $this->appendToRealParent($comment);
-    }
-
-    private function appendToRealParent($node) {
-        if($this->foster_parent === null) {
-            end($this->stack)->appendChild($node);
-
-        } elseif($this->foster_parent !== null) {
-            /* If the foster parent element is the parent element of the
-            last table element in the stack of open elements, then the new
-            node must be inserted immediately before the last table element
-            in the stack of open elements in the foster parent element;
-            otherwise, the new node must be appended to the foster parent
-            element. */
-            for($n = count($this->stack) - 1; $n >= 0; $n--) {
-                if($this->stack[$n]->nodeName === 'table' &&
-                $this->stack[$n]->parentNode !== null) {
-                    $table = $this->stack[$n];
-                    break;
-                }
-            }
-
-            if(isset($table) && $this->foster_parent->isSameNode($table->parentNode))
-                $this->foster_parent->insertBefore($node, $table);
-            else
-                $this->foster_parent->appendChild($node);
-
-            $this->foster_parent = null;
-        }
-    }
-
-    private function elementInScope($el, $table = false) {
-        if(is_array($el)) {
-            foreach($el as $element) {
-                if($this->elementInScope($element, $table)) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        $leng = count($this->stack);
-
-        for($n = 0; $n < $leng; $n++) {
-            /* 1. Initialise node to be the current node (the bottommost node of
-            the stack). */
-            $node = $this->stack[$leng - 1 - $n];
-
-            if($node->tagName === $el) {
-                /* 2. If node is the target node, terminate in a match state. */
-                return true;
-
-            } elseif($node->tagName === 'table') {
-                /* 3. Otherwise, if node is a table element, terminate in a failure
-                state. */
-                return false;
-
-            } elseif($table === true && in_array($node->tagName, array('caption', 'td',
-            'th', 'button', 'marquee', 'object'))) {
-                /* 4. Otherwise, if the algorithm is the "has an element in scope"
-                variant (rather than the "has an element in table scope" variant),
-                and node is one of the following, terminate in a failure state. */
-                return false;
-
-            } elseif($node === $node->ownerDocument->documentElement) {
-                /* 5. Otherwise, if node is an html element (root element), terminate
-                in a failure state. (This can only happen if the node is the topmost
-                node of the    stack of open elements, and prevents the next step from
-                being invoked if there are no more elements in the stack.) */
-                return false;
-            }
-
-            /* Otherwise, set node to the previous entry in the stack of open
-            elements and return to step 2. (This will never fail, since the loop
-            will always terminate in the previous step if the top of the stack
-            is reached.) */
-        }
-    }
-
-    private function reconstructActiveFormattingElements() {
-        /* 1. If there are no entries in the list of active formatting elements,
-        then there is nothing to reconstruct; stop this algorithm. */
-        $formatting_elements = count($this->a_formatting);
-
-        if($formatting_elements === 0) {
-            return false;
-        }
-
-        /* 3. Let entry be the last (most recently added) element in the list
-        of active formatting elements. */
-        $entry = end($this->a_formatting);
-
-        /* 2. If the last (most recently added) entry in the list of active
-        formatting elements is a marker, or if it is an element that is in the
-        stack of open elements, then there is nothing to reconstruct; stop this
-        algorithm. */
-        if($entry === self::MARKER || in_array($entry, $this->stack, true)) {
-            return false;
-        }
-
-        for($a = $formatting_elements - 1; $a >= 0; true) {
-            /* 4. If there are no entries before entry in the list of active
-            formatting elements, then jump to step 8. */
-            if($a === 0) {
-                $step_seven = false;
-                break;
-            }
-
-            /* 5. Let entry be the entry one earlier than entry in the list of
-            active formatting elements. */
-            $a--;
-            $entry = $this->a_formatting[$a];
-
-            /* 6. If entry is neither a marker nor an element that is also in
-            thetack of open elements, go to step 4. */
-            if($entry === self::MARKER || in_array($entry, $this->stack, true)) {
-                break;
-            }
-        }
-
-        while(true) {
-            /* 7. Let entry be the element one later than entry in the list of
-            active formatting elements. */
-            if(isset($step_seven) && $step_seven === true) {
-                $a++;
-                $entry = $this->a_formatting[$a];
-            }
-
-            /* 8. Perform a shallow clone of the element entry to obtain clone. */
-            $clone = $entry->cloneNode();
-
-            /* 9. Append clone to the current node and push it onto the stack
-            of open elements  so that it is the new current node. */
-            end($this->stack)->appendChild($clone);
-            $this->stack[] = $clone;
-
-            /* 10. Replace the entry for entry in the list with an entry for
-            clone. */
-            $this->a_formatting[$a] = $clone;
-
-            /* 11. If the entry for clone in the list of active formatting
-            elements is not the last entry in the list, return to step 7. */
-            if(end($this->a_formatting) !== $clone) {
-                $step_seven = true;
-            } else {
-                break;
-            }
-        }
-    }
-
-    private function clearTheActiveFormattingElementsUpToTheLastMarker() {
-        /* When the steps below require the UA to clear the list of active
-        formatting elements up to the last marker, the UA must perform the
-        following steps: */
-
-        while(true) {
-            /* 1. Let entry be the last (most recently added) entry in the list
-            of active formatting elements. */
-            $entry = end($this->a_formatting);
-
-            /* 2. Remove entry from the list of active formatting elements. */
-            array_pop($this->a_formatting);
-
-            /* 3. If entry was a marker, then stop the algorithm at this point.
-            The list has been cleared up to the last marker. */
-            if($entry === self::MARKER) {
-                break;
-            }
-        }
-    }
-
-    private function generateImpliedEndTags($exclude = array()) {
-        /* When the steps below require the UA to generate implied end tags,
-        then, if the current node is a dd element, a dt element, an li element,
-        a p element, a td element, a th  element, or a tr element, the UA must
-        act as if an end tag with the respective tag name had been seen and
-        then generate implied end tags again. */
-        $node = end($this->stack);
-        $elements = array_diff(array('dd', 'dt', 'li', 'p', 'td', 'th', 'tr'), $exclude);
-
-        while(in_array(end($this->stack)->nodeName, $elements)) {
-            array_pop($this->stack);
-        }
-    }
-
-    private function getElementCategory($node) {
-        $name = $node->tagName;
-        if(in_array($name, $this->special))
-            return self::SPECIAL;
-
-        elseif(in_array($name, $this->scoping))
-            return self::SCOPING;
-
-        elseif(in_array($name, $this->formatting))
-            return self::FORMATTING;
-
-        else
-            return self::PHRASING;
-    }
-
-    private function clearStackToTableContext($elements) {
-        /* When the steps above require the UA to clear the stack back to a
-        table context, it means that the UA must, while the current node is not
-        a table element or an html element, pop elements from the stack of open
-        elements. If this causes any elements to be popped from the stack, then
-        this is a parse error. */
-        while(true) {
-            $node = end($this->stack)->nodeName;
-
-            if(in_array($node, $elements)) {
-                break;
-            } else {
-                array_pop($this->stack);
-            }
-        }
-    }
-
-    private function resetInsertionMode() {
-        /* 1. Let last be false. */
-        $last = false;
-        $leng = count($this->stack);
-
-        for($n = $leng - 1; $n >= 0; $n--) {
-            /* 2. Let node be the last node in the stack of open elements. */
-            $node = $this->stack[$n];
-
-            /* 3. If node is the first node in the stack of open elements, then
-            set last to true. If the element whose innerHTML  attribute is being
-            set is neither a td  element nor a th element, then set node to the
-            element whose innerHTML  attribute is being set. (innerHTML  case) */
-            if($this->stack[0]->isSameNode($node)) {
-                $last = true;
-            }
-
-            /* 4. If node is a select element, then switch the insertion mode to
-            "in select" and abort these steps. (innerHTML case) */
-            if($node->nodeName === 'select') {
-                $this->mode = self::IN_SELECT;
-                break;
-
-            /* 5. If node is a td or th element, then switch the insertion mode
-            to "in cell" and abort these steps. */
-            } elseif($node->nodeName === 'td' || $node->nodeName === 'th') {
-                $this->mode = self::IN_CELL;
-                break;
-
-            /* 6. If node is a tr element, then switch the insertion mode to
-            "in    row" and abort these steps. */
-            } elseif($node->nodeName === 'tr') {
-                $this->mode = self::IN_ROW;
-                break;
-
-            /* 7. If node is a tbody, thead, or tfoot element, then switch the
-            insertion mode to "in table body" and abort these steps. */
-            } elseif(in_array($node->nodeName, array('tbody', 'thead', 'tfoot'))) {
-                $this->mode = self::IN_TBODY;
-                break;
-
-            /* 8. If node is a caption element, then switch the insertion mode
-            to "in caption" and abort these steps. */
-            } elseif($node->nodeName === 'caption') {
-                $this->mode = self::IN_CAPTION;
-                break;
-
-            /* 9. If node is a colgroup element, then switch the insertion mode
-            to "in column group" and abort these steps. (innerHTML case) */
-            } elseif($node->nodeName === 'colgroup') {
-                $this->mode = self::IN_CGROUP;
-                break;
-
-            /* 10. If node is a table element, then switch the insertion mode
-            to "in table" and abort these steps. */
-            } elseif($node->nodeName === 'table') {
-                $this->mode = self::IN_TABLE;
-                break;
-
-            /* 11. If node is a head element, then switch the insertion mode
-            to "in body" ("in body"! not "in head"!) and abort these steps.
-            (innerHTML case) */
-            } elseif($node->nodeName === 'head') {
-                $this->mode = self::IN_BODY;
-                break;
-
-            /* 12. If node is a body element, then switch the insertion mode to
-            "in body" and abort these steps. */
-            } elseif($node->nodeName === 'body') {
-                $this->mode = self::IN_BODY;
-                break;
-
-            /* 13. If node is a frameset element, then switch the insertion
-            mode to "in frameset" and abort these steps. (innerHTML case) */
-            } elseif($node->nodeName === 'frameset') {
-                $this->mode = self::IN_FRAME;
-                break;
-
-            /* 14. If node is an html element, then: if the head element
-            pointer is null, switch the insertion mode to "before head",
-            otherwise, switch the insertion mode to "after head". In either
-            case, abort these steps. (innerHTML case) */
-            } elseif($node->nodeName === 'html') {
-                $this->mode = ($this->head_pointer === null)
-                    ? self::BEFOR_HEAD
-                    : self::AFTER_HEAD;
-
-                break;
-
-            /* 15. If last is true, then set the insertion mode to "in body"
-            and    abort these steps. (innerHTML case) */
-            } elseif($last) {
-                $this->mode = self::IN_BODY;
-                break;
-            }
-        }
-    }
-
-    private function closeCell() {
-        /* If the stack of open elements has a td or th element in table scope,
-        then act as if an end tag token with that tag name had been seen. */
-        foreach(array('td', 'th') as $cell) {
-            if($this->elementInScope($cell, true)) {
-                $this->inCell(array(
-                    'name' => $cell,
-                    'type' => HTML5::ENDTAG
-                ));
-
-                break;
-            }
-        }
-    }
-
-    public function save() {
-        return $this->dom;
-    }
-}
-?>
diff --git a/lib/php/HTMLPurifier/PercentEncoder.php b/lib/php/HTMLPurifier/PercentEncoder.php
deleted file mode 100644
index a43c44f4c5861aae5208698b6a2fce093bf31b54..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/PercentEncoder.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/**
- * Class that handles operations involving percent-encoding in URIs.
- *
- * @warning
- *      Be careful when reusing instances of PercentEncoder. The object
- *      you use for normalize() SHOULD NOT be used for encode(), or
- *      vice-versa.
- */
-class HTMLPurifier_PercentEncoder
-{
-
-    /**
-     * Reserved characters to preserve when using encode().
-     */
-    protected $preserve = array();
-
-    /**
-     * String of characters that should be preserved while using encode().
-     */
-    public function __construct($preserve = false) {
-        // unreserved letters, ought to const-ify
-        for ($i = 48; $i <= 57;  $i++) $this->preserve[$i] = true; // digits
-        for ($i = 65; $i <= 90;  $i++) $this->preserve[$i] = true; // upper-case
-        for ($i = 97; $i <= 122; $i++) $this->preserve[$i] = true; // lower-case
-        $this->preserve[45] = true; // Dash         -
-        $this->preserve[46] = true; // Period       .
-        $this->preserve[95] = true; // Underscore   _
-        $this->preserve[126]= true; // Tilde        ~
-
-        // extra letters not to escape
-        if ($preserve !== false) {
-            for ($i = 0, $c = strlen($preserve); $i < $c; $i++) {
-                $this->preserve[ord($preserve[$i])] = true;
-            }
-        }
-    }
-
-    /**
-     * Our replacement for urlencode, it encodes all non-reserved characters,
-     * as well as any extra characters that were instructed to be preserved.
-     * @note
-     *      Assumes that the string has already been normalized, making any
-     *      and all percent escape sequences valid. Percents will not be
-     *      re-escaped, regardless of their status in $preserve
-     * @param $string String to be encoded
-     * @return Encoded string.
-     */
-    public function encode($string) {
-        $ret = '';
-        for ($i = 0, $c = strlen($string); $i < $c; $i++) {
-            if ($string[$i] !== '%' && !isset($this->preserve[$int = ord($string[$i])]) ) {
-                $ret .= '%' . sprintf('%02X', $int);
-            } else {
-                $ret .= $string[$i];
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Fix up percent-encoding by decoding unreserved characters and normalizing.
-     * @warning This function is affected by $preserve, even though the
-     *          usual desired behavior is for this not to preserve those
-     *          characters. Be careful when reusing instances of PercentEncoder!
-     * @param $string String to normalize
-     */
-    public function normalize($string) {
-        if ($string == '') return '';
-        $parts = explode('%', $string);
-        $ret = array_shift($parts);
-        foreach ($parts as $part) {
-            $length = strlen($part);
-            if ($length < 2) {
-                $ret .= '%25' . $part;
-                continue;
-            }
-            $encoding = substr($part, 0, 2);
-            $text     = substr($part, 2);
-            if (!ctype_xdigit($encoding)) {
-                $ret .= '%25' . $part;
-                continue;
-            }
-            $int = hexdec($encoding);
-            if (isset($this->preserve[$int])) {
-                $ret .= chr($int) . $text;
-                continue;
-            }
-            $encoding = strtoupper($encoding);
-            $ret .= '%' . $encoding . $text;
-        }
-        return $ret;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Printer.php b/lib/php/HTMLPurifier/Printer.php
deleted file mode 100644
index e7eb82e83e480d9d55bacf38a2a12e1cbfd8b23e..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Printer.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-// OUT OF DATE, NEEDS UPDATING!
-// USE XMLWRITER!
-
-class HTMLPurifier_Printer
-{
-
-    /**
-     * Instance of HTMLPurifier_Generator for HTML generation convenience funcs
-     */
-    protected $generator;
-
-    /**
-     * Instance of HTMLPurifier_Config, for easy access
-     */
-    protected $config;
-
-    /**
-     * Initialize $generator.
-     */
-    public function __construct() {
-    }
-
-    /**
-     * Give generator necessary configuration if possible
-     */
-    public function prepareGenerator($config) {
-        $all = $config->getAll();
-        $context = new HTMLPurifier_Context();
-        $this->generator = new HTMLPurifier_Generator($config, $context);
-    }
-
-    /**
-     * Main function that renders object or aspect of that object
-     * @note Parameters vary depending on printer
-     */
-    // function render() {}
-
-    /**
-     * Returns a start tag
-     * @param $tag Tag name
-     * @param $attr Attribute array
-     */
-    protected function start($tag, $attr = array()) {
-        return $this->generator->generateFromToken(
-                    new HTMLPurifier_Token_Start($tag, $attr ? $attr : array())
-               );
-    }
-
-    /**
-     * Returns an end teg
-     * @param $tag Tag name
-     */
-    protected function end($tag) {
-        return $this->generator->generateFromToken(
-                    new HTMLPurifier_Token_End($tag)
-               );
-    }
-
-    /**
-     * Prints a complete element with content inside
-     * @param $tag Tag name
-     * @param $contents Element contents
-     * @param $attr Tag attributes
-     * @param $escape Bool whether or not to escape contents
-     */
-    protected function element($tag, $contents, $attr = array(), $escape = true) {
-        return $this->start($tag, $attr) .
-               ($escape ? $this->escape($contents) : $contents) .
-               $this->end($tag);
-    }
-
-    protected function elementEmpty($tag, $attr = array()) {
-        return $this->generator->generateFromToken(
-            new HTMLPurifier_Token_Empty($tag, $attr)
-        );
-    }
-
-    protected function text($text) {
-        return $this->generator->generateFromToken(
-            new HTMLPurifier_Token_Text($text)
-        );
-    }
-
-    /**
-     * Prints a simple key/value row in a table.
-     * @param $name Key
-     * @param $value Value
-     */
-    protected function row($name, $value) {
-        if (is_bool($value)) $value = $value ? 'On' : 'Off';
-        return
-            $this->start('tr') . "\n" .
-                $this->element('th', $name) . "\n" .
-                $this->element('td', $value) . "\n" .
-            $this->end('tr')
-        ;
-    }
-
-    /**
-     * Escapes a string for HTML output.
-     * @param $string String to escape
-     */
-    protected function escape($string) {
-        $string = HTMLPurifier_Encoder::cleanUTF8($string);
-        $string = htmlspecialchars($string, ENT_COMPAT, 'UTF-8');
-        return $string;
-    }
-
-    /**
-     * Takes a list of strings and turns them into a single list
-     * @param $array List of strings
-     * @param $polite Bool whether or not to add an end before the last
-     */
-    protected function listify($array, $polite = false) {
-        if (empty($array)) return 'None';
-        $ret = '';
-        $i = count($array);
-        foreach ($array as $value) {
-            $i--;
-            $ret .= $value;
-            if ($i > 0 && !($polite && $i == 1)) $ret .= ', ';
-            if ($polite && $i == 1) $ret .= 'and ';
-        }
-        return $ret;
-    }
-
-    /**
-     * Retrieves the class of an object without prefixes, as well as metadata
-     * @param $obj Object to determine class of
-     * @param $prefix Further prefix to remove
-     */
-    protected function getClass($obj, $sec_prefix = '') {
-        static $five = null;
-        if ($five === null) $five = version_compare(PHP_VERSION, '5', '>=');
-        $prefix = 'HTMLPurifier_' . $sec_prefix;
-        if (!$five) $prefix = strtolower($prefix);
-        $class = str_replace($prefix, '', get_class($obj));
-        $lclass = strtolower($class);
-        $class .= '(';
-        switch ($lclass) {
-            case 'enum':
-                $values = array();
-                foreach ($obj->valid_values as $value => $bool) {
-                    $values[] = $value;
-                }
-                $class .= implode(', ', $values);
-                break;
-            case 'css_composite':
-                $values = array();
-                foreach ($obj->defs as $def) {
-                    $values[] = $this->getClass($def, $sec_prefix);
-                }
-                $class .= implode(', ', $values);
-                break;
-            case 'css_multiple':
-                $class .= $this->getClass($obj->single, $sec_prefix) . ', ';
-                $class .= $obj->max;
-                break;
-            case 'css_denyelementdecorator':
-                $class .= $this->getClass($obj->def, $sec_prefix) . ', ';
-                $class .= $obj->element;
-                break;
-            case 'css_importantdecorator':
-                $class .= $this->getClass($obj->def, $sec_prefix);
-                if ($obj->allow) $class .= ', !important';
-                break;
-        }
-        $class .= ')';
-        return $class;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Printer/CSSDefinition.php b/lib/php/HTMLPurifier/Printer/CSSDefinition.php
deleted file mode 100644
index 81f9865901db1214522c53eec4aea48eda63319c..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Printer/CSSDefinition.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-class HTMLPurifier_Printer_CSSDefinition extends HTMLPurifier_Printer
-{
-
-    protected $def;
-
-    public function render($config) {
-        $this->def = $config->getCSSDefinition();
-        $ret = '';
-
-        $ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
-        $ret .= $this->start('table');
-
-        $ret .= $this->element('caption', 'Properties ($info)');
-
-        $ret .= $this->start('thead');
-        $ret .= $this->start('tr');
-        $ret .= $this->element('th', 'Property', array('class' => 'heavy'));
-        $ret .= $this->element('th', 'Definition', array('class' => 'heavy', 'style' => 'width:auto;'));
-        $ret .= $this->end('tr');
-        $ret .= $this->end('thead');
-
-        ksort($this->def->info);
-        foreach ($this->def->info as $property => $obj) {
-            $name = $this->getClass($obj, 'AttrDef_');
-            $ret .= $this->row($property, $name);
-        }
-
-        $ret .= $this->end('table');
-        $ret .= $this->end('div');
-
-        return $ret;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Printer/ConfigForm.css b/lib/php/HTMLPurifier/Printer/ConfigForm.css
deleted file mode 100644
index 3ff1a88aa4251bcd9ae678952672f33d6cb7a16b..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Printer/ConfigForm.css
+++ /dev/null
@@ -1,10 +0,0 @@
-
-.hp-config {}
-
-.hp-config tbody th {text-align:right; padding-right:0.5em;}
-.hp-config thead, .hp-config .namespace {background:#3C578C; color:#FFF;}
-.hp-config .namespace th {text-align:center;}
-.hp-config .verbose {display:none;}
-.hp-config .controls {text-align:center;}
-
-/* vim: et sw=4 sts=4 */
diff --git a/lib/php/HTMLPurifier/Printer/ConfigForm.js b/lib/php/HTMLPurifier/Printer/ConfigForm.js
deleted file mode 100644
index cba00c9b80b9cfd379696958a0b5fafeee90a50d..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Printer/ConfigForm.js
+++ /dev/null
@@ -1,5 +0,0 @@
-function toggleWriteability(id_of_patient, checked) {
-    document.getElementById(id_of_patient).disabled = checked;
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Printer/ConfigForm.php b/lib/php/HTMLPurifier/Printer/ConfigForm.php
deleted file mode 100644
index 02aa656894064763df3173fd1da7aa47d4dff8a7..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Printer/ConfigForm.php
+++ /dev/null
@@ -1,368 +0,0 @@
-<?php
-
-/**
- * @todo Rewrite to use Interchange objects
- */
-class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer
-{
-
-    /**
-     * Printers for specific fields
-     */
-    protected $fields = array();
-
-    /**
-     * Documentation URL, can have fragment tagged on end
-     */
-    protected $docURL;
-
-    /**
-     * Name of form element to stuff config in
-     */
-    protected $name;
-
-    /**
-     * Whether or not to compress directive names, clipping them off
-     * after a certain amount of letters. False to disable or integer letters
-     * before clipping.
-     */
-    protected $compress = false;
-
-    /**
-     * @param $name Form element name for directives to be stuffed into
-     * @param $doc_url String documentation URL, will have fragment tagged on
-     * @param $compress Integer max length before compressing a directive name, set to false to turn off
-     */
-    public function __construct(
-        $name, $doc_url = null, $compress = false
-    ) {
-        parent::__construct();
-        $this->docURL = $doc_url;
-        $this->name   = $name;
-        $this->compress = $compress;
-        // initialize sub-printers
-        $this->fields[0]    = new HTMLPurifier_Printer_ConfigForm_default();
-        $this->fields[HTMLPurifier_VarParser::BOOL]       = new HTMLPurifier_Printer_ConfigForm_bool();
-    }
-
-    /**
-     * Sets default column and row size for textareas in sub-printers
-     * @param $cols Integer columns of textarea, null to use default
-     * @param $rows Integer rows of textarea, null to use default
-     */
-    public function setTextareaDimensions($cols = null, $rows = null) {
-        if ($cols) $this->fields['default']->cols = $cols;
-        if ($rows) $this->fields['default']->rows = $rows;
-    }
-
-    /**
-     * Retrieves styling, in case it is not accessible by webserver
-     */
-    public static function getCSS() {
-        return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.css');
-    }
-
-    /**
-     * Retrieves JavaScript, in case it is not accessible by webserver
-     */
-    public static function getJavaScript() {
-        return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.js');
-    }
-
-    /**
-     * Returns HTML output for a configuration form
-     * @param $config Configuration object of current form state, or an array
-     *        where [0] has an HTML namespace and [1] is being rendered.
-     * @param $allowed Optional namespace(s) and directives to restrict form to.
-     */
-    public function render($config, $allowed = true, $render_controls = true) {
-        if (is_array($config) && isset($config[0])) {
-            $gen_config = $config[0];
-            $config = $config[1];
-        } else {
-            $gen_config = $config;
-        }
-
-        $this->config = $config;
-        $this->genConfig = $gen_config;
-        $this->prepareGenerator($gen_config);
-
-        $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $config->def);
-        $all = array();
-        foreach ($allowed as $key) {
-            list($ns, $directive) = $key;
-            $all[$ns][$directive] = $config->get($ns .'.'. $directive);
-        }
-
-        $ret = '';
-        $ret .= $this->start('table', array('class' => 'hp-config'));
-        $ret .= $this->start('thead');
-        $ret .= $this->start('tr');
-            $ret .= $this->element('th', 'Directive', array('class' => 'hp-directive'));
-            $ret .= $this->element('th', 'Value', array('class' => 'hp-value'));
-        $ret .= $this->end('tr');
-        $ret .= $this->end('thead');
-        foreach ($all as $ns => $directives) {
-            $ret .= $this->renderNamespace($ns, $directives);
-        }
-        if ($render_controls) {
-             $ret .= $this->start('tbody');
-             $ret .= $this->start('tr');
-                 $ret .= $this->start('td', array('colspan' => 2, 'class' => 'controls'));
-                     $ret .= $this->elementEmpty('input', array('type' => 'submit', 'value' => 'Submit'));
-                     $ret .= '[<a href="?">Reset</a>]';
-                 $ret .= $this->end('td');
-             $ret .= $this->end('tr');
-             $ret .= $this->end('tbody');
-        }
-        $ret .= $this->end('table');
-        return $ret;
-    }
-
-    /**
-     * Renders a single namespace
-     * @param $ns String namespace name
-     * @param $directive Associative array of directives to values
-     */
-    protected function renderNamespace($ns, $directives) {
-        $ret = '';
-        $ret .= $this->start('tbody', array('class' => 'namespace'));
-        $ret .= $this->start('tr');
-            $ret .= $this->element('th', $ns, array('colspan' => 2));
-        $ret .= $this->end('tr');
-        $ret .= $this->end('tbody');
-        $ret .= $this->start('tbody');
-        foreach ($directives as $directive => $value) {
-            $ret .= $this->start('tr');
-            $ret .= $this->start('th');
-            if ($this->docURL) {
-                $url = str_replace('%s', urlencode("$ns.$directive"), $this->docURL);
-                $ret .= $this->start('a', array('href' => $url));
-            }
-                $attr = array('for' => "{$this->name}:$ns.$directive");
-
-                // crop directive name if it's too long
-                if (!$this->compress || (strlen($directive) < $this->compress)) {
-                    $directive_disp = $directive;
-                } else {
-                    $directive_disp = substr($directive, 0, $this->compress - 2) . '...';
-                    $attr['title'] = $directive;
-                }
-
-                $ret .= $this->element(
-                    'label',
-                    $directive_disp,
-                    // component printers must create an element with this id
-                    $attr
-                );
-            if ($this->docURL) $ret .= $this->end('a');
-            $ret .= $this->end('th');
-
-            $ret .= $this->start('td');
-                $def = $this->config->def->info["$ns.$directive"];
-                if (is_int($def)) {
-                    $allow_null = $def < 0;
-                    $type = abs($def);
-                } else {
-                    $type = $def->type;
-                    $allow_null = isset($def->allow_null);
-                }
-                if (!isset($this->fields[$type])) $type = 0; // default
-                $type_obj = $this->fields[$type];
-                if ($allow_null) {
-                    $type_obj = new HTMLPurifier_Printer_ConfigForm_NullDecorator($type_obj);
-                }
-                $ret .= $type_obj->render($ns, $directive, $value, $this->name, array($this->genConfig, $this->config));
-            $ret .= $this->end('td');
-            $ret .= $this->end('tr');
-        }
-        $ret .= $this->end('tbody');
-        return $ret;
-    }
-
-}
-
-/**
- * Printer decorator for directives that accept null
- */
-class HTMLPurifier_Printer_ConfigForm_NullDecorator extends HTMLPurifier_Printer {
-    /**
-     * Printer being decorated
-     */
-    protected $obj;
-    /**
-     * @param $obj Printer to decorate
-     */
-    public function __construct($obj) {
-        parent::__construct();
-        $this->obj = $obj;
-    }
-    public function render($ns, $directive, $value, $name, $config) {
-        if (is_array($config) && isset($config[0])) {
-            $gen_config = $config[0];
-            $config = $config[1];
-        } else {
-            $gen_config = $config;
-        }
-        $this->prepareGenerator($gen_config);
-
-        $ret = '';
-        $ret .= $this->start('label', array('for' => "$name:Null_$ns.$directive"));
-        $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
-        $ret .= $this->text(' Null/Disabled');
-        $ret .= $this->end('label');
-        $attr = array(
-            'type' => 'checkbox',
-            'value' => '1',
-            'class' => 'null-toggle',
-            'name' => "$name"."[Null_$ns.$directive]",
-            'id' => "$name:Null_$ns.$directive",
-            'onclick' => "toggleWriteability('$name:$ns.$directive',checked)" // INLINE JAVASCRIPT!!!!
-        );
-        if ($this->obj instanceof HTMLPurifier_Printer_ConfigForm_bool) {
-            // modify inline javascript slightly
-            $attr['onclick'] = "toggleWriteability('$name:Yes_$ns.$directive',checked);toggleWriteability('$name:No_$ns.$directive',checked)";
-        }
-        if ($value === null) $attr['checked'] = 'checked';
-        $ret .= $this->elementEmpty('input', $attr);
-        $ret .= $this->text(' or ');
-        $ret .= $this->elementEmpty('br');
-        $ret .= $this->obj->render($ns, $directive, $value, $name, array($gen_config, $config));
-        return $ret;
-    }
-}
-
-/**
- * Swiss-army knife configuration form field printer
- */
-class HTMLPurifier_Printer_ConfigForm_default extends HTMLPurifier_Printer {
-    public $cols = 18;
-    public $rows = 5;
-    public function render($ns, $directive, $value, $name, $config) {
-        if (is_array($config) && isset($config[0])) {
-            $gen_config = $config[0];
-            $config = $config[1];
-        } else {
-            $gen_config = $config;
-        }
-        $this->prepareGenerator($gen_config);
-        // this should probably be split up a little
-        $ret = '';
-        $def = $config->def->info["$ns.$directive"];
-        if (is_int($def)) {
-            $type = abs($def);
-        } else {
-            $type = $def->type;
-        }
-        if (is_array($value)) {
-            switch ($type) {
-                case HTMLPurifier_VarParser::LOOKUP:
-                    $array = $value;
-                    $value = array();
-                    foreach ($array as $val => $b) {
-                        $value[] = $val;
-                    }
-                case HTMLPurifier_VarParser::ALIST:
-                    $value = implode(PHP_EOL, $value);
-                    break;
-                case HTMLPurifier_VarParser::HASH:
-                    $nvalue = '';
-                    foreach ($value as $i => $v) {
-                        $nvalue .= "$i:$v" . PHP_EOL;
-                    }
-                    $value = $nvalue;
-                    break;
-                default:
-                    $value = '';
-            }
-        }
-        if ($type === HTMLPurifier_VarParser::MIXED) {
-            return 'Not supported';
-            $value = serialize($value);
-        }
-        $attr = array(
-            'name' => "$name"."[$ns.$directive]",
-            'id' => "$name:$ns.$directive"
-        );
-        if ($value === null) $attr['disabled'] = 'disabled';
-        if (isset($def->allowed)) {
-            $ret .= $this->start('select', $attr);
-            foreach ($def->allowed as $val => $b) {
-                $attr = array();
-                if ($value == $val) $attr['selected'] = 'selected';
-                $ret .= $this->element('option', $val, $attr);
-            }
-            $ret .= $this->end('select');
-        } elseif (
-            $type === HTMLPurifier_VarParser::TEXT ||
-            $type === HTMLPurifier_VarParser::ITEXT ||
-            $type === HTMLPurifier_VarParser::ALIST ||
-            $type === HTMLPurifier_VarParser::HASH ||
-            $type === HTMLPurifier_VarParser::LOOKUP
-        ) {
-            $attr['cols'] = $this->cols;
-            $attr['rows'] = $this->rows;
-            $ret .= $this->start('textarea', $attr);
-            $ret .= $this->text($value);
-            $ret .= $this->end('textarea');
-        } else {
-            $attr['value'] = $value;
-            $attr['type'] = 'text';
-            $ret .= $this->elementEmpty('input', $attr);
-        }
-        return $ret;
-    }
-}
-
-/**
- * Bool form field printer
- */
-class HTMLPurifier_Printer_ConfigForm_bool extends HTMLPurifier_Printer {
-    public function render($ns, $directive, $value, $name, $config) {
-        if (is_array($config) && isset($config[0])) {
-            $gen_config = $config[0];
-            $config = $config[1];
-        } else {
-            $gen_config = $config;
-        }
-        $this->prepareGenerator($gen_config);
-        $ret = '';
-        $ret .= $this->start('div', array('id' => "$name:$ns.$directive"));
-
-        $ret .= $this->start('label', array('for' => "$name:Yes_$ns.$directive"));
-        $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
-        $ret .= $this->text(' Yes');
-        $ret .= $this->end('label');
-
-        $attr = array(
-            'type' => 'radio',
-            'name' => "$name"."[$ns.$directive]",
-            'id' => "$name:Yes_$ns.$directive",
-            'value' => '1'
-        );
-        if ($value === true) $attr['checked'] = 'checked';
-        if ($value === null) $attr['disabled'] = 'disabled';
-        $ret .= $this->elementEmpty('input', $attr);
-
-        $ret .= $this->start('label', array('for' => "$name:No_$ns.$directive"));
-        $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
-        $ret .= $this->text(' No');
-        $ret .= $this->end('label');
-
-        $attr = array(
-            'type' => 'radio',
-            'name' => "$name"."[$ns.$directive]",
-            'id' => "$name:No_$ns.$directive",
-            'value' => '0'
-        );
-        if ($value === false) $attr['checked'] = 'checked';
-        if ($value === null) $attr['disabled'] = 'disabled';
-        $ret .= $this->elementEmpty('input', $attr);
-
-        $ret .= $this->end('div');
-
-        return $ret;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Printer/HTMLDefinition.php b/lib/php/HTMLPurifier/Printer/HTMLDefinition.php
deleted file mode 100644
index 8a8f126b81f037cc4a2574e469f5ef0cded11eba..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Printer/HTMLDefinition.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-
-class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
-{
-
-    /**
-     * Instance of HTMLPurifier_HTMLDefinition, for easy access
-     */
-    protected $def;
-
-    public function render($config) {
-        $ret = '';
-        $this->config =& $config;
-
-        $this->def = $config->getHTMLDefinition();
-
-        $ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
-
-        $ret .= $this->renderDoctype();
-        $ret .= $this->renderEnvironment();
-        $ret .= $this->renderContentSets();
-        $ret .= $this->renderInfo();
-
-        $ret .= $this->end('div');
-
-        return $ret;
-    }
-
-    /**
-     * Renders the Doctype table
-     */
-    protected function renderDoctype() {
-        $doctype = $this->def->doctype;
-        $ret = '';
-        $ret .= $this->start('table');
-        $ret .= $this->element('caption', 'Doctype');
-        $ret .= $this->row('Name', $doctype->name);
-        $ret .= $this->row('XML', $doctype->xml ? 'Yes' : 'No');
-        $ret .= $this->row('Default Modules', implode($doctype->modules, ', '));
-        $ret .= $this->row('Default Tidy Modules', implode($doctype->tidyModules, ', '));
-        $ret .= $this->end('table');
-        return $ret;
-    }
-
-
-    /**
-     * Renders environment table, which is miscellaneous info
-     */
-    protected function renderEnvironment() {
-        $def = $this->def;
-
-        $ret = '';
-
-        $ret .= $this->start('table');
-        $ret .= $this->element('caption', 'Environment');
-
-        $ret .= $this->row('Parent of fragment', $def->info_parent);
-        $ret .= $this->renderChildren($def->info_parent_def->child);
-        $ret .= $this->row('Block wrap name', $def->info_block_wrapper);
-
-        $ret .= $this->start('tr');
-            $ret .= $this->element('th', 'Global attributes');
-            $ret .= $this->element('td', $this->listifyAttr($def->info_global_attr),0,0);
-        $ret .= $this->end('tr');
-
-        $ret .= $this->start('tr');
-            $ret .= $this->element('th', 'Tag transforms');
-            $list = array();
-            foreach ($def->info_tag_transform as $old => $new) {
-                $new = $this->getClass($new, 'TagTransform_');
-                $list[] = "<$old> with $new";
-            }
-            $ret .= $this->element('td', $this->listify($list));
-        $ret .= $this->end('tr');
-
-        $ret .= $this->start('tr');
-            $ret .= $this->element('th', 'Pre-AttrTransform');
-            $ret .= $this->element('td', $this->listifyObjectList($def->info_attr_transform_pre));
-        $ret .= $this->end('tr');
-
-        $ret .= $this->start('tr');
-            $ret .= $this->element('th', 'Post-AttrTransform');
-            $ret .= $this->element('td', $this->listifyObjectList($def->info_attr_transform_post));
-        $ret .= $this->end('tr');
-
-        $ret .= $this->end('table');
-        return $ret;
-    }
-
-    /**
-     * Renders the Content Sets table
-     */
-    protected function renderContentSets() {
-        $ret = '';
-        $ret .= $this->start('table');
-        $ret .= $this->element('caption', 'Content Sets');
-        foreach ($this->def->info_content_sets as $name => $lookup) {
-            $ret .= $this->heavyHeader($name);
-            $ret .= $this->start('tr');
-            $ret .= $this->element('td', $this->listifyTagLookup($lookup));
-            $ret .= $this->end('tr');
-        }
-        $ret .= $this->end('table');
-        return $ret;
-    }
-
-    /**
-     * Renders the Elements ($info) table
-     */
-    protected function renderInfo() {
-        $ret = '';
-        $ret .= $this->start('table');
-        $ret .= $this->element('caption', 'Elements ($info)');
-        ksort($this->def->info);
-        $ret .= $this->heavyHeader('Allowed tags', 2);
-        $ret .= $this->start('tr');
-        $ret .= $this->element('td', $this->listifyTagLookup($this->def->info), array('colspan' => 2));
-        $ret .= $this->end('tr');
-        foreach ($this->def->info as $name => $def) {
-            $ret .= $this->start('tr');
-                $ret .= $this->element('th', "<$name>", array('class'=>'heavy', 'colspan' => 2));
-            $ret .= $this->end('tr');
-            $ret .= $this->start('tr');
-                $ret .= $this->element('th', 'Inline content');
-                $ret .= $this->element('td', $def->descendants_are_inline ? 'Yes' : 'No');
-            $ret .= $this->end('tr');
-            if (!empty($def->excludes)) {
-                $ret .= $this->start('tr');
-                    $ret .= $this->element('th', 'Excludes');
-                    $ret .= $this->element('td', $this->listifyTagLookup($def->excludes));
-                $ret .= $this->end('tr');
-            }
-            if (!empty($def->attr_transform_pre)) {
-                $ret .= $this->start('tr');
-                    $ret .= $this->element('th', 'Pre-AttrTransform');
-                    $ret .= $this->element('td', $this->listifyObjectList($def->attr_transform_pre));
-                $ret .= $this->end('tr');
-            }
-            if (!empty($def->attr_transform_post)) {
-                $ret .= $this->start('tr');
-                    $ret .= $this->element('th', 'Post-AttrTransform');
-                    $ret .= $this->element('td', $this->listifyObjectList($def->attr_transform_post));
-                $ret .= $this->end('tr');
-            }
-            if (!empty($def->auto_close)) {
-                $ret .= $this->start('tr');
-                    $ret .= $this->element('th', 'Auto closed by');
-                    $ret .= $this->element('td', $this->listifyTagLookup($def->auto_close));
-                $ret .= $this->end('tr');
-            }
-            $ret .= $this->start('tr');
-                $ret .= $this->element('th', 'Allowed attributes');
-                $ret .= $this->element('td',$this->listifyAttr($def->attr), array(), 0);
-            $ret .= $this->end('tr');
-
-            if (!empty($def->required_attr)) {
-                $ret .= $this->row('Required attributes', $this->listify($def->required_attr));
-            }
-
-            $ret .= $this->renderChildren($def->child);
-        }
-        $ret .= $this->end('table');
-        return $ret;
-    }
-
-    /**
-     * Renders a row describing the allowed children of an element
-     * @param $def HTMLPurifier_ChildDef of pertinent element
-     */
-    protected function renderChildren($def) {
-        $context = new HTMLPurifier_Context();
-        $ret = '';
-        $ret .= $this->start('tr');
-            $elements = array();
-            $attr = array();
-            if (isset($def->elements)) {
-                if ($def->type == 'strictblockquote') {
-                    $def->validateChildren(array(), $this->config, $context);
-                }
-                $elements = $def->elements;
-            }
-            if ($def->type == 'chameleon') {
-                $attr['rowspan'] = 2;
-            } elseif ($def->type == 'empty') {
-                $elements = array();
-            } elseif ($def->type == 'table') {
-                $elements = array_flip(array('col', 'caption', 'colgroup', 'thead',
-                    'tfoot', 'tbody', 'tr'));
-            }
-            $ret .= $this->element('th', 'Allowed children', $attr);
-
-            if ($def->type == 'chameleon') {
-
-                $ret .= $this->element('td',
-                    '<em>Block</em>: ' .
-                    $this->escape($this->listifyTagLookup($def->block->elements)),0,0);
-                $ret .= $this->end('tr');
-                $ret .= $this->start('tr');
-                $ret .= $this->element('td',
-                    '<em>Inline</em>: ' .
-                    $this->escape($this->listifyTagLookup($def->inline->elements)),0,0);
-
-            } elseif ($def->type == 'custom') {
-
-                $ret .= $this->element('td', '<em>'.ucfirst($def->type).'</em>: ' .
-                    $def->dtd_regex);
-
-            } else {
-                $ret .= $this->element('td',
-                    '<em>'.ucfirst($def->type).'</em>: ' .
-                    $this->escape($this->listifyTagLookup($elements)),0,0);
-            }
-        $ret .= $this->end('tr');
-        return $ret;
-    }
-
-    /**
-     * Listifies a tag lookup table.
-     * @param $array Tag lookup array in form of array('tagname' => true)
-     */
-    protected function listifyTagLookup($array) {
-        ksort($array);
-        $list = array();
-        foreach ($array as $name => $discard) {
-            if ($name !== '#PCDATA' && !isset($this->def->info[$name])) continue;
-            $list[] = $name;
-        }
-        return $this->listify($list);
-    }
-
-    /**
-     * Listifies a list of objects by retrieving class names and internal state
-     * @param $array List of objects
-     * @todo Also add information about internal state
-     */
-    protected function listifyObjectList($array) {
-        ksort($array);
-        $list = array();
-        foreach ($array as $discard => $obj) {
-            $list[] = $this->getClass($obj, 'AttrTransform_');
-        }
-        return $this->listify($list);
-    }
-
-    /**
-     * Listifies a hash of attributes to AttrDef classes
-     * @param $array Array hash in form of array('attrname' => HTMLPurifier_AttrDef)
-     */
-    protected function listifyAttr($array) {
-        ksort($array);
-        $list = array();
-        foreach ($array as $name => $obj) {
-            if ($obj === false) continue;
-            $list[] = "$name&nbsp;=&nbsp;<i>" . $this->getClass($obj, 'AttrDef_') . '</i>';
-        }
-        return $this->listify($list);
-    }
-
-    /**
-     * Creates a heavy header row
-     */
-    protected function heavyHeader($text, $num = 1) {
-        $ret = '';
-        $ret .= $this->start('tr');
-        $ret .= $this->element('th', $text, array('colspan' => $num, 'class' => 'heavy'));
-        $ret .= $this->end('tr');
-        return $ret;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/PropertyList.php b/lib/php/HTMLPurifier/PropertyList.php
deleted file mode 100644
index 2b99fb7bc3caffe0a8c8439199e05ae1930aea21..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/PropertyList.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * Generic property list implementation
- */
-class HTMLPurifier_PropertyList
-{
-    /**
-     * Internal data-structure for properties
-     */
-    protected $data = array();
-
-    /**
-     * Parent plist
-     */
-    protected $parent;
-
-    protected $cache;
-
-    public function __construct($parent = null) {
-        $this->parent = $parent;
-    }
-
-    /**
-     * Recursively retrieves the value for a key
-     */
-    public function get($name) {
-        if ($this->has($name)) return $this->data[$name];
-        // possible performance bottleneck, convert to iterative if necessary
-        if ($this->parent) return $this->parent->get($name);
-        throw new HTMLPurifier_Exception("Key '$name' not found");
-    }
-
-    /**
-     * Sets the value of a key, for this plist
-     */
-    public function set($name, $value) {
-        $this->data[$name] = $value;
-    }
-
-    /**
-     * Returns true if a given key exists
-     */
-    public function has($name) {
-        return array_key_exists($name, $this->data);
-    }
-
-    /**
-     * Resets a value to the value of it's parent, usually the default. If
-     * no value is specified, the entire plist is reset.
-     */
-    public function reset($name = null) {
-        if ($name == null) $this->data = array();
-        else unset($this->data[$name]);
-    }
-
-    /**
-     * Squashes this property list and all of its property lists into a single
-     * array, and returns the array. This value is cached by default.
-     * @param $force If true, ignores the cache and regenerates the array.
-     */
-    public function squash($force = false) {
-        if ($this->cache !== null && !$force) return $this->cache;
-        if ($this->parent) {
-            return $this->cache = array_merge($this->parent->squash($force), $this->data);
-        } else {
-            return $this->cache = $this->data;
-        }
-    }
-
-    /**
-     * Returns the parent plist.
-     */
-    public function getParent() {
-        return $this->parent;
-    }
-
-    /**
-     * Sets the parent plist.
-     */
-    public function setParent($plist) {
-        $this->parent = $plist;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/PropertyListIterator.php b/lib/php/HTMLPurifier/PropertyListIterator.php
deleted file mode 100644
index 8f250443e41f0aa6c0f468cf825a2c94e743a350..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/PropertyListIterator.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Property list iterator. Do not instantiate this class directly.
- */
-class HTMLPurifier_PropertyListIterator extends FilterIterator
-{
-
-    protected $l;
-    protected $filter;
-
-    /**
-     * @param $data Array of data to iterate over
-     * @param $filter Optional prefix to only allow values of
-     */
-    public function __construct(Iterator $iterator, $filter = null) {
-        parent::__construct($iterator);
-        $this->l = strlen($filter);
-        $this->filter = $filter;
-    }
-
-    public function accept() {
-        $key = $this->getInnerIterator()->key();
-        if( strncmp($key, $this->filter, $this->l) !== 0 ) {
-            return false;
-        }
-        return true;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Strategy.php b/lib/php/HTMLPurifier/Strategy.php
deleted file mode 100644
index 2462865210ce62d64b9d2a270fa55355708fd0aa..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Strategy.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Supertype for classes that define a strategy for modifying/purifying tokens.
- *
- * While HTMLPurifier's core purpose is fixing HTML into something proper,
- * strategies provide plug points for extra configuration or even extra
- * features, such as custom tags, custom parsing of text, etc.
- */
-
-
-abstract class HTMLPurifier_Strategy
-{
-
-    /**
-     * Executes the strategy on the tokens.
-     *
-     * @param $tokens Array of HTMLPurifier_Token objects to be operated on.
-     * @param $config Configuration options
-     * @returns Processed array of token objects.
-     */
-    abstract public function execute($tokens, $config, $context);
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Strategy/Composite.php b/lib/php/HTMLPurifier/Strategy/Composite.php
deleted file mode 100644
index 816490b7996ade532876d42861524db931c7b1b9..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Strategy/Composite.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Composite strategy that runs multiple strategies on tokens.
- */
-abstract class HTMLPurifier_Strategy_Composite extends HTMLPurifier_Strategy
-{
-
-    /**
-     * List of strategies to run tokens through.
-     */
-    protected $strategies = array();
-
-    abstract public function __construct();
-
-    public function execute($tokens, $config, $context) {
-        foreach ($this->strategies as $strategy) {
-            $tokens = $strategy->execute($tokens, $config, $context);
-        }
-        return $tokens;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Strategy/Core.php b/lib/php/HTMLPurifier/Strategy/Core.php
deleted file mode 100644
index d90e15860640a437e14ecfba34ba2c46fabd9d51..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Strategy/Core.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Core strategy composed of the big four strategies.
- */
-class HTMLPurifier_Strategy_Core extends HTMLPurifier_Strategy_Composite
-{
-
-    public function __construct() {
-        $this->strategies[] = new HTMLPurifier_Strategy_RemoveForeignElements();
-        $this->strategies[] = new HTMLPurifier_Strategy_MakeWellFormed();
-        $this->strategies[] = new HTMLPurifier_Strategy_FixNesting();
-        $this->strategies[] = new HTMLPurifier_Strategy_ValidateAttributes();
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Strategy/FixNesting.php b/lib/php/HTMLPurifier/Strategy/FixNesting.php
deleted file mode 100644
index f81802391bf64426a536335b310a81bdf07b849c..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Strategy/FixNesting.php
+++ /dev/null
@@ -1,328 +0,0 @@
-<?php
-
-/**
- * Takes a well formed list of tokens and fixes their nesting.
- *
- * HTML elements dictate which elements are allowed to be their children,
- * for example, you can't have a p tag in a span tag.  Other elements have
- * much more rigorous definitions: tables, for instance, require a specific
- * order for their elements.  There are also constraints not expressible by
- * document type definitions, such as the chameleon nature of ins/del
- * tags and global child exclusions.
- *
- * The first major objective of this strategy is to iterate through all the
- * nodes (not tokens) of the list of tokens and determine whether or not
- * their children conform to the element's definition.  If they do not, the
- * child definition may optionally supply an amended list of elements that
- * is valid or require that the entire node be deleted (and the previous
- * node rescanned).
- *
- * The second objective is to ensure that explicitly excluded elements of
- * an element do not appear in its children.  Code that accomplishes this
- * task is pervasive through the strategy, though the two are distinct tasks
- * and could, theoretically, be seperated (although it's not recommended).
- *
- * @note Whether or not unrecognized children are silently dropped or
- *       translated into text depends on the child definitions.
- *
- * @todo Enable nodes to be bubbled out of the structure.
- */
-
-class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy
-{
-
-    public function execute($tokens, $config, $context) {
-        //####################################################################//
-        // Pre-processing
-
-        // get a copy of the HTML definition
-        $definition = $config->getHTMLDefinition();
-
-        // insert implicit "parent" node, will be removed at end.
-        // DEFINITION CALL
-        $parent_name = $definition->info_parent;
-        array_unshift($tokens, new HTMLPurifier_Token_Start($parent_name));
-        $tokens[] = new HTMLPurifier_Token_End($parent_name);
-
-        // setup the context variable 'IsInline', for chameleon processing
-        // is 'false' when we are not inline, 'true' when it must always
-        // be inline, and an integer when it is inline for a certain
-        // branch of the document tree
-        $is_inline = $definition->info_parent_def->descendants_are_inline;
-        $context->register('IsInline', $is_inline);
-
-        // setup error collector
-        $e =& $context->get('ErrorCollector', true);
-
-        //####################################################################//
-        // Loop initialization
-
-        // stack that contains the indexes of all parents,
-        // $stack[count($stack)-1] being the current parent
-        $stack = array();
-
-        // stack that contains all elements that are excluded
-        // it is organized by parent elements, similar to $stack,
-        // but it is only populated when an element with exclusions is
-        // processed, i.e. there won't be empty exclusions.
-        $exclude_stack = array();
-
-        // variable that contains the start token while we are processing
-        // nodes. This enables error reporting to do its job
-        $start_token = false;
-        $context->register('CurrentToken', $start_token);
-
-        //####################################################################//
-        // Loop
-
-        // iterate through all start nodes. Determining the start node
-        // is complicated so it has been omitted from the loop construct
-        for ($i = 0, $size = count($tokens) ; $i < $size; ) {
-
-            //################################################################//
-            // Gather information on children
-
-            // child token accumulator
-            $child_tokens = array();
-
-            // scroll to the end of this node, report number, and collect
-            // all children
-            for ($j = $i, $depth = 0; ; $j++) {
-                if ($tokens[$j] instanceof HTMLPurifier_Token_Start) {
-                    $depth++;
-                    // skip token assignment on first iteration, this is the
-                    // token we currently are on
-                    if ($depth == 1) continue;
-                } elseif ($tokens[$j] instanceof HTMLPurifier_Token_End) {
-                    $depth--;
-                    // skip token assignment on last iteration, this is the
-                    // end token of the token we're currently on
-                    if ($depth == 0) break;
-                }
-                $child_tokens[] = $tokens[$j];
-            }
-
-            // $i is index of start token
-            // $j is index of end token
-
-            $start_token = $tokens[$i]; // to make token available via CurrentToken
-
-            //################################################################//
-            // Gather information on parent
-
-            // calculate parent information
-            if ($count = count($stack)) {
-                $parent_index = $stack[$count-1];
-                $parent_name  = $tokens[$parent_index]->name;
-                if ($parent_index == 0) {
-                    $parent_def   = $definition->info_parent_def;
-                } else {
-                    $parent_def   = $definition->info[$parent_name];
-                }
-            } else {
-                // processing as if the parent were the "root" node
-                // unknown info, it won't be used anyway, in the future,
-                // we may want to enforce one element only (this is
-                // necessary for HTML Purifier to clean entire documents
-                $parent_index = $parent_name = $parent_def = null;
-            }
-
-            // calculate context
-            if ($is_inline === false) {
-                // check if conditions make it inline
-                if (!empty($parent_def) && $parent_def->descendants_are_inline) {
-                    $is_inline = $count - 1;
-                }
-            } else {
-                // check if we're out of inline
-                if ($count === $is_inline) {
-                    $is_inline = false;
-                }
-            }
-
-            //################################################################//
-            // Determine whether element is explicitly excluded SGML-style
-
-            // determine whether or not element is excluded by checking all
-            // parent exclusions. The array should not be very large, two
-            // elements at most.
-            $excluded = false;
-            if (!empty($exclude_stack)) {
-                foreach ($exclude_stack as $lookup) {
-                    if (isset($lookup[$tokens[$i]->name])) {
-                        $excluded = true;
-                        // no need to continue processing
-                        break;
-                    }
-                }
-            }
-
-            //################################################################//
-            // Perform child validation
-
-            if ($excluded) {
-                // there is an exclusion, remove the entire node
-                $result = false;
-                $excludes = array(); // not used, but good to initialize anyway
-            } else {
-                // DEFINITION CALL
-                if ($i === 0) {
-                    // special processing for the first node
-                    $def = $definition->info_parent_def;
-                } else {
-                    $def = $definition->info[$tokens[$i]->name];
-
-                }
-
-                if (!empty($def->child)) {
-                    // have DTD child def validate children
-                    $result = $def->child->validateChildren(
-                        $child_tokens, $config, $context);
-                } else {
-                    // weird, no child definition, get rid of everything
-                    $result = false;
-                }
-
-                // determine whether or not this element has any exclusions
-                $excludes = $def->excludes;
-            }
-
-            // $result is now a bool or array
-
-            //################################################################//
-            // Process result by interpreting $result
-
-            if ($result === true || $child_tokens === $result) {
-                // leave the node as is
-
-                // register start token as a parental node start
-                $stack[] = $i;
-
-                // register exclusions if there are any
-                if (!empty($excludes)) $exclude_stack[] = $excludes;
-
-                // move cursor to next possible start node
-                $i++;
-
-            } elseif($result === false) {
-                // remove entire node
-
-                if ($e) {
-                    if ($excluded) {
-                        $e->send(E_ERROR, 'Strategy_FixNesting: Node excluded');
-                    } else {
-                        $e->send(E_ERROR, 'Strategy_FixNesting: Node removed');
-                    }
-                }
-
-                // calculate length of inner tokens and current tokens
-                $length = $j - $i + 1;
-
-                // perform removal
-                array_splice($tokens, $i, $length);
-
-                // update size
-                $size -= $length;
-
-                // there is no start token to register,
-                // current node is now the next possible start node
-                // unless it turns out that we need to do a double-check
-
-                // this is a rought heuristic that covers 100% of HTML's
-                // cases and 99% of all other cases. A child definition
-                // that would be tricked by this would be something like:
-                // ( | a b c) where it's all or nothing. Fortunately,
-                // our current implementation claims that that case would
-                // not allow empty, even if it did
-                if (!$parent_def->child->allow_empty) {
-                    // we need to do a double-check
-                    $i = $parent_index;
-                    array_pop($stack);
-                }
-
-                // PROJECTED OPTIMIZATION: Process all children elements before
-                // reprocessing parent node.
-
-            } else {
-                // replace node with $result
-
-                // calculate length of inner tokens
-                $length = $j - $i - 1;
-
-                if ($e) {
-                    if (empty($result) && $length) {
-                        $e->send(E_ERROR, 'Strategy_FixNesting: Node contents removed');
-                    } else {
-                        $e->send(E_WARNING, 'Strategy_FixNesting: Node reorganized');
-                    }
-                }
-
-                // perform replacement
-                array_splice($tokens, $i + 1, $length, $result);
-
-                // update size
-                $size -= $length;
-                $size += count($result);
-
-                // register start token as a parental node start
-                $stack[] = $i;
-
-                // register exclusions if there are any
-                if (!empty($excludes)) $exclude_stack[] = $excludes;
-
-                // move cursor to next possible start node
-                $i++;
-
-            }
-
-            //################################################################//
-            // Scroll to next start node
-
-            // We assume, at this point, that $i is the index of the token
-            // that is the first possible new start point for a node.
-
-            // Test if the token indeed is a start tag, if not, move forward
-            // and test again.
-            $size = count($tokens);
-            while ($i < $size and !$tokens[$i] instanceof HTMLPurifier_Token_Start) {
-                if ($tokens[$i] instanceof HTMLPurifier_Token_End) {
-                    // pop a token index off the stack if we ended a node
-                    array_pop($stack);
-                    // pop an exclusion lookup off exclusion stack if
-                    // we ended node and that node had exclusions
-                    if ($i == 0 || $i == $size - 1) {
-                        // use specialized var if it's the super-parent
-                        $s_excludes = $definition->info_parent_def->excludes;
-                    } else {
-                        $s_excludes = $definition->info[$tokens[$i]->name]->excludes;
-                    }
-                    if ($s_excludes) {
-                        array_pop($exclude_stack);
-                    }
-                }
-                $i++;
-            }
-
-        }
-
-        //####################################################################//
-        // Post-processing
-
-        // remove implicit parent tokens at the beginning and end
-        array_shift($tokens);
-        array_pop($tokens);
-
-        // remove context variables
-        $context->destroy('IsInline');
-        $context->destroy('CurrentToken');
-
-        //####################################################################//
-        // Return
-
-        return $tokens;
-
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Strategy/MakeWellFormed.php b/lib/php/HTMLPurifier/Strategy/MakeWellFormed.php
deleted file mode 100644
index feb0c32b457097cc85a1276a8b3266eb7acd5ec8..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Strategy/MakeWellFormed.php
+++ /dev/null
@@ -1,457 +0,0 @@
-<?php
-
-/**
- * Takes tokens makes them well-formed (balance end tags, etc.)
- */
-class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
-{
-
-    /**
-     * Array stream of tokens being processed.
-     */
-    protected $tokens;
-
-    /**
-     * Current index in $tokens.
-     */
-    protected $t;
-
-    /**
-     * Current nesting of elements.
-     */
-    protected $stack;
-
-    /**
-     * Injectors active in this stream processing.
-     */
-    protected $injectors;
-
-    /**
-     * Current instance of HTMLPurifier_Config.
-     */
-    protected $config;
-
-    /**
-     * Current instance of HTMLPurifier_Context.
-     */
-    protected $context;
-
-    public function execute($tokens, $config, $context) {
-
-        $definition = $config->getHTMLDefinition();
-
-        // local variables
-        $generator = new HTMLPurifier_Generator($config, $context);
-        $escape_invalid_tags = $config->get('Core.EscapeInvalidTags');
-        $e = $context->get('ErrorCollector', true);
-        $t = false; // token index
-        $i = false; // injector index
-        $token      = false; // the current token
-        $reprocess  = false; // whether or not to reprocess the same token
-        $stack = array();
-
-        // member variables
-        $this->stack   =& $stack;
-        $this->t       =& $t;
-        $this->tokens  =& $tokens;
-        $this->config  = $config;
-        $this->context = $context;
-
-        // context variables
-        $context->register('CurrentNesting', $stack);
-        $context->register('InputIndex',     $t);
-        $context->register('InputTokens',    $tokens);
-        $context->register('CurrentToken',   $token);
-
-        // -- begin INJECTOR --
-
-        $this->injectors = array();
-
-        $injectors = $config->getBatch('AutoFormat');
-        $def_injectors = $definition->info_injector;
-        $custom_injectors = $injectors['Custom'];
-        unset($injectors['Custom']); // special case
-        foreach ($injectors as $injector => $b) {
-            // XXX: Fix with a legitimate lookup table of enabled filters
-            if (strpos($injector, '.') !== false) continue;
-            $injector = "HTMLPurifier_Injector_$injector";
-            if (!$b) continue;
-            $this->injectors[] = new $injector;
-        }
-        foreach ($def_injectors as $injector) {
-            // assumed to be objects
-            $this->injectors[] = $injector;
-        }
-        foreach ($custom_injectors as $injector) {
-            if (is_string($injector)) {
-                $injector = "HTMLPurifier_Injector_$injector";
-                $injector = new $injector;
-            }
-            $this->injectors[] = $injector;
-        }
-
-        // give the injectors references to the definition and context
-        // variables for performance reasons
-        foreach ($this->injectors as $ix => $injector) {
-            $error = $injector->prepare($config, $context);
-            if (!$error) continue;
-            array_splice($this->injectors, $ix, 1); // rm the injector
-            trigger_error("Cannot enable {$injector->name} injector because $error is not allowed", E_USER_WARNING);
-        }
-
-        // -- end INJECTOR --
-
-        // a note on punting:
-        //      In order to reduce code duplication, whenever some code needs
-        //      to make HTML changes in order to make things "correct", the
-        //      new HTML gets sent through the purifier, regardless of its
-        //      status. This means that if we add a start token, because it
-        //      was totally necessary, we don't have to update nesting; we just
-        //      punt ($reprocess = true; continue;) and it does that for us.
-
-        // isset is in loop because $tokens size changes during loop exec
-        for (
-            $t = 0;
-            $t == 0 || isset($tokens[$t - 1]);
-            // only increment if we don't need to reprocess
-            $reprocess ? $reprocess = false : $t++
-        ) {
-
-            // check for a rewind
-            if (is_int($i) && $i >= 0) {
-                // possibility: disable rewinding if the current token has a
-                // rewind set on it already. This would offer protection from
-                // infinite loop, but might hinder some advanced rewinding.
-                $rewind_to = $this->injectors[$i]->getRewind();
-                if (is_int($rewind_to) && $rewind_to < $t) {
-                    if ($rewind_to < 0) $rewind_to = 0;
-                    while ($t > $rewind_to) {
-                        $t--;
-                        $prev = $tokens[$t];
-                        // indicate that other injectors should not process this token,
-                        // but we need to reprocess it
-                        unset($prev->skip[$i]);
-                        $prev->rewind = $i;
-                        if ($prev instanceof HTMLPurifier_Token_Start) array_pop($this->stack);
-                        elseif ($prev instanceof HTMLPurifier_Token_End) $this->stack[] = $prev->start;
-                    }
-                }
-                $i = false;
-            }
-
-            // handle case of document end
-            if (!isset($tokens[$t])) {
-                // kill processing if stack is empty
-                if (empty($this->stack)) break;
-
-                // peek
-                $top_nesting = array_pop($this->stack);
-                $this->stack[] = $top_nesting;
-
-                // send error
-                if ($e && !isset($top_nesting->armor['MakeWellFormed_TagClosedError'])) {
-                    $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by document end', $top_nesting);
-                }
-
-                // append, don't splice, since this is the end
-                $tokens[] = new HTMLPurifier_Token_End($top_nesting->name);
-
-                // punt!
-                $reprocess = true;
-                continue;
-            }
-
-            $token = $tokens[$t];
-
-            //echo '<br>'; printTokens($tokens, $t); printTokens($this->stack);
-
-            // quick-check: if it's not a tag, no need to process
-            if (empty($token->is_tag)) {
-                if ($token instanceof HTMLPurifier_Token_Text) {
-                    foreach ($this->injectors as $i => $injector) {
-                        if (isset($token->skip[$i])) continue;
-                        if ($token->rewind !== null && $token->rewind !== $i) continue;
-                        $injector->handleText($token);
-                        $this->processToken($token, $i);
-                        $reprocess = true;
-                        break;
-                    }
-                }
-                // another possibility is a comment
-                continue;
-            }
-
-            if (isset($definition->info[$token->name])) {
-                $type = $definition->info[$token->name]->child->type;
-            } else {
-                $type = false; // Type is unknown, treat accordingly
-            }
-
-            // quick tag checks: anything that's *not* an end tag
-            $ok = false;
-            if ($type === 'empty' && $token instanceof HTMLPurifier_Token_Start) {
-                // claims to be a start tag but is empty
-                $token = new HTMLPurifier_Token_Empty($token->name, $token->attr);
-                $ok = true;
-            } elseif ($type && $type !== 'empty' && $token instanceof HTMLPurifier_Token_Empty) {
-                // claims to be empty but really is a start tag
-                $this->swap(new HTMLPurifier_Token_End($token->name));
-                $this->insertBefore(new HTMLPurifier_Token_Start($token->name, $token->attr));
-                // punt (since we had to modify the input stream in a non-trivial way)
-                $reprocess = true;
-                continue;
-            } elseif ($token instanceof HTMLPurifier_Token_Empty) {
-                // real empty token
-                $ok = true;
-            } elseif ($token instanceof HTMLPurifier_Token_Start) {
-                // start tag
-
-                // ...unless they also have to close their parent
-                if (!empty($this->stack)) {
-
-                    $parent = array_pop($this->stack);
-                    $this->stack[] = $parent;
-
-                    if (isset($definition->info[$parent->name])) {
-                        $elements = $definition->info[$parent->name]->child->getAllowedElements($config);
-                        $autoclose = !isset($elements[$token->name]);
-                    } else {
-                        $autoclose = false;
-                    }
-
-                    $carryover = false;
-                    if ($autoclose && $definition->info[$parent->name]->formatting) {
-                        $carryover = true;
-                    }
-
-                    if ($autoclose) {
-                        // errors need to be updated
-                        $new_token = new HTMLPurifier_Token_End($parent->name);
-                        $new_token->start = $parent;
-                        if ($carryover) {
-                            $element = clone $parent;
-                            $element->armor['MakeWellFormed_TagClosedError'] = true;
-                            $element->carryover = true;
-                            $this->processToken(array($new_token, $token, $element));
-                        } else {
-                            $this->insertBefore($new_token);
-                        }
-                        if ($e && !isset($parent->armor['MakeWellFormed_TagClosedError'])) {
-                            if (!$carryover) {
-                                $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag auto closed', $parent);
-                            } else {
-                                $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag carryover', $parent);
-                            }
-                        }
-                        $reprocess = true;
-                        continue;
-                    }
-
-                }
-                $ok = true;
-            }
-
-            if ($ok) {
-                foreach ($this->injectors as $i => $injector) {
-                    if (isset($token->skip[$i])) continue;
-                    if ($token->rewind !== null && $token->rewind !== $i) continue;
-                    $injector->handleElement($token);
-                    $this->processToken($token, $i);
-                    $reprocess = true;
-                    break;
-                }
-                if (!$reprocess) {
-                    // ah, nothing interesting happened; do normal processing
-                    $this->swap($token);
-                    if ($token instanceof HTMLPurifier_Token_Start) {
-                        $this->stack[] = $token;
-                    } elseif ($token instanceof HTMLPurifier_Token_End) {
-                        throw new HTMLPurifier_Exception('Improper handling of end tag in start code; possible error in MakeWellFormed');
-                    }
-                }
-                continue;
-            }
-
-            // sanity check: we should be dealing with a closing tag
-            if (!$token instanceof HTMLPurifier_Token_End) {
-                throw new HTMLPurifier_Exception('Unaccounted for tag token in input stream, bug in HTML Purifier');
-            }
-
-            // make sure that we have something open
-            if (empty($this->stack)) {
-                if ($escape_invalid_tags) {
-                    if ($e) $e->send(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag to text');
-                    $this->swap(new HTMLPurifier_Token_Text(
-                        $generator->generateFromToken($token)
-                    ));
-                } else {
-                    $this->remove();
-                    if ($e) $e->send(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag removed');
-                }
-                $reprocess = true;
-                continue;
-            }
-
-            // first, check for the simplest case: everything closes neatly.
-            // Eventually, everything passes through here; if there are problems
-            // we modify the input stream accordingly and then punt, so that
-            // the tokens get processed again.
-            $current_parent = array_pop($this->stack);
-            if ($current_parent->name == $token->name) {
-                $token->start = $current_parent;
-                foreach ($this->injectors as $i => $injector) {
-                    if (isset($token->skip[$i])) continue;
-                    if ($token->rewind !== null && $token->rewind !== $i) continue;
-                    $injector->handleEnd($token);
-                    $this->processToken($token, $i);
-                    $this->stack[] = $current_parent;
-                    $reprocess = true;
-                    break;
-                }
-                continue;
-            }
-
-            // okay, so we're trying to close the wrong tag
-
-            // undo the pop previous pop
-            $this->stack[] = $current_parent;
-
-            // scroll back the entire nest, trying to find our tag.
-            // (feature could be to specify how far you'd like to go)
-            $size = count($this->stack);
-            // -2 because -1 is the last element, but we already checked that
-            $skipped_tags = false;
-            for ($j = $size - 2; $j >= 0; $j--) {
-                if ($this->stack[$j]->name == $token->name) {
-                    $skipped_tags = array_slice($this->stack, $j);
-                    break;
-                }
-            }
-
-            // we didn't find the tag, so remove
-            if ($skipped_tags === false) {
-                if ($escape_invalid_tags) {
-                    $this->swap(new HTMLPurifier_Token_Text(
-                        $generator->generateFromToken($token)
-                    ));
-                    if ($e) $e->send(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag to text');
-                } else {
-                    $this->remove();
-                    if ($e) $e->send(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag removed');
-                }
-                $reprocess = true;
-                continue;
-            }
-
-            // do errors, in REVERSE $j order: a,b,c with </a></b></c>
-            $c = count($skipped_tags);
-            if ($e) {
-                for ($j = $c - 1; $j > 0; $j--) {
-                    // notice we exclude $j == 0, i.e. the current ending tag, from
-                    // the errors...
-                    if (!isset($skipped_tags[$j]->armor['MakeWellFormed_TagClosedError'])) {
-                        $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by element end', $skipped_tags[$j]);
-                    }
-                }
-            }
-
-            // insert tags, in FORWARD $j order: c,b,a with </a></b></c>
-            $replace = array($token);
-            for ($j = 1; $j < $c; $j++) {
-                // ...as well as from the insertions
-                $new_token = new HTMLPurifier_Token_End($skipped_tags[$j]->name);
-                $new_token->start = $skipped_tags[$j];
-                array_unshift($replace, $new_token);
-                if (isset($definition->info[$new_token->name]) && $definition->info[$new_token->name]->formatting) {
-                    $element = clone $skipped_tags[$j];
-                    $element->carryover = true;
-                    $element->armor['MakeWellFormed_TagClosedError'] = true;
-                    $replace[] = $element;
-                }
-            }
-            $this->processToken($replace);
-            $reprocess = true;
-            continue;
-        }
-
-        $context->destroy('CurrentNesting');
-        $context->destroy('InputTokens');
-        $context->destroy('InputIndex');
-        $context->destroy('CurrentToken');
-
-        unset($this->injectors, $this->stack, $this->tokens, $this->t);
-        return $tokens;
-    }
-
-    /**
-     * Processes arbitrary token values for complicated substitution patterns.
-     * In general:
-     *
-     * If $token is an array, it is a list of tokens to substitute for the
-     * current token. These tokens then get individually processed. If there
-     * is a leading integer in the list, that integer determines how many
-     * tokens from the stream should be removed.
-     *
-     * If $token is a regular token, it is swapped with the current token.
-     *
-     * If $token is false, the current token is deleted.
-     *
-     * If $token is an integer, that number of tokens (with the first token
-     * being the current one) will be deleted.
-     *
-     * @param $token Token substitution value
-     * @param $injector Injector that performed the substitution; default is if
-     *        this is not an injector related operation.
-     */
-    protected function processToken($token, $injector = -1) {
-
-        // normalize forms of token
-        if (is_object($token)) $token = array(1, $token);
-        if (is_int($token))    $token = array($token);
-        if ($token === false)  $token = array(1);
-        if (!is_array($token)) throw new HTMLPurifier_Exception('Invalid token type from injector');
-        if (!is_int($token[0])) array_unshift($token, 1);
-        if ($token[0] === 0) throw new HTMLPurifier_Exception('Deleting zero tokens is not valid');
-
-        // $token is now an array with the following form:
-        // array(number nodes to delete, new node 1, new node 2, ...)
-
-        $delete = array_shift($token);
-        $old = array_splice($this->tokens, $this->t, $delete, $token);
-
-        if ($injector > -1) {
-            // determine appropriate skips
-            $oldskip = isset($old[0]) ? $old[0]->skip : array();
-            foreach ($token as $object) {
-                $object->skip = $oldskip;
-                $object->skip[$injector] = true;
-            }
-        }
-
-    }
-
-    /**
-     * Inserts a token before the current token. Cursor now points to this token
-     */
-    private function insertBefore($token) {
-        array_splice($this->tokens, $this->t, 0, array($token));
-    }
-
-    /**
-     * Removes current token. Cursor now points to new token occupying previously
-     * occupied space.
-     */
-    private function remove() {
-        array_splice($this->tokens, $this->t, 1);
-    }
-
-    /**
-     * Swap current token with new token. Cursor points to new token (no change).
-     */
-    private function swap($token) {
-        $this->tokens[$this->t] = $token;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Strategy/RemoveForeignElements.php b/lib/php/HTMLPurifier/Strategy/RemoveForeignElements.php
deleted file mode 100644
index cf3a33e406eacd22f71502f93d7a2a4484aba3b2..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Strategy/RemoveForeignElements.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-/**
- * Removes all unrecognized tags from the list of tokens.
- *
- * This strategy iterates through all the tokens and removes unrecognized
- * tokens. If a token is not recognized but a TagTransform is defined for
- * that element, the element will be transformed accordingly.
- */
-
-class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
-{
-
-    public function execute($tokens, $config, $context) {
-        $definition = $config->getHTMLDefinition();
-        $generator = new HTMLPurifier_Generator($config, $context);
-        $result = array();
-
-        $escape_invalid_tags = $config->get('Core.EscapeInvalidTags');
-        $remove_invalid_img  = $config->get('Core.RemoveInvalidImg');
-
-        // currently only used to determine if comments should be kept
-        $trusted = $config->get('HTML.Trusted');
-
-        $remove_script_contents = $config->get('Core.RemoveScriptContents');
-        $hidden_elements     = $config->get('Core.HiddenElements');
-
-        // remove script contents compatibility
-        if ($remove_script_contents === true) {
-            $hidden_elements['script'] = true;
-        } elseif ($remove_script_contents === false && isset($hidden_elements['script'])) {
-            unset($hidden_elements['script']);
-        }
-
-        $attr_validator = new HTMLPurifier_AttrValidator();
-
-        // removes tokens until it reaches a closing tag with its value
-        $remove_until = false;
-
-        // converts comments into text tokens when this is equal to a tag name
-        $textify_comments = false;
-
-        $token = false;
-        $context->register('CurrentToken', $token);
-
-        $e = false;
-        if ($config->get('Core.CollectErrors')) {
-            $e =& $context->get('ErrorCollector');
-        }
-
-        foreach($tokens as $token) {
-            if ($remove_until) {
-                if (empty($token->is_tag) || $token->name !== $remove_until) {
-                    continue;
-                }
-            }
-            if (!empty( $token->is_tag )) {
-                // DEFINITION CALL
-
-                // before any processing, try to transform the element
-                if (
-                    isset($definition->info_tag_transform[$token->name])
-                ) {
-                    $original_name = $token->name;
-                    // there is a transformation for this tag
-                    // DEFINITION CALL
-                    $token = $definition->
-                                info_tag_transform[$token->name]->
-                                    transform($token, $config, $context);
-                    if ($e) $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Tag transform', $original_name);
-                }
-
-                if (isset($definition->info[$token->name])) {
-
-                    // mostly everything's good, but
-                    // we need to make sure required attributes are in order
-                    if (
-                        ($token instanceof HTMLPurifier_Token_Start || $token instanceof HTMLPurifier_Token_Empty) &&
-                        $definition->info[$token->name]->required_attr &&
-                        ($token->name != 'img' || $remove_invalid_img) // ensure config option still works
-                    ) {
-                        $attr_validator->validateToken($token, $config, $context);
-                        $ok = true;
-                        foreach ($definition->info[$token->name]->required_attr as $name) {
-                            if (!isset($token->attr[$name])) {
-                                $ok = false;
-                                break;
-                            }
-                        }
-                        if (!$ok) {
-                            if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Missing required attribute', $name);
-                            continue;
-                        }
-                        $token->armor['ValidateAttributes'] = true;
-                    }
-
-                    if (isset($hidden_elements[$token->name]) && $token instanceof HTMLPurifier_Token_Start) {
-                        $textify_comments = $token->name;
-                    } elseif ($token->name === $textify_comments && $token instanceof HTMLPurifier_Token_End) {
-                        $textify_comments = false;
-                    }
-
-                } elseif ($escape_invalid_tags) {
-                    // invalid tag, generate HTML representation and insert in
-                    if ($e) $e->send(E_WARNING, 'Strategy_RemoveForeignElements: Foreign element to text');
-                    $token = new HTMLPurifier_Token_Text(
-                        $generator->generateFromToken($token)
-                    );
-                } else {
-                    // check if we need to destroy all of the tag's children
-                    // CAN BE GENERICIZED
-                    if (isset($hidden_elements[$token->name])) {
-                        if ($token instanceof HTMLPurifier_Token_Start) {
-                            $remove_until = $token->name;
-                        } elseif ($token instanceof HTMLPurifier_Token_Empty) {
-                            // do nothing: we're still looking
-                        } else {
-                            $remove_until = false;
-                        }
-                        if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign meta element removed');
-                    } else {
-                        if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign element removed');
-                    }
-                    continue;
-                }
-            } elseif ($token instanceof HTMLPurifier_Token_Comment) {
-                // textify comments in script tags when they are allowed
-                if ($textify_comments !== false) {
-                    $data = $token->data;
-                    $token = new HTMLPurifier_Token_Text($data);
-                } elseif ($trusted) {
-                    // keep, but perform comment cleaning
-                    if ($e) {
-                        // perform check whether or not there's a trailing hyphen
-                        if (substr($token->data, -1) == '-') {
-                            $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Trailing hyphen in comment removed');
-                        }
-                    }
-                    $token->data = rtrim($token->data, '-');
-                    $found_double_hyphen = false;
-                    while (strpos($token->data, '--') !== false) {
-                        if ($e && !$found_double_hyphen) {
-                            $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Hyphens in comment collapsed');
-                        }
-                        $found_double_hyphen = true; // prevent double-erroring
-                        $token->data = str_replace('--', '-', $token->data);
-                    }
-                } else {
-                    // strip comments
-                    if ($e) $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
-                    continue;
-                }
-            } elseif ($token instanceof HTMLPurifier_Token_Text) {
-            } else {
-                continue;
-            }
-            $result[] = $token;
-        }
-        if ($remove_until && $e) {
-            // we removed tokens until the end, throw error
-            $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Token removed to end', $remove_until);
-        }
-
-        $context->destroy('CurrentToken');
-
-        return $result;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Strategy/ValidateAttributes.php b/lib/php/HTMLPurifier/Strategy/ValidateAttributes.php
deleted file mode 100644
index c3328a9d44199d596371976e9da5209d0f8f52a3..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Strategy/ValidateAttributes.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Validate all attributes in the tokens.
- */
-
-class HTMLPurifier_Strategy_ValidateAttributes extends HTMLPurifier_Strategy
-{
-
-    public function execute($tokens, $config, $context) {
-
-        // setup validator
-        $validator = new HTMLPurifier_AttrValidator();
-
-        $token = false;
-        $context->register('CurrentToken', $token);
-
-        foreach ($tokens as $key => $token) {
-
-            // only process tokens that have attributes,
-            //   namely start and empty tags
-            if (!$token instanceof HTMLPurifier_Token_Start && !$token instanceof HTMLPurifier_Token_Empty) continue;
-
-            // skip tokens that are armored
-            if (!empty($token->armor['ValidateAttributes'])) continue;
-
-            // note that we have no facilities here for removing tokens
-            $validator->validateToken($token, $config, $context);
-
-            $tokens[$key] = $token; // for PHP 4
-        }
-        $context->destroy('CurrentToken');
-
-        return $tokens;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/StringHash.php b/lib/php/HTMLPurifier/StringHash.php
deleted file mode 100644
index 62085c5c2ffff64f770973190fbb0ad737a2c9d6..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/StringHash.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * This is in almost every respect equivalent to an array except
- * that it keeps track of which keys were accessed.
- *
- * @warning For the sake of backwards compatibility with early versions
- *     of PHP 5, you must not use the $hash[$key] syntax; if you do
- *     our version of offsetGet is never called.
- */
-class HTMLPurifier_StringHash extends ArrayObject
-{
-    protected $accessed = array();
-
-    /**
-     * Retrieves a value, and logs the access.
-     */
-    public function offsetGet($index) {
-        $this->accessed[$index] = true;
-        return parent::offsetGet($index);
-    }
-
-    /**
-     * Returns a lookup array of all array indexes that have been accessed.
-     * @return Array in form array($index => true).
-     */
-    public function getAccessed() {
-        return $this->accessed;
-    }
-
-    /**
-     * Resets the access array.
-     */
-    public function resetAccessed() {
-        $this->accessed = array();
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/StringHashParser.php b/lib/php/HTMLPurifier/StringHashParser.php
deleted file mode 100644
index f3e70c712f077cc2c3f0325df1075e1985647b15..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/StringHashParser.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * Parses string hash files. File format is as such:
- *
- *      DefaultKeyValue
- *      KEY: Value
- *      KEY2: Value2
- *      --MULTILINE-KEY--
- *      Multiline
- *      value.
- *
- * Which would output something similar to:
- *
- *      array(
- *          'ID' => 'DefaultKeyValue',
- *          'KEY' => 'Value',
- *          'KEY2' => 'Value2',
- *          'MULTILINE-KEY' => "Multiline\nvalue.\n",
- *      )
- *
- * We use this as an easy to use file-format for configuration schema
- * files, but the class itself is usage agnostic.
- *
- * You can use ---- to forcibly terminate parsing of a single string-hash;
- * this marker is used in multi string-hashes to delimit boundaries.
- */
-class HTMLPurifier_StringHashParser
-{
-
-    public $default = 'ID';
-
-    /**
-     * Parses a file that contains a single string-hash.
-     */
-    public function parseFile($file) {
-        if (!file_exists($file)) return false;
-        $fh = fopen($file, 'r');
-        if (!$fh) return false;
-        $ret = $this->parseHandle($fh);
-        fclose($fh);
-        return $ret;
-    }
-
-    /**
-     * Parses a file that contains multiple string-hashes delimited by '----'
-     */
-    public function parseMultiFile($file) {
-        if (!file_exists($file)) return false;
-        $ret = array();
-        $fh = fopen($file, 'r');
-        if (!$fh) return false;
-        while (!feof($fh)) {
-            $ret[] = $this->parseHandle($fh);
-        }
-        fclose($fh);
-        return $ret;
-    }
-
-    /**
-     * Internal parser that acepts a file handle.
-     * @note While it's possible to simulate in-memory parsing by using
-     *       custom stream wrappers, if such a use-case arises we should
-     *       factor out the file handle into its own class.
-     * @param $fh File handle with pointer at start of valid string-hash
-     *            block.
-     */
-    protected function parseHandle($fh) {
-        $state   = false;
-        $single  = false;
-        $ret     = array();
-        do {
-            $line = fgets($fh);
-            if ($line === false) break;
-            $line = rtrim($line, "\n\r");
-            if (!$state && $line === '') continue;
-            if ($line === '----') break;
-            if (strncmp('--#', $line, 3) === 0) {
-                // Comment
-                continue;
-            } elseif (strncmp('--', $line, 2) === 0) {
-                // Multiline declaration
-                $state = trim($line, '- ');
-                if (!isset($ret[$state])) $ret[$state] = '';
-                continue;
-            } elseif (!$state) {
-                $single = true;
-                if (strpos($line, ':') !== false) {
-                    // Single-line declaration
-                    list($state, $line) = explode(':', $line, 2);
-                    $line = trim($line);
-                } else {
-                    // Use default declaration
-                    $state  = $this->default;
-                }
-            }
-            if ($single) {
-                $ret[$state] = $line;
-                $single = false;
-                $state  = false;
-            } else {
-                $ret[$state] .= "$line\n";
-            }
-        } while (!feof($fh));
-        return $ret;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/TagTransform.php b/lib/php/HTMLPurifier/TagTransform.php
deleted file mode 100644
index 210a44721769223bf25c9ec531874fc5de1eb5c2..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/TagTransform.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Defines a mutation of an obsolete tag into a valid tag.
- */
-abstract class HTMLPurifier_TagTransform
-{
-
-    /**
-     * Tag name to transform the tag to.
-     */
-    public $transform_to;
-
-    /**
-     * Transforms the obsolete tag into the valid tag.
-     * @param $tag Tag to be transformed.
-     * @param $config Mandatory HTMLPurifier_Config object
-     * @param $context Mandatory HTMLPurifier_Context object
-     */
-    abstract public function transform($tag, $config, $context);
-
-    /**
-     * Prepends CSS properties to the style attribute, creating the
-     * attribute if it doesn't exist.
-     * @warning Copied over from AttrTransform, be sure to keep in sync
-     * @param $attr Attribute array to process (passed by reference)
-     * @param $css CSS to prepend
-     */
-    protected function prependCSS(&$attr, $css) {
-        $attr['style'] = isset($attr['style']) ? $attr['style'] : '';
-        $attr['style'] = $css . $attr['style'];
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/TagTransform/Font.php b/lib/php/HTMLPurifier/TagTransform/Font.php
deleted file mode 100644
index ed2463786db064c1799d63945f066a335695c863..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/TagTransform/Font.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * Transforms FONT tags to the proper form (SPAN with CSS styling)
- *
- * This transformation takes the three proprietary attributes of FONT and
- * transforms them into their corresponding CSS attributes.  These are color,
- * face, and size.
- *
- * @note Size is an interesting case because it doesn't map cleanly to CSS.
- *       Thanks to
- *       http://style.cleverchimp.com/font_size_intervals/altintervals.html
- *       for reasonable mappings.
- * @warning This doesn't work completely correctly; specifically, this
- *          TagTransform operates before well-formedness is enforced, so
- *          the "active formatting elements" algorithm doesn't get applied.
- */
-class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform
-{
-
-    public $transform_to = 'span';
-
-    protected $_size_lookup = array(
-        '0' => 'xx-small',
-        '1' => 'xx-small',
-        '2' => 'small',
-        '3' => 'medium',
-        '4' => 'large',
-        '5' => 'x-large',
-        '6' => 'xx-large',
-        '7' => '300%',
-        '-1' => 'smaller',
-        '-2' => '60%',
-        '+1' => 'larger',
-        '+2' => '150%',
-        '+3' => '200%',
-        '+4' => '300%'
-    );
-
-    public function transform($tag, $config, $context) {
-
-        if ($tag instanceof HTMLPurifier_Token_End) {
-            $new_tag = clone $tag;
-            $new_tag->name = $this->transform_to;
-            return $new_tag;
-        }
-
-        $attr = $tag->attr;
-        $prepend_style = '';
-
-        // handle color transform
-        if (isset($attr['color'])) {
-            $prepend_style .= 'color:' . $attr['color'] . ';';
-            unset($attr['color']);
-        }
-
-        // handle face transform
-        if (isset($attr['face'])) {
-            $prepend_style .= 'font-family:' . $attr['face'] . ';';
-            unset($attr['face']);
-        }
-
-        // handle size transform
-        if (isset($attr['size'])) {
-            // normalize large numbers
-            if ($attr['size']{0} == '+' || $attr['size']{0} == '-') {
-                $size = (int) $attr['size'];
-                if ($size < -2) $attr['size'] = '-2';
-                if ($size > 4)  $attr['size'] = '+4';
-            } else {
-                $size = (int) $attr['size'];
-                if ($size > 7) $attr['size'] = '7';
-            }
-            if (isset($this->_size_lookup[$attr['size']])) {
-                $prepend_style .= 'font-size:' .
-                  $this->_size_lookup[$attr['size']] . ';';
-            }
-            unset($attr['size']);
-        }
-
-        if ($prepend_style) {
-            $attr['style'] = isset($attr['style']) ?
-                $prepend_style . $attr['style'] :
-                $prepend_style;
-        }
-
-        $new_tag = clone $tag;
-        $new_tag->name = $this->transform_to;
-        $new_tag->attr = $attr;
-
-        return $new_tag;
-
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/TagTransform/Simple.php b/lib/php/HTMLPurifier/TagTransform/Simple.php
deleted file mode 100644
index 0e36130f2538be1990b71823a289bdeaf8ed0bc8..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/TagTransform/Simple.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Simple transformation, just change tag name to something else,
- * and possibly add some styling. This will cover most of the deprecated
- * tag cases.
- */
-class HTMLPurifier_TagTransform_Simple extends HTMLPurifier_TagTransform
-{
-
-    protected $style;
-
-    /**
-     * @param $transform_to Tag name to transform to.
-     * @param $style CSS style to add to the tag
-     */
-    public function __construct($transform_to, $style = null) {
-        $this->transform_to = $transform_to;
-        $this->style = $style;
-    }
-
-    public function transform($tag, $config, $context) {
-        $new_tag = clone $tag;
-        $new_tag->name = $this->transform_to;
-        if (!is_null($this->style) &&
-            ($new_tag instanceof HTMLPurifier_Token_Start || $new_tag instanceof HTMLPurifier_Token_Empty)
-        ) {
-            $this->prependCSS($new_tag->attr, $this->style);
-        }
-        return $new_tag;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Token.php b/lib/php/HTMLPurifier/Token.php
deleted file mode 100644
index 7900e6cb10110ef4e9b6cec880c1a6d59c7beed1..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Token.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * Abstract base token class that all others inherit from.
- */
-class HTMLPurifier_Token {
-    public $line; /**< Line number node was on in source document. Null if unknown. */
-    public $col;  /**< Column of line node was on in source document. Null if unknown. */
-
-    /**
-     * Lookup array of processing that this token is exempt from.
-     * Currently, valid values are "ValidateAttributes" and
-     * "MakeWellFormed_TagClosedError"
-     */
-    public $armor = array();
-
-    /**
-     * Used during MakeWellFormed.
-     */
-    public $skip;
-    public $rewind;
-    public $carryover;
-
-    public function __get($n) {
-      if ($n === 'type') {
-        trigger_error('Deprecated type property called; use instanceof', E_USER_NOTICE);
-        switch (get_class($this)) {
-          case 'HTMLPurifier_Token_Start':      return 'start';
-          case 'HTMLPurifier_Token_Empty':      return 'empty';
-          case 'HTMLPurifier_Token_End':        return 'end';
-          case 'HTMLPurifier_Token_Text':       return 'text';
-          case 'HTMLPurifier_Token_Comment':    return 'comment';
-          default: return null;
-        }
-      }
-    }
-
-    /**
-     * Sets the position of the token in the source document.
-     */
-    public function position($l = null, $c = null) {
-        $this->line = $l;
-        $this->col  = $c;
-    }
-
-    /**
-     * Convenience function for DirectLex settings line/col position.
-     */
-    public function rawPosition($l, $c) {
-        if ($c === -1) $l++;
-        $this->line = $l;
-        $this->col  = $c;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Token/Comment.php b/lib/php/HTMLPurifier/Token/Comment.php
deleted file mode 100644
index dc6bdcabb85952963cc48978bdce24253952e7d8..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Token/Comment.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Concrete comment token class. Generally will be ignored.
- */
-class HTMLPurifier_Token_Comment extends HTMLPurifier_Token
-{
-    public $data; /**< Character data within comment. */
-    public $is_whitespace = true;
-    /**
-     * Transparent constructor.
-     *
-     * @param $data String comment data.
-     */
-    public function __construct($data, $line = null, $col = null) {
-        $this->data = $data;
-        $this->line = $line;
-        $this->col  = $col;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Token/Empty.php b/lib/php/HTMLPurifier/Token/Empty.php
deleted file mode 100644
index 2a82b47ad127036a1fe276a4b5308384f0599985..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Token/Empty.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * Concrete empty token class.
- */
-class HTMLPurifier_Token_Empty extends HTMLPurifier_Token_Tag
-{
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Token/End.php b/lib/php/HTMLPurifier/Token/End.php
deleted file mode 100644
index 353e79daf7357bdc55b5a1339558ac5838cf9a39..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Token/End.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Concrete end token class.
- *
- * @warning This class accepts attributes even though end tags cannot. This
- * is for optimization reasons, as under normal circumstances, the Lexers
- * do not pass attributes.
- */
-class HTMLPurifier_Token_End extends HTMLPurifier_Token_Tag
-{
-    /**
-     * Token that started this node. Added by MakeWellFormed. Please
-     * do not edit this!
-     */
-    public $start;
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Token/Start.php b/lib/php/HTMLPurifier/Token/Start.php
deleted file mode 100644
index e0e14fc624ab6a4279d7595d7beb483da0a83a7f..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Token/Start.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * Concrete start token class.
- */
-class HTMLPurifier_Token_Start extends HTMLPurifier_Token_Tag
-{
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Token/Tag.php b/lib/php/HTMLPurifier/Token/Tag.php
deleted file mode 100644
index 798be028ee6394ab904f9e67b2ba1e8f8a70ae24..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Token/Tag.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Abstract class of a tag token (start, end or empty), and its behavior.
- */
-class HTMLPurifier_Token_Tag extends HTMLPurifier_Token
-{
-    /**
-     * Static bool marker that indicates the class is a tag.
-     *
-     * This allows us to check objects with <tt>!empty($obj->is_tag)</tt>
-     * without having to use a function call <tt>is_a()</tt>.
-     */
-    public $is_tag = true;
-
-    /**
-     * The lower-case name of the tag, like 'a', 'b' or 'blockquote'.
-     *
-     * @note Strictly speaking, XML tags are case sensitive, so we shouldn't
-     * be lower-casing them, but these tokens cater to HTML tags, which are
-     * insensitive.
-     */
-    public $name;
-
-    /**
-     * Associative array of the tag's attributes.
-     */
-    public $attr = array();
-
-    /**
-     * Non-overloaded constructor, which lower-cases passed tag name.
-     *
-     * @param $name String name.
-     * @param $attr Associative array of attributes.
-     */
-    public function __construct($name, $attr = array(), $line = null, $col = null) {
-        $this->name = ctype_lower($name) ? $name : strtolower($name);
-        foreach ($attr as $key => $value) {
-            // normalization only necessary when key is not lowercase
-            if (!ctype_lower($key)) {
-                $new_key = strtolower($key);
-                if (!isset($attr[$new_key])) {
-                    $attr[$new_key] = $attr[$key];
-                }
-                if ($new_key !== $key) {
-                    unset($attr[$key]);
-                }
-            }
-        }
-        $this->attr = $attr;
-        $this->line = $line;
-        $this->col  = $col;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/Token/Text.php b/lib/php/HTMLPurifier/Token/Text.php
deleted file mode 100644
index 82efd823d6b60fd1be94f23159e0a4beb63b4953..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/Token/Text.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Concrete text token class.
- *
- * Text tokens comprise of regular parsed character data (PCDATA) and raw
- * character data (from the CDATA sections). Internally, their
- * data is parsed with all entities expanded. Surprisingly, the text token
- * does have a "tag name" called #PCDATA, which is how the DTD represents it
- * in permissible child nodes.
- */
-class HTMLPurifier_Token_Text extends HTMLPurifier_Token
-{
-
-    public $name = '#PCDATA'; /**< PCDATA tag name compatible with DTD. */
-    public $data; /**< Parsed character data of text. */
-    public $is_whitespace; /**< Bool indicating if node is whitespace. */
-
-    /**
-     * Constructor, accepts data and determines if it is whitespace.
-     *
-     * @param $data String parsed character data.
-     */
-    public function __construct($data, $line = null, $col = null) {
-        $this->data = $data;
-        $this->is_whitespace = ctype_space($data);
-        $this->line = $line;
-        $this->col  = $col;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/TokenFactory.php b/lib/php/HTMLPurifier/TokenFactory.php
deleted file mode 100644
index 7cf48fb41c1ee30b3d2a5f21a22579effb1d547d..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/TokenFactory.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-/**
- * Factory for token generation.
- *
- * @note Doing some benchmarking indicates that the new operator is much
- *       slower than the clone operator (even discounting the cost of the
- *       constructor).  This class is for that optimization.
- *       Other then that, there's not much point as we don't
- *       maintain parallel HTMLPurifier_Token hierarchies (the main reason why
- *       you'd want to use an abstract factory).
- * @todo Port DirectLex to use this
- */
-class HTMLPurifier_TokenFactory
-{
-
-    /**
-     * Prototypes that will be cloned.
-     * @private
-     */
-    // p stands for prototype
-    private $p_start, $p_end, $p_empty, $p_text, $p_comment;
-
-    /**
-     * Generates blank prototypes for cloning.
-     */
-    public function __construct() {
-        $this->p_start  = new HTMLPurifier_Token_Start('', array());
-        $this->p_end    = new HTMLPurifier_Token_End('');
-        $this->p_empty  = new HTMLPurifier_Token_Empty('', array());
-        $this->p_text   = new HTMLPurifier_Token_Text('');
-        $this->p_comment= new HTMLPurifier_Token_Comment('');
-    }
-
-    /**
-     * Creates a HTMLPurifier_Token_Start.
-     * @param $name Tag name
-     * @param $attr Associative array of attributes
-     * @return Generated HTMLPurifier_Token_Start
-     */
-    public function createStart($name, $attr = array()) {
-        $p = clone $this->p_start;
-        $p->__construct($name, $attr);
-        return $p;
-    }
-
-    /**
-     * Creates a HTMLPurifier_Token_End.
-     * @param $name Tag name
-     * @return Generated HTMLPurifier_Token_End
-     */
-    public function createEnd($name) {
-        $p = clone $this->p_end;
-        $p->__construct($name);
-        return $p;
-    }
-
-    /**
-     * Creates a HTMLPurifier_Token_Empty.
-     * @param $name Tag name
-     * @param $attr Associative array of attributes
-     * @return Generated HTMLPurifier_Token_Empty
-     */
-    public function createEmpty($name, $attr = array()) {
-        $p = clone $this->p_empty;
-        $p->__construct($name, $attr);
-        return $p;
-    }
-
-    /**
-     * Creates a HTMLPurifier_Token_Text.
-     * @param $data Data of text token
-     * @return Generated HTMLPurifier_Token_Text
-     */
-    public function createText($data) {
-        $p = clone $this->p_text;
-        $p->__construct($data);
-        return $p;
-    }
-
-    /**
-     * Creates a HTMLPurifier_Token_Comment.
-     * @param $data Data of comment token
-     * @return Generated HTMLPurifier_Token_Comment
-     */
-    public function createComment($data) {
-        $p = clone $this->p_comment;
-        $p->__construct($data);
-        return $p;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/URI.php b/lib/php/HTMLPurifier/URI.php
deleted file mode 100644
index 8b50d0d18d8510c0e6ea56598a5d7555c0ebb735..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/URI.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-/**
- * HTML Purifier's internal representation of a URI.
- * @note
- *      Internal data-structures are completely escaped. If the data needs
- *      to be used in a non-URI context (which is very unlikely), be sure
- *      to decode it first. The URI may not necessarily be well-formed until
- *      validate() is called.
- */
-class HTMLPurifier_URI
-{
-
-    public $scheme, $userinfo, $host, $port, $path, $query, $fragment;
-
-    /**
-     * @note Automatically normalizes scheme and port
-     */
-    public function __construct($scheme, $userinfo, $host, $port, $path, $query, $fragment) {
-        $this->scheme = is_null($scheme) || ctype_lower($scheme) ? $scheme : strtolower($scheme);
-        $this->userinfo = $userinfo;
-        $this->host = $host;
-        $this->port = is_null($port) ? $port : (int) $port;
-        $this->path = $path;
-        $this->query = $query;
-        $this->fragment = $fragment;
-    }
-
-    /**
-     * Retrieves a scheme object corresponding to the URI's scheme/default
-     * @param $config Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     * @return Scheme object appropriate for validating this URI
-     */
-    public function getSchemeObj($config, $context) {
-        $registry = HTMLPurifier_URISchemeRegistry::instance();
-        if ($this->scheme !== null) {
-            $scheme_obj = $registry->getScheme($this->scheme, $config, $context);
-            if (!$scheme_obj) return false; // invalid scheme, clean it out
-        } else {
-            // no scheme: retrieve the default one
-            $def = $config->getDefinition('URI');
-            $scheme_obj = $registry->getScheme($def->defaultScheme, $config, $context);
-            if (!$scheme_obj) {
-                // something funky happened to the default scheme object
-                trigger_error(
-                    'Default scheme object "' . $def->defaultScheme . '" was not readable',
-                    E_USER_WARNING
-                );
-                return false;
-            }
-        }
-        return $scheme_obj;
-    }
-
-    /**
-     * Generic validation method applicable for all schemes. May modify
-     * this URI in order to get it into a compliant form.
-     * @param $config Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     * @return True if validation/filtering succeeds, false if failure
-     */
-    public function validate($config, $context) {
-
-        // ABNF definitions from RFC 3986
-        $chars_sub_delims = '!$&\'()*+,;=';
-        $chars_gen_delims = ':/?#[]@';
-        $chars_pchar = $chars_sub_delims . ':@';
-
-        // validate scheme (MUST BE FIRST!)
-        if (!is_null($this->scheme) && is_null($this->host)) {
-            $def = $config->getDefinition('URI');
-            if ($def->defaultScheme === $this->scheme) {
-                $this->scheme = null;
-            }
-        }
-
-        // validate host
-        if (!is_null($this->host)) {
-            $host_def = new HTMLPurifier_AttrDef_URI_Host();
-            $this->host = $host_def->validate($this->host, $config, $context);
-            if ($this->host === false) $this->host = null;
-        }
-
-        // validate username
-        if (!is_null($this->userinfo)) {
-            $encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . ':');
-            $this->userinfo = $encoder->encode($this->userinfo);
-        }
-
-        // validate port
-        if (!is_null($this->port)) {
-            if ($this->port < 1 || $this->port > 65535) $this->port = null;
-        }
-
-        // validate path
-        $path_parts = array();
-        $segments_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/');
-        if (!is_null($this->host)) {
-            // path-abempty (hier and relative)
-            $this->path = $segments_encoder->encode($this->path);
-        } elseif ($this->path !== '' && $this->path[0] === '/') {
-            // path-absolute (hier and relative)
-            if (strlen($this->path) >= 2 && $this->path[1] === '/') {
-                // This shouldn't ever happen!
-                $this->path = '';
-            } else {
-                $this->path = $segments_encoder->encode($this->path);
-            }
-        } elseif (!is_null($this->scheme) && $this->path !== '') {
-            // path-rootless (hier)
-            // Short circuit evaluation means we don't need to check nz
-            $this->path = $segments_encoder->encode($this->path);
-        } elseif (is_null($this->scheme) && $this->path !== '') {
-            // path-noscheme (relative)
-            // (once again, not checking nz)
-            $segment_nc_encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . '@');
-            $c = strpos($this->path, '/');
-            if ($c !== false) {
-                $this->path =
-                    $segment_nc_encoder->encode(substr($this->path, 0, $c)) .
-                    $segments_encoder->encode(substr($this->path, $c));
-            } else {
-                $this->path = $segment_nc_encoder->encode($this->path);
-            }
-        } else {
-            // path-empty (hier and relative)
-            $this->path = ''; // just to be safe
-        }
-
-        // qf = query and fragment
-        $qf_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/?');
-
-        if (!is_null($this->query)) {
-            $this->query = $qf_encoder->encode($this->query);
-        }
-
-        if (!is_null($this->fragment)) {
-            $this->fragment = $qf_encoder->encode($this->fragment);
-        }
-
-        return true;
-
-    }
-
-    /**
-     * Convert URI back to string
-     * @return String URI appropriate for output
-     */
-    public function toString() {
-        // reconstruct authority
-        $authority = null;
-        if (!is_null($this->host)) {
-            $authority = '';
-            if(!is_null($this->userinfo)) $authority .= $this->userinfo . '@';
-            $authority .= $this->host;
-            if(!is_null($this->port))     $authority .= ':' . $this->port;
-        }
-
-        // reconstruct the result
-        $result = '';
-        if (!is_null($this->scheme))    $result .= $this->scheme . ':';
-        if (!is_null($authority))       $result .=  '//' . $authority;
-        $result .= $this->path;
-        if (!is_null($this->query))     $result .= '?' . $this->query;
-        if (!is_null($this->fragment))  $result .= '#' . $this->fragment;
-
-        return $result;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/URIDefinition.php b/lib/php/HTMLPurifier/URIDefinition.php
deleted file mode 100644
index ea2b8fe245877781bde3248cd2eadfdda31747d8..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/URIDefinition.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-class HTMLPurifier_URIDefinition extends HTMLPurifier_Definition
-{
-
-    public $type = 'URI';
-    protected $filters = array();
-    protected $postFilters = array();
-    protected $registeredFilters = array();
-
-    /**
-     * HTMLPurifier_URI object of the base specified at %URI.Base
-     */
-    public $base;
-
-    /**
-     * String host to consider "home" base, derived off of $base
-     */
-    public $host;
-
-    /**
-     * Name of default scheme based on %URI.DefaultScheme and %URI.Base
-     */
-    public $defaultScheme;
-
-    public function __construct() {
-        $this->registerFilter(new HTMLPurifier_URIFilter_DisableExternal());
-        $this->registerFilter(new HTMLPurifier_URIFilter_DisableExternalResources());
-        $this->registerFilter(new HTMLPurifier_URIFilter_HostBlacklist());
-        $this->registerFilter(new HTMLPurifier_URIFilter_MakeAbsolute());
-        $this->registerFilter(new HTMLPurifier_URIFilter_Munge());
-    }
-
-    public function registerFilter($filter) {
-        $this->registeredFilters[$filter->name] = $filter;
-    }
-
-    public function addFilter($filter, $config) {
-        $r = $filter->prepare($config);
-        if ($r === false) return; // null is ok, for backwards compat
-        if ($filter->post) {
-            $this->postFilters[$filter->name] = $filter;
-        } else {
-            $this->filters[$filter->name] = $filter;
-        }
-    }
-
-    protected function doSetup($config) {
-        $this->setupMemberVariables($config);
-        $this->setupFilters($config);
-    }
-
-    protected function setupFilters($config) {
-        foreach ($this->registeredFilters as $name => $filter) {
-            $conf = $config->get('URI.' . $name);
-            if ($conf !== false && $conf !== null) {
-                $this->addFilter($filter, $config);
-            }
-        }
-        unset($this->registeredFilters);
-    }
-
-    protected function setupMemberVariables($config) {
-        $this->host = $config->get('URI.Host');
-        $base_uri = $config->get('URI.Base');
-        if (!is_null($base_uri)) {
-            $parser = new HTMLPurifier_URIParser();
-            $this->base = $parser->parse($base_uri);
-            $this->defaultScheme = $this->base->scheme;
-            if (is_null($this->host)) $this->host = $this->base->host;
-        }
-        if (is_null($this->defaultScheme)) $this->defaultScheme = $config->get('URI.DefaultScheme');
-    }
-
-    public function filter(&$uri, $config, $context) {
-        foreach ($this->filters as $name => $f) {
-            $result = $f->filter($uri, $config, $context);
-            if (!$result) return false;
-        }
-        return true;
-    }
-
-    public function postFilter(&$uri, $config, $context) {
-        foreach ($this->postFilters as $name => $f) {
-            $result = $f->filter($uri, $config, $context);
-            if (!$result) return false;
-        }
-        return true;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/URIFilter.php b/lib/php/HTMLPurifier/URIFilter.php
deleted file mode 100644
index c116f93dffc02a198a97ffcc3454147d3e5e9c1c..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/URIFilter.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * Chainable filters for custom URI processing.
- *
- * These filters can perform custom actions on a URI filter object,
- * including transformation or blacklisting.
- *
- * @warning This filter is called before scheme object validation occurs.
- *          Make sure, if you require a specific scheme object, you
- *          you check that it exists. This allows filters to convert
- *          proprietary URI schemes into regular ones.
- */
-abstract class HTMLPurifier_URIFilter
-{
-
-    /**
-     * Unique identifier of filter
-     */
-    public $name;
-
-    /**
-     * True if this filter should be run after scheme validation.
-     */
-    public $post = false;
-
-    /**
-     * Performs initialization for the filter
-     */
-    public function prepare($config) {return true;}
-
-    /**
-     * Filter a URI object
-     * @param $uri Reference to URI object variable
-     * @param $config Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     * @return bool Whether or not to continue processing: false indicates
-     *         URL is no good, true indicates continue processing. Note that
-     *         all changes are committed directly on the URI object
-     */
-    abstract public function filter(&$uri, $config, $context);
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/URIFilter/DisableExternal.php b/lib/php/HTMLPurifier/URIFilter/DisableExternal.php
deleted file mode 100644
index d8a39a5011120d663e92a3ab22d4dab1e9826116..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/URIFilter/DisableExternal.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-class HTMLPurifier_URIFilter_DisableExternal extends HTMLPurifier_URIFilter
-{
-    public $name = 'DisableExternal';
-    protected $ourHostParts = false;
-    public function prepare($config) {
-        $our_host = $config->getDefinition('URI')->host;
-        if ($our_host !== null) $this->ourHostParts = array_reverse(explode('.', $our_host));
-    }
-    public function filter(&$uri, $config, $context) {
-        if (is_null($uri->host)) return true;
-        if ($this->ourHostParts === false) return false;
-        $host_parts = array_reverse(explode('.', $uri->host));
-        foreach ($this->ourHostParts as $i => $x) {
-            if (!isset($host_parts[$i])) return false;
-            if ($host_parts[$i] != $this->ourHostParts[$i]) return false;
-        }
-        return true;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/URIFilter/DisableExternalResources.php b/lib/php/HTMLPurifier/URIFilter/DisableExternalResources.php
deleted file mode 100644
index 881abc43cfa2533027109ca74e7052be9a273ff6..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/URIFilter/DisableExternalResources.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-class HTMLPurifier_URIFilter_DisableExternalResources extends HTMLPurifier_URIFilter_DisableExternal
-{
-    public $name = 'DisableExternalResources';
-    public function filter(&$uri, $config, $context) {
-        if (!$context->get('EmbeddedURI', true)) return true;
-        return parent::filter($uri, $config, $context);
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/URIFilter/HostBlacklist.php b/lib/php/HTMLPurifier/URIFilter/HostBlacklist.php
deleted file mode 100644
index 045aa0992c662a88ba51cb556e67663467ceae78..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/URIFilter/HostBlacklist.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-class HTMLPurifier_URIFilter_HostBlacklist extends HTMLPurifier_URIFilter
-{
-    public $name = 'HostBlacklist';
-    protected $blacklist = array();
-    public function prepare($config) {
-        $this->blacklist = $config->get('URI.HostBlacklist');
-        return true;
-    }
-    public function filter(&$uri, $config, $context) {
-        foreach($this->blacklist as $blacklisted_host_fragment) {
-            if (strpos($uri->host, $blacklisted_host_fragment) !== false) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/URIFilter/MakeAbsolute.php b/lib/php/HTMLPurifier/URIFilter/MakeAbsolute.php
deleted file mode 100644
index f46ab2630d443bf990ec42dab7ab37cfacb163ab..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/URIFilter/MakeAbsolute.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-// does not support network paths
-
-class HTMLPurifier_URIFilter_MakeAbsolute extends HTMLPurifier_URIFilter
-{
-    public $name = 'MakeAbsolute';
-    protected $base;
-    protected $basePathStack = array();
-    public function prepare($config) {
-        $def = $config->getDefinition('URI');
-        $this->base = $def->base;
-        if (is_null($this->base)) {
-            trigger_error('URI.MakeAbsolute is being ignored due to lack of value for URI.Base configuration', E_USER_WARNING);
-            return false;
-        }
-        $this->base->fragment = null; // fragment is invalid for base URI
-        $stack = explode('/', $this->base->path);
-        array_pop($stack); // discard last segment
-        $stack = $this->_collapseStack($stack); // do pre-parsing
-        $this->basePathStack = $stack;
-        return true;
-    }
-    public function filter(&$uri, $config, $context) {
-        if (is_null($this->base)) return true; // abort early
-        if (
-            $uri->path === '' && is_null($uri->scheme) &&
-            is_null($uri->host) && is_null($uri->query) && is_null($uri->fragment)
-        ) {
-            // reference to current document
-            $uri = clone $this->base;
-            return true;
-        }
-        if (!is_null($uri->scheme)) {
-            // absolute URI already: don't change
-            if (!is_null($uri->host)) return true;
-            $scheme_obj = $uri->getSchemeObj($config, $context);
-            if (!$scheme_obj) {
-                // scheme not recognized
-                return false;
-            }
-            if (!$scheme_obj->hierarchical) {
-                // non-hierarchal URI with explicit scheme, don't change
-                return true;
-            }
-            // special case: had a scheme but always is hierarchical and had no authority
-        }
-        if (!is_null($uri->host)) {
-            // network path, don't bother
-            return true;
-        }
-        if ($uri->path === '') {
-            $uri->path = $this->base->path;
-        } elseif ($uri->path[0] !== '/') {
-            // relative path, needs more complicated processing
-            $stack = explode('/', $uri->path);
-            $new_stack = array_merge($this->basePathStack, $stack);
-            if ($new_stack[0] !== '' && !is_null($this->base->host)) {
-                array_unshift($new_stack, '');
-            }
-            $new_stack = $this->_collapseStack($new_stack);
-            $uri->path = implode('/', $new_stack);
-        } else {
-            // absolute path, but still we should collapse
-            $uri->path = implode('/', $this->_collapseStack(explode('/', $uri->path)));
-        }
-        // re-combine
-        $uri->scheme = $this->base->scheme;
-        if (is_null($uri->userinfo)) $uri->userinfo = $this->base->userinfo;
-        if (is_null($uri->host))     $uri->host     = $this->base->host;
-        if (is_null($uri->port))     $uri->port     = $this->base->port;
-        return true;
-    }
-
-    /**
-     * Resolve dots and double-dots in a path stack
-     */
-    private function _collapseStack($stack) {
-        $result = array();
-        $is_folder = false;
-        for ($i = 0; isset($stack[$i]); $i++) {
-            $is_folder = false;
-            // absorb an internally duplicated slash
-            if ($stack[$i] == '' && $i && isset($stack[$i+1])) continue;
-            if ($stack[$i] == '..') {
-                if (!empty($result)) {
-                    $segment = array_pop($result);
-                    if ($segment === '' && empty($result)) {
-                        // error case: attempted to back out too far:
-                        // restore the leading slash
-                        $result[] = '';
-                    } elseif ($segment === '..') {
-                        $result[] = '..'; // cannot remove .. with ..
-                    }
-                } else {
-                    // relative path, preserve the double-dots
-                    $result[] = '..';
-                }
-                $is_folder = true;
-                continue;
-            }
-            if ($stack[$i] == '.') {
-                // silently absorb
-                $is_folder = true;
-                continue;
-            }
-            $result[] = $stack[$i];
-        }
-        if ($is_folder) $result[] = '';
-        return $result;
-    }
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/URIFilter/Munge.php b/lib/php/HTMLPurifier/URIFilter/Munge.php
deleted file mode 100644
index efa10a6458ae6e1b171f4a94baeda41488f85a8e..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/URIFilter/Munge.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-class HTMLPurifier_URIFilter_Munge extends HTMLPurifier_URIFilter
-{
-    public $name = 'Munge';
-    public $post = true;
-    private $target, $parser, $doEmbed, $secretKey;
-
-    protected $replace = array();
-
-    public function prepare($config) {
-        $this->target    = $config->get('URI.' . $this->name);
-        $this->parser    = new HTMLPurifier_URIParser();
-        $this->doEmbed   = $config->get('URI.MungeResources');
-        $this->secretKey = $config->get('URI.MungeSecretKey');
-        return true;
-    }
-    public function filter(&$uri, $config, $context) {
-        if ($context->get('EmbeddedURI', true) && !$this->doEmbed) return true;
-
-        $scheme_obj = $uri->getSchemeObj($config, $context);
-        if (!$scheme_obj) return true; // ignore unknown schemes, maybe another postfilter did it
-        if (is_null($uri->host) || empty($scheme_obj->browsable)) {
-            return true;
-        }
-        // don't redirect if target host is our host
-        if ($uri->host === $config->getDefinition('URI')->host) {
-            return true;
-        }
-
-        $this->makeReplace($uri, $config, $context);
-        $this->replace = array_map('rawurlencode', $this->replace);
-
-        $new_uri = strtr($this->target, $this->replace);
-        $new_uri = $this->parser->parse($new_uri);
-        // don't redirect if the target host is the same as the
-        // starting host
-        if ($uri->host === $new_uri->host) return true;
-        $uri = $new_uri; // overwrite
-        return true;
-    }
-
-    protected function makeReplace($uri, $config, $context) {
-        $string = $uri->toString();
-        // always available
-        $this->replace['%s'] = $string;
-        $this->replace['%r'] = $context->get('EmbeddedURI', true);
-        $token = $context->get('CurrentToken', true);
-        $this->replace['%n'] = $token ? $token->name : null;
-        $this->replace['%m'] = $context->get('CurrentAttr', true);
-        $this->replace['%p'] = $context->get('CurrentCSSProperty', true);
-        // not always available
-        if ($this->secretKey) $this->replace['%t'] = sha1($this->secretKey . ':' . $string);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/URIParser.php b/lib/php/HTMLPurifier/URIParser.php
deleted file mode 100644
index 7179e4ab8991077aa2ff4b3a4fca0a4eafd416e0..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/URIParser.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * Parses a URI into the components and fragment identifier as specified
- * by RFC 3986.
- */
-class HTMLPurifier_URIParser
-{
-
-    /**
-     * Instance of HTMLPurifier_PercentEncoder to do normalization with.
-     */
-    protected $percentEncoder;
-
-    public function __construct() {
-        $this->percentEncoder = new HTMLPurifier_PercentEncoder();
-    }
-
-    /**
-     * Parses a URI.
-     * @param $uri string URI to parse
-     * @return HTMLPurifier_URI representation of URI. This representation has
-     *         not been validated yet and may not conform to RFC.
-     */
-    public function parse($uri) {
-
-        $uri = $this->percentEncoder->normalize($uri);
-
-        // Regexp is as per Appendix B.
-        // Note that ["<>] are an addition to the RFC's recommended
-        // characters, because they represent external delimeters.
-        $r_URI = '!'.
-            '(([^:/?#"<>]+):)?'. // 2. Scheme
-            '(//([^/?#"<>]*))?'. // 4. Authority
-            '([^?#"<>]*)'.       // 5. Path
-            '(\?([^#"<>]*))?'.   // 7. Query
-            '(#([^"<>]*))?'.     // 8. Fragment
-            '!';
-
-        $matches = array();
-        $result = preg_match($r_URI, $uri, $matches);
-
-        if (!$result) return false; // *really* invalid URI
-
-        // seperate out parts
-        $scheme     = !empty($matches[1]) ? $matches[2] : null;
-        $authority  = !empty($matches[3]) ? $matches[4] : null;
-        $path       = $matches[5]; // always present, can be empty
-        $query      = !empty($matches[6]) ? $matches[7] : null;
-        $fragment   = !empty($matches[8]) ? $matches[9] : null;
-
-        // further parse authority
-        if ($authority !== null) {
-            $r_authority = "/^((.+?)@)?(\[[^\]]+\]|[^:]*)(:(\d*))?/";
-            $matches = array();
-            preg_match($r_authority, $authority, $matches);
-            $userinfo   = !empty($matches[1]) ? $matches[2] : null;
-            $host       = !empty($matches[3]) ? $matches[3] : '';
-            $port       = !empty($matches[4]) ? (int) $matches[5] : null;
-        } else {
-            $port = $host = $userinfo = null;
-        }
-
-        return new HTMLPurifier_URI(
-            $scheme, $userinfo, $host, $port, $path, $query, $fragment);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/URIScheme.php b/lib/php/HTMLPurifier/URIScheme.php
deleted file mode 100644
index 039710fd1586bf525394d06b8d2b4fe1863ac191..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/URIScheme.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Validator for the components of a URI for a specific scheme
- */
-class HTMLPurifier_URIScheme
-{
-
-    /**
-     * Scheme's default port (integer)
-     */
-    public $default_port = null;
-
-    /**
-     * Whether or not URIs of this schem are locatable by a browser
-     * http and ftp are accessible, while mailto and news are not.
-     */
-    public $browsable = false;
-
-    /**
-     * Whether or not the URI always uses <hier_part>, resolves edge cases
-     * with making relative URIs absolute
-     */
-    public $hierarchical = false;
-
-    /**
-     * Validates the components of a URI
-     * @note This implementation should be called by children if they define
-     *       a default port, as it does port processing.
-     * @param $uri Instance of HTMLPurifier_URI
-     * @param $config HTMLPurifier_Config object
-     * @param $context HTMLPurifier_Context object
-     * @return Bool success or failure
-     */
-    public function validate(&$uri, $config, $context) {
-        if ($this->default_port == $uri->port) $uri->port = null;
-        return true;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/URIScheme/ftp.php b/lib/php/HTMLPurifier/URIScheme/ftp.php
deleted file mode 100644
index 5849bf7ff056b4e99fd8b90cfc8566c364dde8f7..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/URIScheme/ftp.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Validates ftp (File Transfer Protocol) URIs as defined by generic RFC 1738.
- */
-class HTMLPurifier_URIScheme_ftp extends HTMLPurifier_URIScheme {
-
-    public $default_port = 21;
-    public $browsable = true; // usually
-    public $hierarchical = true;
-
-    public function validate(&$uri, $config, $context) {
-        parent::validate($uri, $config, $context);
-        $uri->query    = null;
-
-        // typecode check
-        $semicolon_pos = strrpos($uri->path, ';'); // reverse
-        if ($semicolon_pos !== false) {
-            $type = substr($uri->path, $semicolon_pos + 1); // no semicolon
-            $uri->path = substr($uri->path, 0, $semicolon_pos);
-            $type_ret = '';
-            if (strpos($type, '=') !== false) {
-                // figure out whether or not the declaration is correct
-                list($key, $typecode) = explode('=', $type, 2);
-                if ($key !== 'type') {
-                    // invalid key, tack it back on encoded
-                    $uri->path .= '%3B' . $type;
-                } elseif ($typecode === 'a' || $typecode === 'i' || $typecode === 'd') {
-                    $type_ret = ";type=$typecode";
-                }
-            } else {
-                $uri->path .= '%3B' . $type;
-            }
-            $uri->path = str_replace(';', '%3B', $uri->path);
-            $uri->path .= $type_ret;
-        }
-
-        return true;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/URIScheme/http.php b/lib/php/HTMLPurifier/URIScheme/http.php
deleted file mode 100644
index b097a31d6a329a54645a82cd97600c80961bc442..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/URIScheme/http.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * Validates http (HyperText Transfer Protocol) as defined by RFC 2616
- */
-class HTMLPurifier_URIScheme_http extends HTMLPurifier_URIScheme {
-
-    public $default_port = 80;
-    public $browsable = true;
-    public $hierarchical = true;
-
-    public function validate(&$uri, $config, $context) {
-        parent::validate($uri, $config, $context);
-        $uri->userinfo = null;
-        return true;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/URIScheme/https.php b/lib/php/HTMLPurifier/URIScheme/https.php
deleted file mode 100644
index 29e380919f0d746e2e7d41c27002f2582b9a4826..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/URIScheme/https.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Validates https (Secure HTTP) according to http scheme.
- */
-class HTMLPurifier_URIScheme_https extends HTMLPurifier_URIScheme_http {
-
-    public $default_port = 443;
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/URIScheme/mailto.php b/lib/php/HTMLPurifier/URIScheme/mailto.php
deleted file mode 100644
index c1e2cd5aae16eb3a37619b139c19246539c602c4..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/URIScheme/mailto.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-// VERY RELAXED! Shouldn't cause problems, not even Firefox checks if the
-// email is valid, but be careful!
-
-/**
- * Validates mailto (for E-mail) according to RFC 2368
- * @todo Validate the email address
- * @todo Filter allowed query parameters
- */
-
-class HTMLPurifier_URIScheme_mailto extends HTMLPurifier_URIScheme {
-
-    public $browsable = false;
-
-    public function validate(&$uri, $config, $context) {
-        parent::validate($uri, $config, $context);
-        $uri->userinfo = null;
-        $uri->host     = null;
-        $uri->port     = null;
-        // we need to validate path against RFC 2368's addr-spec
-        return true;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/URIScheme/news.php b/lib/php/HTMLPurifier/URIScheme/news.php
deleted file mode 100644
index f5f54f4f56ffad336482d1cbf1b8151f3fff69b4..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/URIScheme/news.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Validates news (Usenet) as defined by generic RFC 1738
- */
-class HTMLPurifier_URIScheme_news extends HTMLPurifier_URIScheme {
-
-    public $browsable = false;
-
-    public function validate(&$uri, $config, $context) {
-        parent::validate($uri, $config, $context);
-        $uri->userinfo = null;
-        $uri->host     = null;
-        $uri->port     = null;
-        $uri->query    = null;
-        // typecode check needed on path
-        return true;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/URIScheme/nntp.php b/lib/php/HTMLPurifier/URIScheme/nntp.php
deleted file mode 100644
index 5bf93ea7849c2dc3709df9f5eada4e0dc42ffa24..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/URIScheme/nntp.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * Validates nntp (Network News Transfer Protocol) as defined by generic RFC 1738
- */
-class HTMLPurifier_URIScheme_nntp extends HTMLPurifier_URIScheme {
-
-    public $default_port = 119;
-    public $browsable = false;
-
-    public function validate(&$uri, $config, $context) {
-        parent::validate($uri, $config, $context);
-        $uri->userinfo = null;
-        $uri->query    = null;
-        return true;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/URISchemeRegistry.php b/lib/php/HTMLPurifier/URISchemeRegistry.php
deleted file mode 100644
index 576bf7b6d1a44b86e64f78d6169c0764e0f1d0c5..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/URISchemeRegistry.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * Registry for retrieving specific URI scheme validator objects.
- */
-class HTMLPurifier_URISchemeRegistry
-{
-
-    /**
-     * Retrieve sole instance of the registry.
-     * @param $prototype Optional prototype to overload sole instance with,
-     *                   or bool true to reset to default registry.
-     * @note Pass a registry object $prototype with a compatible interface and
-     *       the function will copy it and return it all further times.
-     */
-    public static function instance($prototype = null) {
-        static $instance = null;
-        if ($prototype !== null) {
-            $instance = $prototype;
-        } elseif ($instance === null || $prototype == true) {
-            $instance = new HTMLPurifier_URISchemeRegistry();
-        }
-        return $instance;
-    }
-
-    /**
-     * Cache of retrieved schemes.
-     */
-    protected $schemes = array();
-
-    /**
-     * Retrieves a scheme validator object
-     * @param $scheme String scheme name like http or mailto
-     * @param $config HTMLPurifier_Config object
-     * @param $config HTMLPurifier_Context object
-     */
-    public function getScheme($scheme, $config, $context) {
-        if (!$config) $config = HTMLPurifier_Config::createDefault();
-
-        // important, otherwise attacker could include arbitrary file
-        $allowed_schemes = $config->get('URI.AllowedSchemes');
-        if (!$config->get('URI.OverrideAllowedSchemes') &&
-            !isset($allowed_schemes[$scheme])
-        ) {
-            return;
-        }
-
-        if (isset($this->schemes[$scheme])) return $this->schemes[$scheme];
-        if (!isset($allowed_schemes[$scheme])) return;
-
-        $class = 'HTMLPurifier_URIScheme_' . $scheme;
-        if (!class_exists($class)) return;
-        $this->schemes[$scheme] = new $class();
-        return $this->schemes[$scheme];
-    }
-
-    /**
-     * Registers a custom scheme to the cache, bypassing reflection.
-     * @param $scheme Scheme name
-     * @param $scheme_obj HTMLPurifier_URIScheme object
-     */
-    public function register($scheme, $scheme_obj) {
-        $this->schemes[$scheme] = $scheme_obj;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/UnitConverter.php b/lib/php/HTMLPurifier/UnitConverter.php
deleted file mode 100644
index 545d426220665b2c661d9068db1930e0eeac2ff0..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/UnitConverter.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-
-/**
- * Class for converting between different unit-lengths as specified by
- * CSS.
- */
-class HTMLPurifier_UnitConverter
-{
-
-    const ENGLISH = 1;
-    const METRIC = 2;
-    const DIGITAL = 3;
-
-    /**
-     * Units information array. Units are grouped into measuring systems
-     * (English, Metric), and are assigned an integer representing
-     * the conversion factor between that unit and the smallest unit in
-     * the system. Numeric indexes are actually magical constants that
-     * encode conversion data from one system to the next, with a O(n^2)
-     * constraint on memory (this is generally not a problem, since
-     * the number of measuring systems is small.)
-     */
-    protected static $units = array(
-        self::ENGLISH => array(
-            'px' => 3, // This is as per CSS 2.1 and Firefox. Your mileage may vary
-            'pt' => 4,
-            'pc' => 48,
-            'in' => 288,
-            self::METRIC => array('pt', '0.352777778', 'mm'),
-        ),
-        self::METRIC => array(
-            'mm' => 1,
-            'cm' => 10,
-            self::ENGLISH => array('mm', '2.83464567', 'pt'),
-        ),
-    );
-
-    /**
-     * Minimum bcmath precision for output.
-     */
-    protected $outputPrecision;
-
-    /**
-     * Bcmath precision for internal calculations.
-     */
-    protected $internalPrecision;
-
-    /**
-     * Whether or not BCMath is available
-     */
-    private $bcmath;
-
-    public function __construct($output_precision = 4, $internal_precision = 10, $force_no_bcmath = false) {
-        $this->outputPrecision = $output_precision;
-        $this->internalPrecision = $internal_precision;
-        $this->bcmath = !$force_no_bcmath && function_exists('bcmul');
-    }
-
-    /**
-     * Converts a length object of one unit into another unit.
-     * @param HTMLPurifier_Length $length
-     *      Instance of HTMLPurifier_Length to convert. You must validate()
-     *      it before passing it here!
-     * @param string $to_unit
-     *      Unit to convert to.
-     * @note
-     *      About precision: This conversion function pays very special
-     *      attention to the incoming precision of values and attempts
-     *      to maintain a number of significant figure. Results are
-     *      fairly accurate up to nine digits. Some caveats:
-     *          - If a number is zero-padded as a result of this significant
-     *            figure tracking, the zeroes will be eliminated.
-     *          - If a number contains less than four sigfigs ($outputPrecision)
-     *            and this causes some decimals to be excluded, those
-     *            decimals will be added on.
-     */
-    public function convert($length, $to_unit) {
-
-        if (!$length->isValid()) return false;
-
-        $n    = $length->getN();
-        $unit = $length->getUnit();
-
-        if ($n === '0' || $unit === false) {
-            return new HTMLPurifier_Length('0', false);
-        }
-
-        $state = $dest_state = false;
-        foreach (self::$units as $k => $x) {
-            if (isset($x[$unit])) $state = $k;
-            if (isset($x[$to_unit])) $dest_state = $k;
-        }
-        if (!$state || !$dest_state) return false;
-
-        // Some calculations about the initial precision of the number;
-        // this will be useful when we need to do final rounding.
-        $sigfigs = $this->getSigFigs($n);
-        if ($sigfigs < $this->outputPrecision) $sigfigs = $this->outputPrecision;
-
-        // BCMath's internal precision deals only with decimals. Use
-        // our default if the initial number has no decimals, or increase
-        // it by how ever many decimals, thus, the number of guard digits
-        // will always be greater than or equal to internalPrecision.
-        $log = (int) floor(log(abs($n), 10));
-        $cp = ($log < 0) ? $this->internalPrecision - $log : $this->internalPrecision; // internal precision
-
-        for ($i = 0; $i < 2; $i++) {
-
-            // Determine what unit IN THIS SYSTEM we need to convert to
-            if ($dest_state === $state) {
-                // Simple conversion
-                $dest_unit = $to_unit;
-            } else {
-                // Convert to the smallest unit, pending a system shift
-                $dest_unit = self::$units[$state][$dest_state][0];
-            }
-
-            // Do the conversion if necessary
-            if ($dest_unit !== $unit) {
-                $factor = $this->div(self::$units[$state][$unit], self::$units[$state][$dest_unit], $cp);
-                $n = $this->mul($n, $factor, $cp);
-                $unit = $dest_unit;
-            }
-
-            // Output was zero, so bail out early. Shouldn't ever happen.
-            if ($n === '') {
-                $n = '0';
-                $unit = $to_unit;
-                break;
-            }
-
-            // It was a simple conversion, so bail out
-            if ($dest_state === $state) {
-                break;
-            }
-
-            if ($i !== 0) {
-                // Conversion failed! Apparently, the system we forwarded
-                // to didn't have this unit. This should never happen!
-                return false;
-            }
-
-            // Pre-condition: $i == 0
-
-            // Perform conversion to next system of units
-            $n = $this->mul($n, self::$units[$state][$dest_state][1], $cp);
-            $unit = self::$units[$state][$dest_state][2];
-            $state = $dest_state;
-
-            // One more loop around to convert the unit in the new system.
-
-        }
-
-        // Post-condition: $unit == $to_unit
-        if ($unit !== $to_unit) return false;
-
-        // Useful for debugging:
-        //echo "<pre>n";
-        //echo "$n\nsigfigs = $sigfigs\nnew_log = $new_log\nlog = $log\nrp = $rp\n</pre>\n";
-
-        $n = $this->round($n, $sigfigs);
-        if (strpos($n, '.') !== false) $n = rtrim($n, '0');
-        $n = rtrim($n, '.');
-
-        return new HTMLPurifier_Length($n, $unit);
-    }
-
-    /**
-     * Returns the number of significant figures in a string number.
-     * @param string $n Decimal number
-     * @return int number of sigfigs
-     */
-    public function getSigFigs($n) {
-        $n = ltrim($n, '0+-');
-        $dp = strpos($n, '.'); // decimal position
-        if ($dp === false) {
-            $sigfigs = strlen(rtrim($n, '0'));
-        } else {
-            $sigfigs = strlen(ltrim($n, '0.')); // eliminate extra decimal character
-            if ($dp !== 0) $sigfigs--;
-        }
-        return $sigfigs;
-    }
-
-    /**
-     * Adds two numbers, using arbitrary precision when available.
-     */
-    private function add($s1, $s2, $scale) {
-        if ($this->bcmath) return bcadd($s1, $s2, $scale);
-        else return $this->scale($s1 + $s2, $scale);
-    }
-
-    /**
-     * Multiples two numbers, using arbitrary precision when available.
-     */
-    private function mul($s1, $s2, $scale) {
-        if ($this->bcmath) return bcmul($s1, $s2, $scale);
-        else return $this->scale($s1 * $s2, $scale);
-    }
-
-    /**
-     * Divides two numbers, using arbitrary precision when available.
-     */
-    private function div($s1, $s2, $scale) {
-        if ($this->bcmath) return bcdiv($s1, $s2, $scale);
-        else return $this->scale($s1 / $s2, $scale);
-    }
-
-    /**
-     * Rounds a number according to the number of sigfigs it should have,
-     * using arbitrary precision when available.
-     */
-    private function round($n, $sigfigs) {
-        $new_log = (int) floor(log(abs($n), 10)); // Number of digits left of decimal - 1
-        $rp = $sigfigs - $new_log - 1; // Number of decimal places needed
-        $neg = $n < 0 ? '-' : ''; // Negative sign
-        if ($this->bcmath) {
-            if ($rp >= 0) {
-                $n = bcadd($n, $neg . '0.' .  str_repeat('0', $rp) . '5', $rp + 1);
-                $n = bcdiv($n, '1', $rp);
-            } else {
-                // This algorithm partially depends on the standardized
-                // form of numbers that comes out of bcmath.
-                $n = bcadd($n, $neg . '5' . str_repeat('0', $new_log - $sigfigs), 0);
-                $n = substr($n, 0, $sigfigs + strlen($neg)) . str_repeat('0', $new_log - $sigfigs + 1);
-            }
-            return $n;
-        } else {
-            return $this->scale(round($n, $sigfigs - $new_log - 1), $rp + 1);
-        }
-    }
-
-    /**
-     * Scales a float to $scale digits right of decimal point, like BCMath.
-     */
-    private function scale($r, $scale) {
-        if ($scale < 0) {
-            // The f sprintf type doesn't support negative numbers, so we
-            // need to cludge things manually. First get the string.
-            $r = sprintf('%.0f', (float) $r);
-            // Due to floating point precision loss, $r will more than likely
-            // look something like 4652999999999.9234. We grab one more digit
-            // than we need to precise from $r and then use that to round
-            // appropriately.
-            $precise = (string) round(substr($r, 0, strlen($r) + $scale), -1);
-            // Now we return it, truncating the zero that was rounded off.
-            return substr($precise, 0, -1) . str_repeat('0', -$scale + 1);
-        }
-        return sprintf('%.' . $scale . 'f', (float) $r);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/VarParser.php b/lib/php/HTMLPurifier/VarParser.php
deleted file mode 100644
index 68e72ae86959619de36bc15d6875e7aaefd57dee..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/VarParser.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-/**
- * Parses string representations into their corresponding native PHP
- * variable type. The base implementation does a simple type-check.
- */
-class HTMLPurifier_VarParser
-{
-
-    const STRING    = 1;
-    const ISTRING   = 2;
-    const TEXT      = 3;
-    const ITEXT     = 4;
-    const INT       = 5;
-    const FLOAT     = 6;
-    const BOOL      = 7;
-    const LOOKUP    = 8;
-    const ALIST     = 9;
-    const HASH      = 10;
-    const MIXED     = 11;
-
-    /**
-     * Lookup table of allowed types. Mainly for backwards compatibility, but
-     * also convenient for transforming string type names to the integer constants.
-     */
-    static public $types = array(
-        'string'    => self::STRING,
-        'istring'   => self::ISTRING,
-        'text'      => self::TEXT,
-        'itext'     => self::ITEXT,
-        'int'       => self::INT,
-        'float'     => self::FLOAT,
-        'bool'      => self::BOOL,
-        'lookup'    => self::LOOKUP,
-        'list'      => self::ALIST,
-        'hash'      => self::HASH,
-        'mixed'     => self::MIXED
-    );
-
-    /**
-     * Lookup table of types that are string, and can have aliases or
-     * allowed value lists.
-     */
-    static public $stringTypes = array(
-        self::STRING    => true,
-        self::ISTRING   => true,
-        self::TEXT      => true,
-        self::ITEXT     => true,
-    );
-
-    /**
-     * Validate a variable according to type. Throws
-     * HTMLPurifier_VarParserException if invalid.
-     * It may return NULL as a valid type if $allow_null is true.
-     *
-     * @param $var Variable to validate
-     * @param $type Type of variable, see HTMLPurifier_VarParser->types
-     * @param $allow_null Whether or not to permit null as a value
-     * @return Validated and type-coerced variable
-     */
-    final public function parse($var, $type, $allow_null = false) {
-        if (is_string($type)) {
-            if (!isset(HTMLPurifier_VarParser::$types[$type])) {
-                throw new HTMLPurifier_VarParserException("Invalid type '$type'");
-            } else {
-                $type = HTMLPurifier_VarParser::$types[$type];
-            }
-        }
-        $var = $this->parseImplementation($var, $type, $allow_null);
-        if ($allow_null && $var === null) return null;
-        // These are basic checks, to make sure nothing horribly wrong
-        // happened in our implementations.
-        switch ($type) {
-            case (self::STRING):
-            case (self::ISTRING):
-            case (self::TEXT):
-            case (self::ITEXT):
-                if (!is_string($var)) break;
-                if ($type == self::ISTRING || $type == self::ITEXT) $var = strtolower($var);
-                return $var;
-            case (self::INT):
-                if (!is_int($var)) break;
-                return $var;
-            case (self::FLOAT):
-                if (!is_float($var)) break;
-                return $var;
-            case (self::BOOL):
-                if (!is_bool($var)) break;
-                return $var;
-            case (self::LOOKUP):
-            case (self::ALIST):
-            case (self::HASH):
-                if (!is_array($var)) break;
-                if ($type === self::LOOKUP) {
-                    foreach ($var as $k) if ($k !== true) $this->error('Lookup table contains value other than true');
-                } elseif ($type === self::ALIST) {
-                    $keys = array_keys($var);
-                    if (array_keys($keys) !== $keys) $this->error('Indices for list are not uniform');
-                }
-                return $var;
-            case (self::MIXED):
-                return $var;
-            default:
-                $this->errorInconsistent(get_class($this), $type);
-        }
-        $this->errorGeneric($var, $type);
-    }
-
-    /**
-     * Actually implements the parsing. Base implementation is to not
-     * do anything to $var. Subclasses should overload this!
-     */
-    protected function parseImplementation($var, $type, $allow_null) {
-        return $var;
-    }
-
-    /**
-     * Throws an exception.
-     */
-    protected function error($msg) {
-        throw new HTMLPurifier_VarParserException($msg);
-    }
-
-    /**
-     * Throws an inconsistency exception.
-     * @note This should not ever be called. It would be called if we
-     *       extend the allowed values of HTMLPurifier_VarParser without
-     *       updating subclasses.
-     */
-    protected function errorInconsistent($class, $type) {
-        throw new HTMLPurifier_Exception("Inconsistency in $class: ".HTMLPurifier_VarParser::getTypeName($type)." not implemented");
-    }
-
-    /**
-     * Generic error for if a type didn't work.
-     */
-    protected function errorGeneric($var, $type) {
-        $vtype = gettype($var);
-        $this->error("Expected type ".HTMLPurifier_VarParser::getTypeName($type).", got $vtype");
-    }
-
-    static public function getTypeName($type) {
-        static $lookup;
-        if (!$lookup) {
-            // Lazy load the alternative lookup table
-            $lookup = array_flip(HTMLPurifier_VarParser::$types);
-        }
-        if (!isset($lookup[$type])) return 'unknown';
-        return $lookup[$type];
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/VarParser/Flexible.php b/lib/php/HTMLPurifier/VarParser/Flexible.php
deleted file mode 100644
index c954250e9f001f7be6079b80aa472e0e6c759168..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/VarParser/Flexible.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * Performs safe variable parsing based on types which can be used by
- * users. This may not be able to represent all possible data inputs,
- * however.
- */
-class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser
-{
-
-    protected function parseImplementation($var, $type, $allow_null) {
-        if ($allow_null && $var === null) return null;
-        switch ($type) {
-            // Note: if code "breaks" from the switch, it triggers a generic
-            // exception to be thrown. Specific errors can be specifically
-            // done here.
-            case self::MIXED :
-            case self::ISTRING :
-            case self::STRING :
-            case self::TEXT :
-            case self::ITEXT :
-                return $var;
-            case self::INT :
-                if (is_string($var) && ctype_digit($var)) $var = (int) $var;
-                return $var;
-            case self::FLOAT :
-                if ((is_string($var) && is_numeric($var)) || is_int($var)) $var = (float) $var;
-                return $var;
-            case self::BOOL :
-                if (is_int($var) && ($var === 0 || $var === 1)) {
-                    $var = (bool) $var;
-                } elseif (is_string($var)) {
-                    if ($var == 'on' || $var == 'true' || $var == '1') {
-                        $var = true;
-                    } elseif ($var == 'off' || $var == 'false' || $var == '0') {
-                        $var = false;
-                    } else {
-                        throw new HTMLPurifier_VarParserException("Unrecognized value '$var' for $type");
-                    }
-                }
-                return $var;
-            case self::ALIST :
-            case self::HASH :
-            case self::LOOKUP :
-                if (is_string($var)) {
-                    // special case: technically, this is an array with
-                    // a single empty string item, but having an empty
-                    // array is more intuitive
-                    if ($var == '') return array();
-                    if (strpos($var, "\n") === false && strpos($var, "\r") === false) {
-                        // simplistic string to array method that only works
-                        // for simple lists of tag names or alphanumeric characters
-                        $var = explode(',',$var);
-                    } else {
-                        $var = preg_split('/(,|[\n\r]+)/', $var);
-                    }
-                    // remove spaces
-                    foreach ($var as $i => $j) $var[$i] = trim($j);
-                    if ($type === self::HASH) {
-                        // key:value,key2:value2
-                        $nvar = array();
-                        foreach ($var as $keypair) {
-                            $c = explode(':', $keypair, 2);
-                            if (!isset($c[1])) continue;
-                            $nvar[$c[0]] = $c[1];
-                        }
-                        $var = $nvar;
-                    }
-                }
-                if (!is_array($var)) break;
-                $keys = array_keys($var);
-                if ($keys === array_keys($keys)) {
-                    if ($type == self::ALIST) return $var;
-                    elseif ($type == self::LOOKUP) {
-                        $new = array();
-                        foreach ($var as $key) {
-                            $new[$key] = true;
-                        }
-                        return $new;
-                    } else break;
-                }
-                if ($type === self::LOOKUP) {
-                    foreach ($var as $key => $value) {
-                        $var[$key] = true;
-                    }
-                }
-                return $var;
-            default:
-                $this->errorInconsistent(__CLASS__, $type);
-        }
-        $this->errorGeneric($var, $type);
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/VarParser/Native.php b/lib/php/HTMLPurifier/VarParser/Native.php
deleted file mode 100644
index b02a6de54ca269f744ab60a9d6ba1374894a9d43..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/VarParser/Native.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * This variable parser uses PHP's internal code engine. Because it does
- * this, it can represent all inputs; however, it is dangerous and cannot
- * be used by users.
- */
-class HTMLPurifier_VarParser_Native extends HTMLPurifier_VarParser
-{
-
-    protected function parseImplementation($var, $type, $allow_null) {
-        return $this->evalExpression($var);
-    }
-
-    protected function evalExpression($expr) {
-        $var = null;
-        $result = eval("\$var = $expr;");
-        if ($result === false) {
-            throw new HTMLPurifier_VarParserException("Fatal error in evaluated code");
-        }
-        return $var;
-    }
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/VarParserException.php b/lib/php/HTMLPurifier/VarParserException.php
deleted file mode 100644
index 5df3414959b9e8d231315269301317b38acb6eb0..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/VarParserException.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * Exception type for HTMLPurifier_VarParser
- */
-class HTMLPurifier_VarParserException extends HTMLPurifier_Exception
-{
-
-}
-
-// vim: et sw=4 sts=4
diff --git a/lib/php/HTMLPurifier/tags b/lib/php/HTMLPurifier/tags
deleted file mode 100644
index 189f18b2499333004aec30c039c086d612f6b297..0000000000000000000000000000000000000000
--- a/lib/php/HTMLPurifier/tags
+++ /dev/null
@@ -1,2972 +0,0 @@
-!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
-!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
-!_TAG_PROGRAM_AUTHOR	Darren Hiebert	/dhiebert@users.sourceforge.net/
-!_TAG_PROGRAM_NAME	Exuberant Ctags	//
-!_TAG_PROGRAM_URL	http://ctags.sourceforge.net	/official site/
-!_TAG_PROGRAM_VERSION	5.7	//
-CDATACallback	Lexer.php	/^    protected static function CDATACallback($matches) {$/;"	f
-EOF	Lexer/PH5P.php	/^    private function EOF() {$/;"	f
-HTML5	Lexer/PH5P.php	/^class HTML5 {$/;"	c
-HTML5TreeConstructer	Lexer/PH5P.php	/^class HTML5TreeConstructer {$/;"	c
-HTMLPURIFIER_PREFIX	Bootstrap.php	/^    define('HTMLPURIFIER_PREFIX', realpath(dirname(__FILE__) . '\/..'));$/;"	d
-HTMLPurifier_AttrCollections	AttrCollections.php	/^class HTMLPurifier_AttrCollections$/;"	c
-HTMLPurifier_AttrDef	AttrDef.php	/^abstract class HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_CSS	AttrDef/CSS.php	/^class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_CSS_AlphaValue	AttrDef/CSS/AlphaValue.php	/^class HTMLPurifier_AttrDef_CSS_AlphaValue extends HTMLPurifier_AttrDef_CSS_Number$/;"	c
-HTMLPurifier_AttrDef_CSS_Background	AttrDef/CSS/Background.php	/^class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_CSS_BackgroundPosition	AttrDef/CSS/BackgroundPosition.php	/^class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_CSS_Border	AttrDef/CSS/Border.php	/^class HTMLPurifier_AttrDef_CSS_Border extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_CSS_Color	AttrDef/CSS/Color.php	/^class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_CSS_Composite	AttrDef/CSS/Composite.php	/^class HTMLPurifier_AttrDef_CSS_Composite extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_CSS_DenyElementDecorator	AttrDef/CSS/DenyElementDecorator.php	/^class HTMLPurifier_AttrDef_CSS_DenyElementDecorator extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_CSS_Filter	AttrDef/CSS/Filter.php	/^class HTMLPurifier_AttrDef_CSS_Filter extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_CSS_Font	AttrDef/CSS/Font.php	/^class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_CSS_FontFamily	AttrDef/CSS/FontFamily.php	/^class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_CSS_ImportantDecorator	AttrDef/CSS/ImportantDecorator.php	/^class HTMLPurifier_AttrDef_CSS_ImportantDecorator extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_CSS_Length	AttrDef/CSS/Length.php	/^class HTMLPurifier_AttrDef_CSS_Length extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_CSS_ListStyle	AttrDef/CSS/ListStyle.php	/^class HTMLPurifier_AttrDef_CSS_ListStyle extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_CSS_Multiple	AttrDef/CSS/Multiple.php	/^class HTMLPurifier_AttrDef_CSS_Multiple extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_CSS_Number	AttrDef/CSS/Number.php	/^class HTMLPurifier_AttrDef_CSS_Number extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_CSS_Percentage	AttrDef/CSS/Percentage.php	/^class HTMLPurifier_AttrDef_CSS_Percentage extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_CSS_TextDecoration	AttrDef/CSS/TextDecoration.php	/^class HTMLPurifier_AttrDef_CSS_TextDecoration extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_CSS_URI	AttrDef/CSS/URI.php	/^class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI$/;"	c
-HTMLPurifier_AttrDef_Enum	AttrDef/Enum.php	/^class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_HTML_Bool	AttrDef/HTML/Bool.php	/^class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_HTML_Class	AttrDef/HTML/Class.php	/^class HTMLPurifier_AttrDef_HTML_Class extends HTMLPurifier_AttrDef_HTML_Nmtokens$/;"	c
-HTMLPurifier_AttrDef_HTML_Color	AttrDef/HTML/Color.php	/^class HTMLPurifier_AttrDef_HTML_Color extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_HTML_FrameTarget	AttrDef/HTML/FrameTarget.php	/^class HTMLPurifier_AttrDef_HTML_FrameTarget extends HTMLPurifier_AttrDef_Enum$/;"	c
-HTMLPurifier_AttrDef_HTML_ID	AttrDef/HTML/ID.php	/^class HTMLPurifier_AttrDef_HTML_ID extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_HTML_Length	AttrDef/HTML/Length.php	/^class HTMLPurifier_AttrDef_HTML_Length extends HTMLPurifier_AttrDef_HTML_Pixels$/;"	c
-HTMLPurifier_AttrDef_HTML_LinkTypes	AttrDef/HTML/LinkTypes.php	/^class HTMLPurifier_AttrDef_HTML_LinkTypes extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_HTML_MultiLength	AttrDef/HTML/MultiLength.php	/^class HTMLPurifier_AttrDef_HTML_MultiLength extends HTMLPurifier_AttrDef_HTML_Length$/;"	c
-HTMLPurifier_AttrDef_HTML_Nmtokens	AttrDef/HTML/Nmtokens.php	/^class HTMLPurifier_AttrDef_HTML_Nmtokens extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_HTML_Pixels	AttrDef/HTML/Pixels.php	/^class HTMLPurifier_AttrDef_HTML_Pixels extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_Integer	AttrDef/Integer.php	/^class HTMLPurifier_AttrDef_Integer extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_Lang	AttrDef/Lang.php	/^class HTMLPurifier_AttrDef_Lang extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_Switch	AttrDef/Switch.php	/^class HTMLPurifier_AttrDef_Switch$/;"	c
-HTMLPurifier_AttrDef_Text	AttrDef/Text.php	/^class HTMLPurifier_AttrDef_Text extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_URI	AttrDef/URI.php	/^class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_URI_Email	AttrDef/URI/Email.php	/^abstract class HTMLPurifier_AttrDef_URI_Email extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_URI_Email_SimpleCheck	AttrDef/URI/Email/SimpleCheck.php	/^class HTMLPurifier_AttrDef_URI_Email_SimpleCheck extends HTMLPurifier_AttrDef_URI_Email$/;"	c
-HTMLPurifier_AttrDef_URI_Host	AttrDef/URI/Host.php	/^class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_URI_IPv4	AttrDef/URI/IPv4.php	/^class HTMLPurifier_AttrDef_URI_IPv4 extends HTMLPurifier_AttrDef$/;"	c
-HTMLPurifier_AttrDef_URI_IPv6	AttrDef/URI/IPv6.php	/^class HTMLPurifier_AttrDef_URI_IPv6 extends HTMLPurifier_AttrDef_URI_IPv4$/;"	c
-HTMLPurifier_AttrTransform	AttrTransform.php	/^abstract class HTMLPurifier_AttrTransform$/;"	c
-HTMLPurifier_AttrTransform_Background	AttrTransform/Background.php	/^class HTMLPurifier_AttrTransform_Background extends HTMLPurifier_AttrTransform {$/;"	c
-HTMLPurifier_AttrTransform_BdoDir	AttrTransform/BdoDir.php	/^class HTMLPurifier_AttrTransform_BdoDir extends HTMLPurifier_AttrTransform$/;"	c
-HTMLPurifier_AttrTransform_BgColor	AttrTransform/BgColor.php	/^class HTMLPurifier_AttrTransform_BgColor extends HTMLPurifier_AttrTransform {$/;"	c
-HTMLPurifier_AttrTransform_BoolToCSS	AttrTransform/BoolToCSS.php	/^class HTMLPurifier_AttrTransform_BoolToCSS extends HTMLPurifier_AttrTransform {$/;"	c
-HTMLPurifier_AttrTransform_Border	AttrTransform/Border.php	/^class HTMLPurifier_AttrTransform_Border extends HTMLPurifier_AttrTransform {$/;"	c
-HTMLPurifier_AttrTransform_EnumToCSS	AttrTransform/EnumToCSS.php	/^class HTMLPurifier_AttrTransform_EnumToCSS extends HTMLPurifier_AttrTransform {$/;"	c
-HTMLPurifier_AttrTransform_ImgRequired	AttrTransform/ImgRequired.php	/^class HTMLPurifier_AttrTransform_ImgRequired extends HTMLPurifier_AttrTransform$/;"	c
-HTMLPurifier_AttrTransform_ImgSpace	AttrTransform/ImgSpace.php	/^class HTMLPurifier_AttrTransform_ImgSpace extends HTMLPurifier_AttrTransform {$/;"	c
-HTMLPurifier_AttrTransform_Input	AttrTransform/Input.php	/^class HTMLPurifier_AttrTransform_Input extends HTMLPurifier_AttrTransform {$/;"	c
-HTMLPurifier_AttrTransform_Lang	AttrTransform/Lang.php	/^class HTMLPurifier_AttrTransform_Lang extends HTMLPurifier_AttrTransform$/;"	c
-HTMLPurifier_AttrTransform_Length	AttrTransform/Length.php	/^class HTMLPurifier_AttrTransform_Length extends HTMLPurifier_AttrTransform$/;"	c
-HTMLPurifier_AttrTransform_Name	AttrTransform/Name.php	/^class HTMLPurifier_AttrTransform_Name extends HTMLPurifier_AttrTransform$/;"	c
-HTMLPurifier_AttrTransform_NameSync	AttrTransform/NameSync.php	/^class HTMLPurifier_AttrTransform_NameSync extends HTMLPurifier_AttrTransform$/;"	c
-HTMLPurifier_AttrTransform_SafeEmbed	AttrTransform/SafeEmbed.php	/^class HTMLPurifier_AttrTransform_SafeEmbed extends HTMLPurifier_AttrTransform$/;"	c
-HTMLPurifier_AttrTransform_SafeObject	AttrTransform/SafeObject.php	/^class HTMLPurifier_AttrTransform_SafeObject extends HTMLPurifier_AttrTransform$/;"	c
-HTMLPurifier_AttrTransform_SafeParam	AttrTransform/SafeParam.php	/^class HTMLPurifier_AttrTransform_SafeParam extends HTMLPurifier_AttrTransform$/;"	c
-HTMLPurifier_AttrTransform_ScriptRequired	AttrTransform/ScriptRequired.php	/^class HTMLPurifier_AttrTransform_ScriptRequired extends HTMLPurifier_AttrTransform$/;"	c
-HTMLPurifier_AttrTransform_Textarea	AttrTransform/Textarea.php	/^class HTMLPurifier_AttrTransform_Textarea extends HTMLPurifier_AttrTransform$/;"	c
-HTMLPurifier_AttrTypes	AttrTypes.php	/^class HTMLPurifier_AttrTypes$/;"	c
-HTMLPurifier_AttrValidator	AttrValidator.php	/^class HTMLPurifier_AttrValidator$/;"	c
-HTMLPurifier_Bootstrap	Bootstrap.php	/^class HTMLPurifier_Bootstrap$/;"	c
-HTMLPurifier_CSSDefinition	CSSDefinition.php	/^class HTMLPurifier_CSSDefinition extends HTMLPurifier_Definition$/;"	c
-HTMLPurifier_ChildDef	ChildDef.php	/^abstract class HTMLPurifier_ChildDef$/;"	c
-HTMLPurifier_ChildDef_Chameleon	ChildDef/Chameleon.php	/^class HTMLPurifier_ChildDef_Chameleon extends HTMLPurifier_ChildDef$/;"	c
-HTMLPurifier_ChildDef_Custom	ChildDef/Custom.php	/^class HTMLPurifier_ChildDef_Custom extends HTMLPurifier_ChildDef$/;"	c
-HTMLPurifier_ChildDef_Empty	ChildDef/Empty.php	/^class HTMLPurifier_ChildDef_Empty extends HTMLPurifier_ChildDef$/;"	c
-HTMLPurifier_ChildDef_Optional	ChildDef/Optional.php	/^class HTMLPurifier_ChildDef_Optional extends HTMLPurifier_ChildDef_Required$/;"	c
-HTMLPurifier_ChildDef_Required	ChildDef/Required.php	/^class HTMLPurifier_ChildDef_Required extends HTMLPurifier_ChildDef$/;"	c
-HTMLPurifier_ChildDef_StrictBlockquote	ChildDef/StrictBlockquote.php	/^class HTMLPurifier_ChildDef_StrictBlockquote extends HTMLPurifier_ChildDef_Required$/;"	c
-HTMLPurifier_ChildDef_Table	ChildDef/Table.php	/^class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef$/;"	c
-HTMLPurifier_Config	Config.php	/^class HTMLPurifier_Config$/;"	c
-HTMLPurifier_ConfigSchema	ConfigSchema.php	/^class HTMLPurifier_ConfigSchema {$/;"	c
-HTMLPurifier_ConfigSchema_Builder_ConfigSchema	ConfigSchema/Builder/ConfigSchema.php	/^class HTMLPurifier_ConfigSchema_Builder_ConfigSchema$/;"	c
-HTMLPurifier_ConfigSchema_Builder_Xml	ConfigSchema/Builder/Xml.php	/^class HTMLPurifier_ConfigSchema_Builder_Xml extends XMLWriter$/;"	c
-HTMLPurifier_ConfigSchema_Exception	ConfigSchema/Exception.php	/^class HTMLPurifier_ConfigSchema_Exception extends HTMLPurifier_Exception$/;"	c
-HTMLPurifier_ConfigSchema_Interchange	ConfigSchema/Interchange.php	/^class HTMLPurifier_ConfigSchema_Interchange$/;"	c
-HTMLPurifier_ConfigSchema_InterchangeBuilder	ConfigSchema/InterchangeBuilder.php	/^class HTMLPurifier_ConfigSchema_InterchangeBuilder$/;"	c
-HTMLPurifier_ConfigSchema_Interchange_Directive	ConfigSchema/Interchange/Directive.php	/^class HTMLPurifier_ConfigSchema_Interchange_Directive$/;"	c
-HTMLPurifier_ConfigSchema_Interchange_Id	ConfigSchema/Interchange/Id.php	/^class HTMLPurifier_ConfigSchema_Interchange_Id$/;"	c
-HTMLPurifier_ConfigSchema_Validator	ConfigSchema/Validator.php	/^class HTMLPurifier_ConfigSchema_Validator$/;"	c
-HTMLPurifier_ConfigSchema_ValidatorAtom	ConfigSchema/ValidatorAtom.php	/^class HTMLPurifier_ConfigSchema_ValidatorAtom$/;"	c
-HTMLPurifier_ContentSets	ContentSets.php	/^class HTMLPurifier_ContentSets$/;"	c
-HTMLPurifier_Context	Context.php	/^class HTMLPurifier_Context$/;"	c
-HTMLPurifier_Definition	Definition.php	/^abstract class HTMLPurifier_Definition$/;"	c
-HTMLPurifier_DefinitionCache	DefinitionCache.php	/^abstract class HTMLPurifier_DefinitionCache$/;"	c
-HTMLPurifier_DefinitionCacheFactory	DefinitionCacheFactory.php	/^class HTMLPurifier_DefinitionCacheFactory$/;"	c
-HTMLPurifier_DefinitionCache_Decorator	DefinitionCache/Decorator.php	/^class HTMLPurifier_DefinitionCache_Decorator extends HTMLPurifier_DefinitionCache$/;"	c
-HTMLPurifier_DefinitionCache_Decorator_Cleanup	DefinitionCache/Decorator/Cleanup.php	/^class HTMLPurifier_DefinitionCache_Decorator_Cleanup extends$/;"	c
-HTMLPurifier_DefinitionCache_Decorator_Memory	DefinitionCache/Decorator/Memory.php	/^class HTMLPurifier_DefinitionCache_Decorator_Memory extends$/;"	c
-HTMLPurifier_DefinitionCache_Null	DefinitionCache/Null.php	/^class HTMLPurifier_DefinitionCache_Null extends HTMLPurifier_DefinitionCache$/;"	c
-HTMLPurifier_DefinitionCache_Serializer	DefinitionCache/Serializer.php	/^class HTMLPurifier_DefinitionCache_Serializer extends$/;"	c
-HTMLPurifier_Doctype	Doctype.php	/^class HTMLPurifier_Doctype$/;"	c
-HTMLPurifier_DoctypeRegistry	DoctypeRegistry.php	/^class HTMLPurifier_DoctypeRegistry$/;"	c
-HTMLPurifier_ElementDef	ElementDef.php	/^class HTMLPurifier_ElementDef$/;"	c
-HTMLPurifier_Encoder	Encoder.php	/^class HTMLPurifier_Encoder$/;"	c
-HTMLPurifier_EntityLookup	EntityLookup.php	/^class HTMLPurifier_EntityLookup {$/;"	c
-HTMLPurifier_EntityParser	EntityParser.php	/^class HTMLPurifier_EntityParser$/;"	c
-HTMLPurifier_ErrorCollector	ErrorCollector.php	/^class HTMLPurifier_ErrorCollector$/;"	c
-HTMLPurifier_ErrorStruct	ErrorStruct.php	/^class HTMLPurifier_ErrorStruct$/;"	c
-HTMLPurifier_Exception	Exception.php	/^class HTMLPurifier_Exception extends Exception$/;"	c
-HTMLPurifier_Filter	Filter.php	/^class HTMLPurifier_Filter$/;"	c
-HTMLPurifier_Filter_ExtractStyleBlocks	Filter/ExtractStyleBlocks.php	/^class HTMLPurifier_Filter_ExtractStyleBlocks extends HTMLPurifier_Filter$/;"	c
-HTMLPurifier_Filter_YouTube	Filter/YouTube.php	/^class HTMLPurifier_Filter_YouTube extends HTMLPurifier_Filter$/;"	c
-HTMLPurifier_Generator	Generator.php	/^class HTMLPurifier_Generator$/;"	c
-HTMLPurifier_HTMLDefinition	HTMLDefinition.php	/^class HTMLPurifier_HTMLDefinition extends HTMLPurifier_Definition$/;"	c
-HTMLPurifier_HTMLModule	HTMLModule.php	/^class HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModuleManager	HTMLModuleManager.php	/^class HTMLPurifier_HTMLModuleManager$/;"	c
-HTMLPurifier_HTMLModule_Bdo	HTMLModule/Bdo.php	/^class HTMLPurifier_HTMLModule_Bdo extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_CommonAttributes	HTMLModule/CommonAttributes.php	/^class HTMLPurifier_HTMLModule_CommonAttributes extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_Edit	HTMLModule/Edit.php	/^class HTMLPurifier_HTMLModule_Edit extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_Forms	HTMLModule/Forms.php	/^class HTMLPurifier_HTMLModule_Forms extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_Hypertext	HTMLModule/Hypertext.php	/^class HTMLPurifier_HTMLModule_Hypertext extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_Image	HTMLModule/Image.php	/^class HTMLPurifier_HTMLModule_Image extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_Legacy	HTMLModule/Legacy.php	/^class HTMLPurifier_HTMLModule_Legacy extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_List	HTMLModule/List.php	/^class HTMLPurifier_HTMLModule_List extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_Name	HTMLModule/Name.php	/^class HTMLPurifier_HTMLModule_Name extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_NonXMLCommonAttributes	HTMLModule/NonXMLCommonAttributes.php	/^class HTMLPurifier_HTMLModule_NonXMLCommonAttributes extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_Object	HTMLModule/Object.php	/^class HTMLPurifier_HTMLModule_Object extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_Presentation	HTMLModule/Presentation.php	/^class HTMLPurifier_HTMLModule_Presentation extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_Proprietary	HTMLModule/Proprietary.php	/^class HTMLPurifier_HTMLModule_Proprietary extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_Ruby	HTMLModule/Ruby.php	/^class HTMLPurifier_HTMLModule_Ruby extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_SafeEmbed	HTMLModule/SafeEmbed.php	/^class HTMLPurifier_HTMLModule_SafeEmbed extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_SafeObject	HTMLModule/SafeObject.php	/^class HTMLPurifier_HTMLModule_SafeObject extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_Scripting	HTMLModule/Scripting.php	/^class HTMLPurifier_HTMLModule_Scripting extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_StyleAttribute	HTMLModule/StyleAttribute.php	/^class HTMLPurifier_HTMLModule_StyleAttribute extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_Tables	HTMLModule/Tables.php	/^class HTMLPurifier_HTMLModule_Tables extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_Target	HTMLModule/Target.php	/^class HTMLPurifier_HTMLModule_Target extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_Text	HTMLModule/Text.php	/^class HTMLPurifier_HTMLModule_Text extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_Tidy	HTMLModule/Tidy.php	/^class HTMLPurifier_HTMLModule_Tidy extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_HTMLModule_Tidy_Name	HTMLModule/Tidy/Name.php	/^class HTMLPurifier_HTMLModule_Tidy_Name extends HTMLPurifier_HTMLModule_Tidy$/;"	c
-HTMLPurifier_HTMLModule_Tidy_Proprietary	HTMLModule/Tidy/Proprietary.php	/^class HTMLPurifier_HTMLModule_Tidy_Proprietary extends HTMLPurifier_HTMLModule_Tidy$/;"	c
-HTMLPurifier_HTMLModule_Tidy_Strict	HTMLModule/Tidy/Strict.php	/^class HTMLPurifier_HTMLModule_Tidy_Strict extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4$/;"	c
-HTMLPurifier_HTMLModule_Tidy_Transitional	HTMLModule/Tidy/Transitional.php	/^class HTMLPurifier_HTMLModule_Tidy_Transitional extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4$/;"	c
-HTMLPurifier_HTMLModule_Tidy_XHTML	HTMLModule/Tidy/XHTML.php	/^class HTMLPurifier_HTMLModule_Tidy_XHTML extends HTMLPurifier_HTMLModule_Tidy$/;"	c
-HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4	HTMLModule/Tidy/XHTMLAndHTML4.php	/^class HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4 extends HTMLPurifier_HTMLModule_Tidy$/;"	c
-HTMLPurifier_HTMLModule_XMLCommonAttributes	HTMLModule/XMLCommonAttributes.php	/^class HTMLPurifier_HTMLModule_XMLCommonAttributes extends HTMLPurifier_HTMLModule$/;"	c
-HTMLPurifier_IDAccumulator	IDAccumulator.php	/^class HTMLPurifier_IDAccumulator$/;"	c
-HTMLPurifier_Injector	Injector.php	/^abstract class HTMLPurifier_Injector$/;"	c
-HTMLPurifier_Injector_AutoParagraph	Injector/AutoParagraph.php	/^class HTMLPurifier_Injector_AutoParagraph extends HTMLPurifier_Injector$/;"	c
-HTMLPurifier_Injector_DisplayLinkURI	Injector/DisplayLinkURI.php	/^class HTMLPurifier_Injector_DisplayLinkURI extends HTMLPurifier_Injector$/;"	c
-HTMLPurifier_Injector_Linkify	Injector/Linkify.php	/^class HTMLPurifier_Injector_Linkify extends HTMLPurifier_Injector$/;"	c
-HTMLPurifier_Injector_PurifierLinkify	Injector/PurifierLinkify.php	/^class HTMLPurifier_Injector_PurifierLinkify extends HTMLPurifier_Injector$/;"	c
-HTMLPurifier_Injector_RemoveEmpty	Injector/RemoveEmpty.php	/^class HTMLPurifier_Injector_RemoveEmpty extends HTMLPurifier_Injector$/;"	c
-HTMLPurifier_Injector_SafeObject	Injector/SafeObject.php	/^class HTMLPurifier_Injector_SafeObject extends HTMLPurifier_Injector$/;"	c
-HTMLPurifier_Language	Language.php	/^class HTMLPurifier_Language$/;"	c
-HTMLPurifier_LanguageFactory	LanguageFactory.php	/^class HTMLPurifier_LanguageFactory$/;"	c
-HTMLPurifier_Language_en_x_test	Language/classes/en-x-test.php	/^class HTMLPurifier_Language_en_x_test extends HTMLPurifier_Language$/;"	c
-HTMLPurifier_Length	Length.php	/^class HTMLPurifier_Length$/;"	c
-HTMLPurifier_Lexer	Lexer.php	/^class HTMLPurifier_Lexer$/;"	c
-HTMLPurifier_Lexer_DOMLex	Lexer/DOMLex.php	/^class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer$/;"	c
-HTMLPurifier_Lexer_DirectLex	Lexer/DirectLex.php	/^class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer$/;"	c
-HTMLPurifier_Lexer_PEARSax3	Lexer/PEARSax3.php	/^class HTMLPurifier_Lexer_PEARSax3 extends HTMLPurifier_Lexer$/;"	c
-HTMLPurifier_Lexer_PH5P	Lexer/PH5P.php	/^class HTMLPurifier_Lexer_PH5P extends HTMLPurifier_Lexer_DOMLex {$/;"	c
-HTMLPurifier_PercentEncoder	PercentEncoder.php	/^class HTMLPurifier_PercentEncoder$/;"	c
-HTMLPurifier_Printer	Printer.php	/^class HTMLPurifier_Printer$/;"	c
-HTMLPurifier_Printer_CSSDefinition	Printer/CSSDefinition.php	/^class HTMLPurifier_Printer_CSSDefinition extends HTMLPurifier_Printer$/;"	c
-HTMLPurifier_Printer_ConfigForm	Printer/ConfigForm.php	/^class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer$/;"	c
-HTMLPurifier_Printer_ConfigForm_NullDecorator	Printer/ConfigForm.php	/^class HTMLPurifier_Printer_ConfigForm_NullDecorator extends HTMLPurifier_Printer {$/;"	c
-HTMLPurifier_Printer_ConfigForm_bool	Printer/ConfigForm.php	/^class HTMLPurifier_Printer_ConfigForm_bool extends HTMLPurifier_Printer {$/;"	c
-HTMLPurifier_Printer_ConfigForm_default	Printer/ConfigForm.php	/^class HTMLPurifier_Printer_ConfigForm_default extends HTMLPurifier_Printer {$/;"	c
-HTMLPurifier_Printer_HTMLDefinition	Printer/HTMLDefinition.php	/^class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer$/;"	c
-HTMLPurifier_PropertyList	PropertyList.php	/^class HTMLPurifier_PropertyList$/;"	c
-HTMLPurifier_PropertyListIterator	PropertyListIterator.php	/^class HTMLPurifier_PropertyListIterator extends FilterIterator$/;"	c
-HTMLPurifier_Strategy	Strategy.php	/^abstract class HTMLPurifier_Strategy$/;"	c
-HTMLPurifier_Strategy_Composite	Strategy/Composite.php	/^abstract class HTMLPurifier_Strategy_Composite extends HTMLPurifier_Strategy$/;"	c
-HTMLPurifier_Strategy_Core	Strategy/Core.php	/^class HTMLPurifier_Strategy_Core extends HTMLPurifier_Strategy_Composite$/;"	c
-HTMLPurifier_Strategy_FixNesting	Strategy/FixNesting.php	/^class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy$/;"	c
-HTMLPurifier_Strategy_MakeWellFormed	Strategy/MakeWellFormed.php	/^class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy$/;"	c
-HTMLPurifier_Strategy_RemoveForeignElements	Strategy/RemoveForeignElements.php	/^class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy$/;"	c
-HTMLPurifier_Strategy_ValidateAttributes	Strategy/ValidateAttributes.php	/^class HTMLPurifier_Strategy_ValidateAttributes extends HTMLPurifier_Strategy$/;"	c
-HTMLPurifier_StringHash	StringHash.php	/^class HTMLPurifier_StringHash extends ArrayObject$/;"	c
-HTMLPurifier_StringHashParser	StringHashParser.php	/^class HTMLPurifier_StringHashParser$/;"	c
-HTMLPurifier_TagTransform	TagTransform.php	/^abstract class HTMLPurifier_TagTransform$/;"	c
-HTMLPurifier_TagTransform_Font	TagTransform/Font.php	/^class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform$/;"	c
-HTMLPurifier_TagTransform_Simple	TagTransform/Simple.php	/^class HTMLPurifier_TagTransform_Simple extends HTMLPurifier_TagTransform$/;"	c
-HTMLPurifier_Token	Token.php	/^class HTMLPurifier_Token {$/;"	c
-HTMLPurifier_TokenFactory	TokenFactory.php	/^class HTMLPurifier_TokenFactory$/;"	c
-HTMLPurifier_Token_Comment	Token/Comment.php	/^class HTMLPurifier_Token_Comment extends HTMLPurifier_Token$/;"	c
-HTMLPurifier_Token_Empty	Token/Empty.php	/^class HTMLPurifier_Token_Empty extends HTMLPurifier_Token_Tag$/;"	c
-HTMLPurifier_Token_End	Token/End.php	/^class HTMLPurifier_Token_End extends HTMLPurifier_Token_Tag$/;"	c
-HTMLPurifier_Token_Start	Token/Start.php	/^class HTMLPurifier_Token_Start extends HTMLPurifier_Token_Tag$/;"	c
-HTMLPurifier_Token_Tag	Token/Tag.php	/^class HTMLPurifier_Token_Tag extends HTMLPurifier_Token$/;"	c
-HTMLPurifier_Token_Text	Token/Text.php	/^class HTMLPurifier_Token_Text extends HTMLPurifier_Token$/;"	c
-HTMLPurifier_URI	URI.php	/^class HTMLPurifier_URI$/;"	c
-HTMLPurifier_URIDefinition	URIDefinition.php	/^class HTMLPurifier_URIDefinition extends HTMLPurifier_Definition$/;"	c
-HTMLPurifier_URIFilter	URIFilter.php	/^abstract class HTMLPurifier_URIFilter$/;"	c
-HTMLPurifier_URIFilter_DisableExternal	URIFilter/DisableExternal.php	/^class HTMLPurifier_URIFilter_DisableExternal extends HTMLPurifier_URIFilter$/;"	c
-HTMLPurifier_URIFilter_DisableExternalResources	URIFilter/DisableExternalResources.php	/^class HTMLPurifier_URIFilter_DisableExternalResources extends HTMLPurifier_URIFilter_DisableExternal$/;"	c
-HTMLPurifier_URIFilter_HostBlacklist	URIFilter/HostBlacklist.php	/^class HTMLPurifier_URIFilter_HostBlacklist extends HTMLPurifier_URIFilter$/;"	c
-HTMLPurifier_URIFilter_MakeAbsolute	URIFilter/MakeAbsolute.php	/^class HTMLPurifier_URIFilter_MakeAbsolute extends HTMLPurifier_URIFilter$/;"	c
-HTMLPurifier_URIFilter_Munge	URIFilter/Munge.php	/^class HTMLPurifier_URIFilter_Munge extends HTMLPurifier_URIFilter$/;"	c
-HTMLPurifier_URIParser	URIParser.php	/^class HTMLPurifier_URIParser$/;"	c
-HTMLPurifier_URIScheme	URIScheme.php	/^class HTMLPurifier_URIScheme$/;"	c
-HTMLPurifier_URISchemeRegistry	URISchemeRegistry.php	/^class HTMLPurifier_URISchemeRegistry$/;"	c
-HTMLPurifier_URIScheme_ftp	URIScheme/ftp.php	/^class HTMLPurifier_URIScheme_ftp extends HTMLPurifier_URIScheme {$/;"	c
-HTMLPurifier_URIScheme_http	URIScheme/http.php	/^class HTMLPurifier_URIScheme_http extends HTMLPurifier_URIScheme {$/;"	c
-HTMLPurifier_URIScheme_https	URIScheme/https.php	/^class HTMLPurifier_URIScheme_https extends HTMLPurifier_URIScheme_http {$/;"	c
-HTMLPurifier_URIScheme_mailto	URIScheme/mailto.php	/^class HTMLPurifier_URIScheme_mailto extends HTMLPurifier_URIScheme {$/;"	c
-HTMLPurifier_URIScheme_news	URIScheme/news.php	/^class HTMLPurifier_URIScheme_news extends HTMLPurifier_URIScheme {$/;"	c
-HTMLPurifier_URIScheme_nntp	URIScheme/nntp.php	/^class HTMLPurifier_URIScheme_nntp extends HTMLPurifier_URIScheme {$/;"	c
-HTMLPurifier_UnitConverter	UnitConverter.php	/^class HTMLPurifier_UnitConverter$/;"	c
-HTMLPurifier_VarParser	VarParser.php	/^class HTMLPurifier_VarParser$/;"	c
-HTMLPurifier_VarParserException	VarParserException.php	/^class HTMLPurifier_VarParserException extends HTMLPurifier_Exception$/;"	c
-HTMLPurifier_VarParser_Flexible	VarParser/Flexible.php	/^class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser$/;"	c
-HTMLPurifier_VarParser_Native	VarParser/Native.php	/^class HTMLPurifier_VarParser_Native extends HTMLPurifier_VarParser$/;"	c
-PHP_EOL	Bootstrap.php	/^            define('PHP_EOL', "\\n");$/;"	d
-PHP_EOL	Bootstrap.php	/^            define('PHP_EOL', "\\r");$/;"	d
-PHP_EOL	Bootstrap.php	/^            define('PHP_EOL', "\\r\\n");$/;"	d
-__construct	AttrCollections.php	/^    public function __construct($attr_types, $modules) {$/;"	f
-__construct	AttrDef/CSS/AlphaValue.php	/^    public function __construct() {$/;"	f
-__construct	AttrDef/CSS/Background.php	/^    public function __construct($config) {$/;"	f
-__construct	AttrDef/CSS/BackgroundPosition.php	/^    public function __construct() {$/;"	f
-__construct	AttrDef/CSS/Border.php	/^    public function __construct($config) {$/;"	f
-__construct	AttrDef/CSS/Composite.php	/^    public function __construct($defs) {$/;"	f
-__construct	AttrDef/CSS/DenyElementDecorator.php	/^    public function __construct($def, $element) {$/;"	f
-__construct	AttrDef/CSS/Filter.php	/^    public function __construct() {$/;"	f
-__construct	AttrDef/CSS/Font.php	/^    public function __construct($config) {$/;"	f
-__construct	AttrDef/CSS/ImportantDecorator.php	/^    public function __construct($def, $allow = false) {$/;"	f
-__construct	AttrDef/CSS/Length.php	/^    public function __construct($min = null, $max = null) {$/;"	f
-__construct	AttrDef/CSS/ListStyle.php	/^    public function __construct($config) {$/;"	f
-__construct	AttrDef/CSS/Multiple.php	/^    public function __construct($single, $max = 4) {$/;"	f
-__construct	AttrDef/CSS/Number.php	/^    public function __construct($non_negative = false) {$/;"	f
-__construct	AttrDef/CSS/Percentage.php	/^    public function __construct($non_negative = false) {$/;"	f
-__construct	AttrDef/CSS/URI.php	/^    public function __construct() {$/;"	f
-__construct	AttrDef/Enum.php	/^    public function __construct($/;"	f
-__construct	AttrDef/HTML/Bool.php	/^    public function __construct($name = false) {$this->name = $name;}$/;"	f
-__construct	AttrDef/HTML/FrameTarget.php	/^    public function __construct() {}$/;"	f
-__construct	AttrDef/HTML/LinkTypes.php	/^    public function __construct($name) {$/;"	f
-__construct	AttrDef/HTML/Pixels.php	/^    public function __construct($max = null) {$/;"	f
-__construct	AttrDef/Integer.php	/^    public function __construct($/;"	f
-__construct	AttrDef/Switch.php	/^    public function __construct($tag, $with_tag, $without_tag) {$/;"	f
-__construct	AttrDef/URI.php	/^    public function __construct($embeds_resource = false) {$/;"	f
-__construct	AttrDef/URI/Host.php	/^    public function __construct() {$/;"	f
-__construct	AttrTransform/BoolToCSS.php	/^    public function __construct($attr, $css) {$/;"	f
-__construct	AttrTransform/EnumToCSS.php	/^    public function __construct($attr, $enum_to_css, $case_sensitive = false) {$/;"	f
-__construct	AttrTransform/ImgSpace.php	/^    public function __construct($attr) {$/;"	f
-__construct	AttrTransform/Input.php	/^    public function __construct() {$/;"	f
-__construct	AttrTransform/Length.php	/^    public function __construct($name, $css_name = null) {$/;"	f
-__construct	AttrTransform/NameSync.php	/^    public function __construct() {$/;"	f
-__construct	AttrTransform/SafeParam.php	/^    public function __construct() {$/;"	f
-__construct	AttrTypes.php	/^    public function __construct() {$/;"	f
-__construct	ChildDef/Chameleon.php	/^    public function __construct($inline, $block) {$/;"	f
-__construct	ChildDef/Custom.php	/^    public function __construct($dtd_regex) {$/;"	f
-__construct	ChildDef/Empty.php	/^    public function __construct() {}$/;"	f
-__construct	ChildDef/Required.php	/^    public function __construct($elements) {$/;"	f
-__construct	ChildDef/Table.php	/^    public function __construct() {}$/;"	f
-__construct	Config.php	/^    public function __construct($definition, $parent = null) {$/;"	f
-__construct	ConfigSchema.php	/^    public function __construct() {$/;"	f
-__construct	ConfigSchema/Interchange/Id.php	/^    public function __construct($key) {$/;"	f
-__construct	ConfigSchema/InterchangeBuilder.php	/^    public function __construct($varParser = null) {$/;"	f
-__construct	ConfigSchema/Validator.php	/^    public function __construct() {$/;"	f
-__construct	ConfigSchema/ValidatorAtom.php	/^    public function __construct($context, $obj, $member) {$/;"	f
-__construct	ContentSets.php	/^    public function __construct($modules) {$/;"	f
-__construct	DefinitionCache.php	/^    public function __construct($type) {$/;"	f
-__construct	DefinitionCache/Decorator.php	/^    public function __construct() {}$/;"	f
-__construct	Doctype.php	/^    public function __construct($name = null, $xml = true, $modules = array(),$/;"	f
-__construct	Encoder.php	/^    private function __construct() {$/;"	f
-__construct	ErrorCollector.php	/^    public function __construct($context) {$/;"	f
-__construct	Filter/ExtractStyleBlocks.php	/^    public function __construct() {$/;"	f
-__construct	Generator.php	/^    public function __construct($config, $context) {$/;"	f
-__construct	HTMLDefinition.php	/^    public function __construct() {$/;"	f
-__construct	HTMLModuleManager.php	/^    public function __construct() {$/;"	f
-__construct	Language.php	/^    public function __construct($config, $context) {$/;"	f
-__construct	Length.php	/^    public function __construct($n = '0', $u = false) {$/;"	f
-__construct	Lexer.php	/^    public function __construct() {$/;"	f
-__construct	Lexer/DOMLex.php	/^    public function __construct() {$/;"	f
-__construct	Lexer/PH5P.php	/^    public function __construct($data) {$/;"	f
-__construct	Lexer/PH5P.php	/^    public function __construct() {$/;"	f
-__construct	PercentEncoder.php	/^    public function __construct($preserve = false) {$/;"	f
-__construct	Printer.php	/^    public function __construct() {$/;"	f
-__construct	Printer/ConfigForm.php	/^    public function __construct($/;"	f
-__construct	Printer/ConfigForm.php	/^    public function __construct($obj) {$/;"	f
-__construct	PropertyList.php	/^    public function __construct($parent = null) {$/;"	f
-__construct	PropertyListIterator.php	/^    public function __construct(Iterator $iterator, $filter = null) {$/;"	f
-__construct	Strategy/Composite.php	/^    abstract public function __construct();$/;"	f
-__construct	Strategy/Core.php	/^    public function __construct() {$/;"	f
-__construct	TagTransform/Simple.php	/^    public function __construct($transform_to, $style = null) {$/;"	f
-__construct	Token/Comment.php	/^    public function __construct($data, $line = null, $col = null) {$/;"	f
-__construct	Token/Tag.php	/^    public function __construct($name, $attr = array(), $line = null, $col = null) {$/;"	f
-__construct	Token/Text.php	/^    public function __construct($data, $line = null, $col = null) {$/;"	f
-__construct	TokenFactory.php	/^    public function __construct() {$/;"	f
-__construct	URI.php	/^    public function __construct($scheme, $userinfo, $host, $port, $path, $query, $fragment) {$/;"	f
-__construct	URIDefinition.php	/^    public function __construct() {$/;"	f
-__construct	URIParser.php	/^    public function __construct() {$/;"	f
-__construct	UnitConverter.php	/^    public function __construct($output_precision = 4, $internal_precision = 10, $force_no_bcmath = false) {$/;"	f
-__get	Token.php	/^    public function __get($n) {$/;"	f
-_checkNeedsP	Injector/AutoParagraph.php	/^    private function _checkNeedsP($current) {$/;"	f
-_collapseStack	URIFilter/MakeAbsolute.php	/^    private function _collapseStack($stack) {$/;"	f
-_compileRegex	ChildDef/Custom.php	/^    protected function _compileRegex() {$/;"	f
-_findUnused	ConfigSchema/InterchangeBuilder.php	/^    protected function _findUnused($hash) {$/;"	f
-_isInline	Injector/AutoParagraph.php	/^    private function _isInline($token) {$/;"	f
-_listify	Config.php	/^    private function _listify($lookup) {$/;"	f
-_loadRegex	AttrDef/URI/IPv4.php	/^    protected function _loadRegex() {$/;"	f
-_loaded	Language.php	/^    public $_loaded = false;$/;"	v
-_mergeAssocArray	ElementDef.php	/^    private function _mergeAssocArray(&$a1, $a2) {$/;"	f
-_pLookAhead	Injector/AutoParagraph.php	/^    private function _pLookAhead() {$/;"	f
-_pStart	Injector/AutoParagraph.php	/^    private function _pStart() {$/;"	f
-_prepareDir	DefinitionCache/Serializer.php	/^    private function _prepareDir($config) {$/;"	f
-_renderStruct	ErrorCollector.php	/^    private function _renderStruct(&$ret, $struct, $line = null, $col = null) {$/;"	f
-_scriptFix	Generator.php	/^    private $_scriptFix = false;$/;"	v
-_size_lookup	TagTransform/Font.php	/^    protected $_size_lookup = array($/;"	v
-_special_dec2str	EntityParser.php	/^    protected $_special_dec2str =$/;"	v
-_special_ent2dec	EntityParser.php	/^    protected $_special_ent2dec =$/;"	v
-_special_entity2str	Lexer.php	/^    protected $_special_entity2str =$/;"	v
-_splitText	Injector/AutoParagraph.php	/^    private function _splitText($data, &$result) {$/;"	f
-_stacks	ErrorCollector.php	/^    protected $_stacks = array(array());$/;"	v
-_storage	Context.php	/^    private $_storage = array();$/;"	v
-_styleMatches	Filter/ExtractStyleBlocks.php	/^    private $_styleMatches = array();$/;"	v
-_substituteEntitiesRegex	EntityParser.php	/^    protected $_substituteEntitiesRegex =$/;"	v
-_testPermissions	DefinitionCache/Serializer.php	/^    private function _testPermissions($dir) {$/;"	f
-_whitespace	Lexer/DirectLex.php	/^    protected $_whitespace = "\\x20\\x09\\x0D\\x0A";$/;"	v
-_write	DefinitionCache/Serializer.php	/^    private function _write($file, $data) {$/;"	f
-_xhtml	Generator.php	/^    private $_xhtml = true;$/;"	v
-a	AttrDef/URI/Host.php	/^        $a   = '[a-z]';     \/\/ alpha$/;"	v
-a	Config.php	/^    public function get($key, $a = null) {$/;"	v
-a	Config.php	/^    public function set($key, $value, $a = null) {$/;"	v
-a	HTMLModule/Hypertext.php	/^        $a = $this->addElement($/;"	v
-aIP	AttrDef/URI/IPv6.php	/^                        $aIP = substr($aIP, 0, 0-strlen($find[0]));$/;"	v
-aIP	AttrDef/URI/IPv6.php	/^                $aIP = $first;$/;"	v
-aIP	AttrDef/URI/IPv6.php	/^                $aIP = explode(':', $aIP[0]);$/;"	v
-aIP	AttrDef/URI/IPv6.php	/^                $aIP = substr($aIP, 0, 0-strlen($find[0]));$/;"	v
-aIP	AttrDef/URI/IPv6.php	/^        $aIP = explode('::', $aIP);$/;"	v
-a_formatting	Lexer/PH5P.php	/^    private $a_formatting  = array();$/;"	v
-a_pos	Lexer/PH5P.php	/^                                $a_pos = array_search($node, $this->a_formatting, true);$/;"	v
-accept	PropertyListIterator.php	/^    public function accept() {$/;"	f
-accepts	Token/End.php	/^ * @warning This class accepts attributes even though end tags cannot. This$/;"	c
-accessed	ConfigSchema/InterchangeBuilder.php	/^        $accessed = $hash->getAccessed();$/;"	v
-accessed	StringHash.php	/^    protected $accessed = array();$/;"	v
-activated_levels	HTMLModule/Tidy.php	/^        $activated_levels = array();$/;"	v
-add	ConfigSchema.php	/^    public function add($key, $default, $type, $allow_null) {$/;"	f
-add	ContentSets.php	/^                $add = array();$/;"	v
-add	DefinitionCache.php	/^    abstract public function add($def, $config);$/;"	f
-add	DefinitionCache/Decorator.php	/^    public function add($def, $config) {$/;"	f
-add	DefinitionCache/Decorator/Cleanup.php	/^    public function add($def, $config) {$/;"	f
-add	DefinitionCache/Decorator/Memory.php	/^    public function add($def, $config) {$/;"	f
-add	DefinitionCache/Null.php	/^    public function add($def, $config) {$/;"	f
-add	DefinitionCache/Serializer.php	/^    public function add($def, $config) {$/;"	f
-add	IDAccumulator.php	/^    public function add($id) {$/;"	f
-add	UnitConverter.php	/^    private function add($s1, $s2, $scale) {$/;"	f
-addAlias	ConfigSchema.php	/^    public function addAlias($key, $new_key) {$/;"	f
-addAllowedValues	ConfigSchema.php	/^    public function addAllowedValues($key, $allowed) {$/;"	f
-addAttribute	HTMLDefinition.php	/^    public function addAttribute($element_name, $attr_name, $def) {$/;"	f
-addBlankElement	HTMLDefinition.php	/^    public function addBlankElement($element_name) {$/;"	f
-addBlankElement	HTMLModule.php	/^    public function addBlankElement($element) {$/;"	f
-addDecorator	DefinitionCacheFactory.php	/^    public function addDecorator($decorator) {$/;"	f
-addDirective	ConfigSchema/Interchange.php	/^    public function addDirective($directive) {$/;"	f
-addElement	HTMLDefinition.php	/^    public function addElement($element_name, $type, $contents, $attr_collections, $attributes) {$/;"	f
-addElement	HTMLModule.php	/^    public function addElement($element, $type, $contents, $attr_includes = array(), $attr = array()) {$/;"	f
-addElementToContentSet	HTMLModule.php	/^    public function addElementToContentSet($element, $type) {$/;"	f
-addError	ErrorStruct.php	/^    public function addError($severity, $message) {$/;"	f
-addFilter	URIDefinition.php	/^    public function addFilter($filter, $config) {$/;"	f
-addModule	HTMLModuleManager.php	/^    public function addModule($module) {$/;"	f
-addParam	Injector/SafeObject.php	/^    protected $addParam = array($/;"	v
-addPrefix	HTMLModuleManager.php	/^    public function addPrefix($prefix) {$/;"	f
-addValueAliases	ConfigSchema.php	/^    public function addValueAliases($key, $aliases) {$/;"	f
-add_fixes	HTMLModule/Tidy.php	/^        $add_fixes    = $config->get('HTML.TidyAdd');$/;"	v
-address	HTMLModule/Legacy.php	/^        $address = $this->addBlankElement('address');$/;"	v
-af_part1	Lexer/PH5P.php	/^                        $af_part1 = array_slice($this->a_formatting, 0, $bookmark - 1);$/;"	v
-af_part2	Lexer/PH5P.php	/^                        $af_part2 = array_slice($this->a_formatting, $bookmark, count($this->a_formatting));$/;"	v
-afterAttributeNameState	Lexer/PH5P.php	/^    private function afterAttributeNameState() {$/;"	f
-afterBody	Lexer/PH5P.php	/^    private function afterBody($token) {$/;"	f
-afterDoctypeNameState	Lexer/PH5P.php	/^    private function afterDoctypeNameState() {$/;"	f
-afterFrameset	Lexer/PH5P.php	/^    private function afterFrameset($token) {$/;"	f
-afterHead	Lexer/PH5P.php	/^    private function afterHead($token) {$/;"	f
-alias	ConfigSchema.php	/^        foreach ($aliases as $alias => $real) {$/;"	v
-alias	ConfigSchema/Validator.php	/^            foreach ($d->valueAliases as $alias => $real) {$/;"	v
-alias	ConfigSchema/Validator.php	/^        foreach ($d->valueAliases as $alias => $real) {$/;"	v
-aliases	ConfigSchema/Interchange/Directive.php	/^    public $aliases = array();$/;"	v
-aliases	ConfigSchema/InterchangeBuilder.php	/^            $aliases = preg_split('\/\\s*,\\s*\/', $raw_aliases);$/;"	v
-aliases	Doctype.php	/^    public $aliases = array();$/;"	v
-aliases	DoctypeRegistry.php	/^        if (!is_array($aliases)) $aliases = array($aliases);$/;"	v
-align	HTMLModule/Legacy.php	/^        $align = 'Enum#left,right,center,justify';$/;"	v
-align_lookup	HTMLModule/Tidy/XHTMLAndHTML4.php	/^            $align_lookup = array();$/;"	v
-align_values	HTMLModule/Tidy/XHTMLAndHTML4.php	/^            $align_values = array('left', 'right', 'center', 'justify');$/;"	v
-all	Printer.php	/^        $all = $config->getAll();$/;"	v
-all	Printer/ConfigForm.php	/^        $all = array();$/;"	v
-all_whitespace	ChildDef/Required.php	/^            $all_whitespace = false; \/\/ phew, we're not talking about whitespace$/;"	v
-all_whitespace	ChildDef/Required.php	/^        $all_whitespace = true;$/;"	v
-allow	AttrDef/CSS/ImportantDecorator.php	/^    public function __construct($def, $allow = false) {$/;"	v
-allow_empty	ChildDef/Custom.php	/^    public $allow_empty = false;$/;"	v
-allow_empty	ChildDef/Empty.php	/^    public $allow_empty = true;$/;"	v
-allow_empty	ChildDef/Optional.php	/^    public $allow_empty = true;$/;"	v
-allow_empty	ChildDef/Required.php	/^    public $allow_empty = false;$/;"	v
-allow_empty	ChildDef/StrictBlockquote.php	/^    public $allow_empty = true;$/;"	v
-allow_empty	ChildDef/Table.php	/^    public $allow_empty = false;$/;"	v
-allow_important	CSSDefinition.php	/^        $allow_important = $config->get('CSS.AllowImportant');$/;"	v
-allow_null	Config.php	/^            $allow_null = isset($def->allow_null);$/;"	v
-allow_null	Config.php	/^            $allow_null = true;$/;"	v
-allow_null	Printer/ConfigForm.php	/^                    $allow_null = $def < 0;$/;"	v
-allow_null	Printer/ConfigForm.php	/^                    $allow_null = isset($def->allow_null);$/;"	v
-allow_null	VarParser.php	/^    final public function parse($var, $type, $allow_null = false) {$/;"	v
-allowed	AttrDef/HTML/Class.php	/^        $allowed = $config->get('Attr.AllowedClasses');$/;"	v
-allowed	AttrDef/HTML/LinkTypes.php	/^        $allowed = $config->get('Attr.' . $this->name);$/;"	v
-allowed	Config.php	/^             if (is_string($allowed)) $allowed = array($allowed);$/;"	v
-allowed	Config.php	/^        $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $schema);$/;"	v
-allowed	HTMLDefinition.php	/^            $allowed = $config->get('HTML.Allowed');$/;"	v
-allowed	Printer/ConfigForm.php	/^        $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $config->def);$/;"	v
-allowed	Printer/ConfigForm.php	/^    public function render($config, $allowed = true, $render_controls = true) {$/;"	v
-allowedParam	Injector/SafeObject.php	/^    protected $allowedParam = array($/;"	v
-allowedUnits	Length.php	/^    protected static $allowedUnits = array($/;"	v
-allowed_attributes	CSSDefinition.php	/^        $allowed_attributes = $config->get('CSS.AllowedProperties');$/;"	v
-allowed_attributes	HTMLDefinition.php	/^        $allowed_attributes = $config->get('HTML.AllowedAttributes'); \/\/ retrieve early$/;"	v
-allowed_attributes_mutable	HTMLDefinition.php	/^        $allowed_attributes_mutable = $allowed_attributes; \/\/ by copy!$/;"	v
-allowed_directives	Config.php	/^             $allowed_directives = array();$/;"	v
-allowed_elements	HTMLDefinition.php	/^        $allowed_elements = $config->get('HTML.AllowedElements');$/;"	v
-allowed_ns	Config.php	/^             $allowed_ns = array();$/;"	v
-allowed_schemes	URISchemeRegistry.php	/^        $allowed_schemes = $config->get('URI.AllowedSchemes');$/;"	v
-allowed_values	AttrDef/CSS/TextDecoration.php	/^        static $allowed_values = array($/;"	v
-allowsElement	Injector.php	/^    public function allowsElement($name) {$/;"	f
-also	Injector.php	/^     * the injector. This function also checks if the HTML environment$/;"	f
-alt	AttrTransform/ImgRequired.php	/^                $alt = $config->get('Attr.DefaultImageAlt');$/;"	v
-an	AttrDef/URI/Host.php	/^        $an  = '[a-z0-9]';  \/\/ alphanum$/;"	v
-and	AttrDef/URI/Host.php	/^        $and = '[a-z0-9-]'; \/\/ alphanum | "-"$/;"	v
-and	URISchemeRegistry.php	/^     * @note Pass a registry object $prototype with a compatible interface and$/;"	i
-anon	DoctypeRegistry.php	/^            $anon = new HTMLPurifier_Doctype($doctype);$/;"	v
-append	Lexer/PH5P.php	/^    private function insertElement($token, $append = true, $check = false) {$/;"	v
-appendToRealParent	Lexer/PH5P.php	/^    private function appendToRealParent($node) {$/;"	f
-args	ErrorCollector.php	/^            $args = func_get_args();$/;"	v
-args	ErrorCollector.php	/^        $args = array();$/;"	v
-args	Language.php	/^    public function formatMessage($key, $args = array()) {$/;"	v
-armor	Token.php	/^    public $armor = array();$/;"	v
-armorUrl	Filter/YouTube.php	/^    protected function armorUrl($url) {$/;"	f
-array	Config.php	/^        $array = parse_ini_file($filename, true);$/;"	v
-array	Config.php	/^        if ($index !== false) $array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();$/;"	v
-array	ContentSets.php	/^        $array = explode('|', str_replace(' ', '', $string));$/;"	v
-array	Lexer/DOMLex.php	/^        $array = array();$/;"	v
-array	Lexer/DirectLex.php	/^        $array  = array(); \/\/ return assoc array of attributes$/;"	v
-array	Lexer/DirectLex.php	/^        $array = array(); \/\/ result array$/;"	v
-array	Printer/ConfigForm.php	/^                    $array = $value;$/;"	v
-as	Lexer.php	/^     * You should be able to treat the output of this function as$/;"	f
-ascii_fix	Encoder.php	/^            $ascii_fix = HTMLPurifier_Encoder::testEncodingSupportsASCII($encoding);$/;"	v
-assertAlnum	ConfigSchema/ValidatorAtom.php	/^    public function assertAlnum() {$/;"	f
-assertIsArray	ConfigSchema/ValidatorAtom.php	/^    public function assertIsArray() {$/;"	f
-assertIsBool	ConfigSchema/ValidatorAtom.php	/^    public function assertIsBool() {$/;"	f
-assertIsLookup	ConfigSchema/ValidatorAtom.php	/^    public function assertIsLookup() {$/;"	f
-assertIsString	ConfigSchema/ValidatorAtom.php	/^    public function assertIsString() {$/;"	f
-assertNotEmpty	ConfigSchema/ValidatorAtom.php	/^    public function assertNotEmpty() {$/;"	f
-assertNotNull	ConfigSchema/ValidatorAtom.php	/^    public function assertNotNull() {$/;"	f
-associated	Language/messages/en-x-testmini.php	/^\/\/ this language file has no class associated with it$/;"	c
-at	Encoder.php	/^     * @note Based on Feyd's function at$/;"	f
-attr	AttrValidator.php	/^            $attr = $transform->transform($o = $attr, $config, $context);$/;"	v
-attr	AttrValidator.php	/^        $attr = $token->attr;$/;"	v
-attr	ElementDef.php	/^    public $attr = array();$/;"	v
-attr	ErrorCollector.php	/^        $attr  = $this->context->get('CurrentAttr', true);$/;"	v
-attr	Generator.php	/^            $attr = $this->generateAttributes($token->attr, $token->name);$/;"	v
-attr	HTMLDefinition.php	/^                $attr = false;$/;"	v
-attr	HTMLDefinition.php	/^                foreach ($info->attr as $attr => $x) {$/;"	v
-attr	HTMLDefinition.php	/^            $attr = explode('|', $attr);$/;"	v
-attr	HTMLDefinition.php	/^            $attr = substr($attr, 0, strlen($attr) - 1); \/\/ remove trailing ]$/;"	v
-attr	HTMLDefinition.php	/^            foreach ($info->attr as $attr => $x) {$/;"	v
-attr	HTMLDefinition.php	/^            foreach ($this->info_global_attr as $attr => $x) {$/;"	v
-attr	HTMLModule/Edit.php	/^        $attr = array($/;"	v
-attr	HTMLModule/Tidy.php	/^                    $attr = $params['attr'];$/;"	v
-attr	Lexer/DOMLex.php	/^        $attr = $node->hasAttributes() ?$/;"	v
-attr	Lexer/DirectLex.php	/^                    $attr = $this->parseAttributeString($/;"	v
-attr	Lexer/DirectLex.php	/^                    $attr = array();$/;"	v
-attr	Lexer/PH5P.php	/^                        $attr = $token['attr'];$/;"	v
-attr	Printer.php	/^    protected function element($tag, $contents, $attr = array(), $escape = true) {$/;"	v
-attr	Printer.php	/^    protected function elementEmpty($tag, $attr = array()) {$/;"	v
-attr	Printer.php	/^    protected function start($tag, $attr = array()) {$/;"	v
-attr	Printer/ConfigForm.php	/^                $attr = array('for' => "{$this->name}:$ns.$directive");$/;"	v
-attr	Printer/ConfigForm.php	/^                $attr = array();$/;"	v
-attr	Printer/ConfigForm.php	/^        $attr = array($/;"	v
-attr	Printer/HTMLDefinition.php	/^            $attr = array();$/;"	v
-attr	TagTransform/Font.php	/^        $attr = $tag->attr;$/;"	v
-attr	Token/Tag.php	/^    public $attr = array();$/;"	v
-attr	Token/Tag.php	/^    public function __construct($name, $attr = array(), $line = null, $col = null) {$/;"	v
-attr	TokenFactory.php	/^    public function createEmpty($name, $attr = array()) {$/;"	v
-attr	TokenFactory.php	/^    public function createStart($name, $attr = array()) {$/;"	v
-attr_collections	HTMLModule.php	/^    public $attr_collections = array();$/;"	v
-attr_collections	HTMLModule/Bdo.php	/^    public $attr_collections = array($/;"	v
-attr_collections	HTMLModule/CommonAttributes.php	/^    public $attr_collections = array($/;"	v
-attr_collections	HTMLModule/NonXMLCommonAttributes.php	/^    public $attr_collections = array($/;"	v
-attr_collections	HTMLModule/StyleAttribute.php	/^    public $attr_collections = array($/;"	v
-attr_collections	HTMLModule/XMLCommonAttributes.php	/^    public $attr_collections = array($/;"	v
-attr_i	AttrCollections.php	/^                foreach ($coll as $attr_i => $attr) {$/;"	v
-attr_includes	HTMLModule.php	/^            else $attr_includes = array($attr_includes);$/;"	v
-attr_includes	HTMLModule.php	/^            if (empty($attr_includes)) $attr_includes = array();$/;"	v
-attr_includes	HTMLModule.php	/^    public function addElement($element, $type, $contents, $attr_includes = array(), $attr = array()) {$/;"	v
-attr_key	AttrValidator.php	/^        $attr_key = false;$/;"	v
-attr_key	AttrValidator.php	/^        foreach ($attr as $attr_key => $value) {$/;"	v
-attr_name	HTMLModuleManager.php	/^        foreach ($def->attr as $attr_name => $attr_def) {$/;"	v
-attr_transform_post	ElementDef.php	/^    public $attr_transform_post = array();$/;"	v
-attr_transform_pre	ElementDef.php	/^    public $attr_transform_pre = array();$/;"	v
-attr_validator	Strategy/RemoveForeignElements.php	/^        $attr_validator = new HTMLPurifier_AttrValidator();$/;"	v
-attribute	AttrDef/HTML/Class.php	/^ * Implements special behavior for class attribute (normally NMTOKENS)$/;"	c
-attribute	HTMLDefinition.php	/^                            $attribute = htmlspecialchars($bits[1]);$/;"	v
-attribute	HTMLDefinition.php	/^                        $attribute = htmlspecialchars($bits[0]);$/;"	v
-attributeNameState	Lexer/PH5P.php	/^    private function attributeNameState() {$/;"	f
-attributeValueDoubleQuotedState	Lexer/PH5P.php	/^    private function attributeValueDoubleQuotedState() {$/;"	f
-attributeValueSingleQuotedState	Lexer/PH5P.php	/^    private function attributeValueSingleQuotedState() {$/;"	f
-attributeValueUnquotedState	Lexer/PH5P.php	/^    private function attributeValueUnquotedState() {$/;"	f
-attribute_string	Lexer/DirectLex.php	/^                $attribute_string =$/;"	v
-attributes	HTMLDefinition.php	/^        $attributes = array();$/;"	v
-authority	URI.php	/^            $authority = '';$/;"	v
-authority	URI.php	/^        $authority = null;$/;"	v
-authority	URIParser.php	/^        $authority  = !empty($matches[3]) ? $matches[4] : null;$/;"	v
-autoFinalize	Config.php	/^    public $autoFinalize = true;$/;"	v
-autoFinalize	Config.php	/^    public function autoFinalize() {$/;"	f
-autoclose	ElementDef.php	/^    public $autoclose = array();$/;"	v
-autoclose	Strategy/MakeWellFormed.php	/^                        $autoclose = !isset($elements[$token->name]);$/;"	v
-autoclose	Strategy/MakeWellFormed.php	/^                        $autoclose = false;$/;"	v
-autoload	Bootstrap.php	/^        $autoload = array('HTMLPurifier_Bootstrap', 'autoload');$/;"	v
-autoload	Bootstrap.php	/^    public static function autoload($class) {$/;"	f
-b	HTMLModule/Presentation.php	/^        $b = $this->addElement('b',      'Inline', 'Inline', 'Common');$/;"	v
-background	AttrTransform/Background.php	/^        $background = $this->confiscateAttr($attr, 'background');$/;"	v
-backtrace	Config.php	/^        $backtrace = debug_backtrace();$/;"	v
-backward	Injector.php	/^    protected function backward(&$i, &$current) {$/;"	f
-base	DefinitionCache/Serializer.php	/^            $base = $this->generateBaseDirectoryPath($config);$/;"	v
-base	DefinitionCache/Serializer.php	/^        $base = $config->get('Cache.SerializerPath');$/;"	v
-base	DefinitionCache/Serializer.php	/^        $base = $this->generateBaseDirectoryPath($config);$/;"	v
-base	DefinitionCache/Serializer.php	/^        $base = is_null($base) ? HTMLPURIFIER_PREFIX . '\/HTMLPurifier\/DefinitionCache\/Serializer' : $base;$/;"	v
-basePathStack	URIFilter/MakeAbsolute.php	/^    protected $basePathStack = array();$/;"	v
-base_uri	URIDefinition.php	/^        $base_uri = $config->get('URI.Base');$/;"	v
-based	AttrDef/URI/Email/SimpleCheck.php	/^ * Primitive email validation class based on the regexp found at$/;"	c
-batch	Config.php	/^            $batch = $this->getBatch($namespace);$/;"	v
-bdo	HTMLModule/Bdo.php	/^        $bdo = $this->addElement($/;"	v
-because	EntityParser.php	/^     * @notice We try to avoid calling this function because otherwise, it$/;"	f
-beforeAttributeNameState	Lexer/PH5P.php	/^    private function beforeAttributeNameState() {$/;"	f
-beforeAttributeValueState	Lexer/PH5P.php	/^    private function beforeAttributeValueState() {$/;"	f
-beforeDoctypeNameState	Lexer/PH5P.php	/^    private function beforeDoctypeNameState() {$/;"	f
-beforeHead	Lexer/PH5P.php	/^    private function beforeHead($token) {$/;"	f
-bgcolor	AttrTransform/BgColor.php	/^        $bgcolor = $this->confiscateAttr($attr, 'bgcolor');$/;"	v
-big	HTMLModule/Presentation.php	/^        $big = $this->addElement('big',    'Inline', 'Inline', 'Common');$/;"	v
-bits	AttrDef/CSS/Background.php	/^        $bits = explode(' ', strtolower($string)); \/\/ bits to process$/;"	v
-bits	AttrDef/CSS/BackgroundPosition.php	/^        $bits = explode(' ', $string);$/;"	v
-bits	AttrDef/CSS/Border.php	/^        $bits = explode(' ', $string);$/;"	v
-bits	AttrDef/CSS/Font.php	/^        $bits = explode(' ', $string); \/\/ bits to process$/;"	v
-bits	AttrDef/CSS/ListStyle.php	/^        $bits = explode(' ', strtolower($string)); \/\/ bits to process$/;"	v
-bits	HTMLDefinition.php	/^                $bits = preg_split('\/[.@]\/', $elattr, 2);$/;"	v
-bits	Injector/Linkify.php	/^        $bits = preg_split('#((?:https?|ftp):\/\/[^\\s\\'"<>()]+)#S', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);$/;"	v
-bits	Injector/PurifierLinkify.php	/^        $bits = preg_split('#%([a-z0-9]+\\.[a-z0-9]+)#Si', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);$/;"	v
-blacklist	URIFilter/HostBlacklist.php	/^    protected $blacklist = array();$/;"	v
-blacklisted_directives	Config.php	/^             $blacklisted_directives = array();$/;"	v
-blk	AttrDef/URI/IPv6.php	/^        $blk = '(?:' . $hex . '{1,4})';$/;"	v
-block_wrap_end	ChildDef/StrictBlockquote.php	/^        $block_wrap_end   = new HTMLPurifier_Token_End(  $def->info_block_wrapper);$/;"	v
-block_wrap_start	ChildDef/StrictBlockquote.php	/^        $block_wrap_start = new HTMLPurifier_Token_Start($def->info_block_wrapper);$/;"	v
-block_wrapper	HTMLDefinition.php	/^        $block_wrapper = $config->get('HTML.BlockWrapper');$/;"	v
-blockquote	HTMLModule/Legacy.php	/^        $blockquote = $this->addBlankElement('blockquote');$/;"	v
-bogusCommentState	Lexer/PH5P.php	/^    private function bogusCommentState() {$/;"	f
-bogusDoctypeState	Lexer/PH5P.php	/^    private function bogusDoctypeState() {$/;"	f
-bookmark	Lexer/PH5P.php	/^                                $bookmark = array_search($node, $this->a_formatting, true) + 1;$/;"	v
-bookmark	Lexer/PH5P.php	/^                        $bookmark = $fe_af_pos;$/;"	v
-border_color	CSSDefinition.php	/^        $border_color =$/;"	v
-border_style	CSSDefinition.php	/^        $border_style =$/;"	v
-border_width	AttrTransform/Border.php	/^        $border_width = $this->confiscateAttr($attr, 'border');$/;"	v
-border_width	CSSDefinition.php	/^        $border_width =$/;"	v
-br	HTMLModule/Legacy.php	/^        $br = $this->addBlankElement('br');$/;"	v
-browsable	URIScheme.php	/^    public $browsable = false;$/;"	v
-browsable	URIScheme/ftp.php	/^    public $browsable = true; \/\/ usually$/;"	v
-browsable	URIScheme/http.php	/^    public $browsable = true;$/;"	v
-browsable	URIScheme/mailto.php	/^    public $browsable = false;$/;"	v
-browsable	URIScheme/news.php	/^    public $browsable = false;$/;"	v
-browsable	URIScheme/nntp.php	/^    public $browsable = false;$/;"	v
-build	ConfigSchema/Builder/ConfigSchema.php	/^    public function build($interchange) {$/;"	f
-build	ConfigSchema/Builder/Xml.php	/^    public function build($interchange) {$/;"	f
-build	ConfigSchema/InterchangeBuilder.php	/^    public function build($interchange, $hash) {$/;"	f
-build	IDAccumulator.php	/^    public static function build($config, $context) {$/;"	f
-buildDirective	ConfigSchema/Builder/Xml.php	/^    public function buildDirective($directive) {$/;"	f
-buildDirective	ConfigSchema/InterchangeBuilder.php	/^    public function buildDirective($interchange, $hash) {$/;"	f
-buildFile	ConfigSchema/InterchangeBuilder.php	/^    public function buildFile($interchange, $file) {$/;"	f
-buildFromDirectory	ConfigSchema/InterchangeBuilder.php	/^    public static function buildFromDirectory($dir = null) {$/;"	f
-builder	ConfigSchema/InterchangeBuilder.php	/^        $builder     = new HTMLPurifier_ConfigSchema_InterchangeBuilder();$/;"	v
-button	HTMLModule/Forms.php	/^        $button = $this->addElement('button', 'Formctrl', 'Optional: #PCDATA | Heading | List | Block | Inline', 'Common', array($/;"	v
-bypass	Encoder.php	/^    public static function testEncodingSupportsASCII($encoding, $bypass = false) {$/;"	v
-bytesleft	Encoder.php	/^                $bytesleft = 0;$/;"	v
-bytesleft	Encoder.php	/^                $bytesleft = 1;$/;"	v
-bytesleft	Encoder.php	/^                $bytesleft = 2;$/;"	v
-bytesleft	Encoder.php	/^                $bytesleft = 3;$/;"	v
-bytesleft	Encoder.php	/^        $bytesleft = 0;$/;"	v
-bytevalue	Encoder.php	/^            $bytevalue = ord( $str[$i] );$/;"	v
-c	AttrDef/CSS/FontFamily.php	/^                for ($i = 0, $c = strlen($font); $i < $c; $i++) {$/;"	v
-c	AttrDef/CSS/Length.php	/^            $c = $length->compareTo($this->max);$/;"	v
-c	AttrDef/CSS/Length.php	/^            $c = $length->compareTo($this->min);$/;"	v
-c	AttrDef/URI/IPv6.php	/^        $c = count($aIP);$/;"	v
-c	Encoder.php	/^            $c = chr($i); \/\/ UTF-8 char$/;"	v
-c	HTMLDefinition.php	/^                $c = count($bits);$/;"	v
-c	HTMLModule/Tidy.php	/^        for ($i = 1, $c = count($this->levels); $i < $c; $i++) {$/;"	v
-c	Injector/AutoParagraph.php	/^        $c = count($raw_paragraphs);$/;"	v
-c	Injector/Linkify.php	/^        \/\/ $c = count$/;"	v
-c	Injector/Linkify.php	/^        for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {$/;"	v
-c	Injector/PurifierLinkify.php	/^        \/\/ $c = count$/;"	v
-c	Injector/PurifierLinkify.php	/^        for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {$/;"	v
-c	Injector/RemoveEmpty.php	/^        for ($i = $this->inputIndex + 1, $c = count($this->inputTokens); $i < $c; $i++) {$/;"	v
-c	Language.php	/^        for ($i = 0, $c = count($array); $i < $c; $i++) {$/;"	v
-c	PercentEncoder.php	/^            for ($i = 0, $c = strlen($preserve); $i < $c; $i++) {$/;"	v
-c	PercentEncoder.php	/^        for ($i = 0, $c = strlen($string); $i < $c; $i++) {$/;"	v
-c	Strategy/MakeWellFormed.php	/^            $c = count($skipped_tags);$/;"	v
-c	Token.php	/^    public function position($l = null, $c = null) {$/;"	v
-c	URI.php	/^            $c = strpos($this->path, '\/');$/;"	v
-c	VarParser/Flexible.php	/^                            $c = explode(':', $keypair, 2);$/;"	v
-cache	Config.php	/^        $cache = $factory->create($type, $this);$/;"	v
-cache	DefinitionCacheFactory.php	/^            $cache = $new_cache;$/;"	v
-cache	DefinitionCacheFactory.php	/^            $cache = new $class($type);$/;"	v
-cache	DefinitionCacheFactory.php	/^            $cache = new HTMLPurifier_DefinitionCache_Serializer($type);$/;"	v
-cache	LanguageFactory.php	/^            $cache = array();$/;"	v
-cache	LanguageFactory.php	/^            $cache = compact($this->keys);$/;"	v
-caches	DefinitionCacheFactory.php	/^    protected $caches = array('Serializer' => array());$/;"	v
-call	Token/Tag.php	/^     * without having to use a function call <tt>is_a()<\/tt>.$/;"	f
-callbackArmorCommentEntities	Lexer/DOMLex.php	/^    public function callbackArmorCommentEntities($matches) {$/;"	f
-callbackUndoCommentSubst	Lexer/DOMLex.php	/^    public function callbackUndoCommentSubst($matches) {$/;"	f
-calls	DefinitionCache.php	/^        return $config->version . ',' . \/\/ possibly replace with function calls$/;"	f
-can	AttrDef/CSS/Multiple.php	/^ * lengths to be specified.  This class can take a vanilla border-width$/;"	c
-caption	ChildDef/Table.php	/^                            $caption = $collection;$/;"	v
-caption	ChildDef/Table.php	/^        $caption = false;$/;"	v
-caption	HTMLModule/Legacy.php	/^        $caption = $this->addBlankElement('caption');$/;"	v
-carryover	Strategy/MakeWellFormed.php	/^                        $carryover = true;$/;"	v
-carryover	Strategy/MakeWellFormed.php	/^                    $carryover = false;$/;"	v
-caseSensitive	AttrTransform/EnumToCSS.php	/^    protected $caseSensitive = false;$/;"	v
-case_sensitive	AttrDef/Enum.php	/^    protected $case_sensitive = false; \/\/ values according to W3C spec$/;"	v
-case_sensitive	AttrDef/HTML/FrameTarget.php	/^    protected $case_sensitive = false;$/;"	v
-case_sensitive	AttrTransform/EnumToCSS.php	/^    public function __construct($attr, $enum_to_css, $case_sensitive = false) {$/;"	v
-cat	Lexer/PH5P.php	/^                        $cat  = $this->getElementCategory($node->tagName);$/;"	v
-category	Lexer/PH5P.php	/^                            $category = $this->getElementCategory($node);$/;"	v
-category	Lexer/PH5P.php	/^                            $category = $this->getElementCategory($this->stack[$s]->nodeName);$/;"	v
-caught	AttrDef/CSS/Background.php	/^        $caught = array();$/;"	v
-caught	AttrDef/CSS/Font.php	/^        $caught = array(); \/\/ which stage 0 properties have we caught?$/;"	v
-caught	AttrDef/CSS/ListStyle.php	/^        $caught = array();$/;"	v
-cell_align	HTMLModule/Tables.php	/^        $cell_align = array($/;"	v
-cell_col	HTMLModule/Tables.php	/^        $cell_col = array_merge($/;"	v
-cell_t	HTMLModule/Tables.php	/^        $cell_t = array_merge($/;"	v
-char	AttrDef/CSS/FontFamily.php	/^                            $char = HTMLPurifier_Encoder::unichr(hexdec($code));$/;"	v
-char	Encoder.php	/^                        $char = '';$/;"	v
-char	Encoder.php	/^                    $char = '';$/;"	v
-char	Encoder.php	/^                    $char ='';$/;"	v
-char	Encoder.php	/^        $char = '';$/;"	v
-char	Lexer/DOMLex.php	/^            $char = '[^a-z!\\\/]';$/;"	v
-char	Lexer/DirectLex.php	/^                $char = @$string[$cursor];$/;"	v
-char	Lexer/DirectLex.php	/^                if ($char == '"' || $char == "'") {$/;"	v
-char	Lexer/PH5P.php	/^                        $char = 0;$/;"	v
-char	Lexer/PH5P.php	/^                        $char = 1;$/;"	v
-char	Lexer/PH5P.php	/^                $char = $this->char();$/;"	v
-char	Lexer/PH5P.php	/^            $char = $this->char();$/;"	v
-char	Lexer/PH5P.php	/^            $char = substr($this->data, $this->char, $len);$/;"	v
-char	Lexer/PH5P.php	/^        $char = $this->char();$/;"	v
-char	Lexer/PH5P.php	/^        $char = $this->character($this->char);$/;"	v
-char	Lexer/PH5P.php	/^        $char = (!$entity) ? '&' : $entity;$/;"	v
-char	Lexer/PH5P.php	/^        $char = (!$entity)$/;"	v
-char	Lexer/PH5P.php	/^    private function char() {$/;"	f
-char_class	Lexer/PH5P.php	/^                        $char_class = '0-9';$/;"	v
-char_class	Lexer/PH5P.php	/^                        $char_class = '0-9A-Fa-f';$/;"	v
-character	Lexer/PH5P.php	/^    private function character($s, $l = 0) {$/;"	f
-characters	Lexer/PH5P.php	/^    private function characters($char_class, $start) {$/;"	f
-chars_gen_delims	URI.php	/^        $chars_gen_delims = ':\/?#[]@';$/;"	v
-chars_pchar	URI.php	/^        $chars_pchar = $chars_sub_delims . ':@';$/;"	v
-chars_sub_delims	URI.php	/^        $chars_sub_delims = '!$&\\'()*+,;=';$/;"	v
-chatty	Config.php	/^    public $chatty = true;$/;"	v
-checkDefType	DefinitionCache.php	/^    public function checkDefType($def) {$/;"	f
-checkNeeded	Injector.php	/^    public function checkNeeded($config) {$/;"	f
-checks	Injector.php	/^     * This function checks if the HTML environment$/;"	f
-child	Lexer/PH5P.php	/^                            $child = $furthest_block->firstChild;$/;"	v
-child_tokens	Strategy/FixNesting.php	/^            $child_tokens = array();$/;"	v
-child_tokens	Strategy/FixNesting.php	/^            if ($result === true || $child_tokens === $result) {$/;"	v
-children	ErrorStruct.php	/^    public $children = array();$/;"	v
-chmod	DefinitionCache/Serializer.php	/^                $chmod = '775';$/;"	v
-chmod	DefinitionCache/Serializer.php	/^                $chmod = '777';$/;"	v
-chunks	HTMLDefinition.php	/^        $chunks = preg_split('\/(,|[\\n\\r]+)\/', $list);$/;"	v
-class	AttrDef/HTML/Pixels.php	/^        $class = get_class($this);$/;"	v
-class	DefinitionCacheFactory.php	/^            $class = "HTMLPurifier_DefinitionCache_Decorator_$decorator";$/;"	v
-class	HTMLModuleManager.php	/^                    $class = "HTMLPurifier_Injector_$injector";$/;"	v
-class	LanguageFactory.php	/^            $class = 'HTMLPurifier_Language_' . $pcode;$/;"	v
-class	Printer.php	/^        $class = str_replace($prefix, '', get_class($obj));$/;"	v
-class	URISchemeRegistry.php	/^        $class = 'HTMLPurifier_URIScheme_' . $scheme;$/;"	v
-cleanCSS	Filter/ExtractStyleBlocks.php	/^    public function cleanCSS($css, $config, $context) {$/;"	f
-cleanUTF8	Encoder.php	/^    public static function cleanUTF8($str, $force_php = false) {$/;"	f
-cleanup	DefinitionCache.php	/^    abstract public function cleanup($config);$/;"	f
-cleanup	DefinitionCache/Decorator.php	/^    public function cleanup($config) {$/;"	f
-cleanup	DefinitionCache/Null.php	/^    public function cleanup($config) {$/;"	f
-cleanup	DefinitionCache/Serializer.php	/^    public function cleanup($config) {$/;"	f
-clear	Lexer/PH5P.php	/^        $clear = array('html', 'table');$/;"	v
-clear	Lexer/PH5P.php	/^        $clear = array('tbody', 'tfoot', 'thead', 'html');$/;"	v
-clear	Lexer/PH5P.php	/^        $clear = array('tr', 'html');$/;"	v
-clearStackToTableContext	Lexer/PH5P.php	/^    private function clearStackToTableContext($elements) {$/;"	f
-clearTheActiveFormattingElementsUpToTheLastMarker	Lexer/PH5P.php	/^    private function clearTheActiveFormattingElementsUpToTheLastMarker() {$/;"	f
-clear_fix	Encoder.php	/^                $clear_fix = array();$/;"	v
-clone	Lexer/PH5P.php	/^                                $clone = $node->cloneNode();$/;"	v
-clone	Lexer/PH5P.php	/^                        $clone = $formatting_element->cloneNode();$/;"	v
-clone	Lexer/PH5P.php	/^            $clone = $entry->cloneNode();$/;"	v
-closeCell	Lexer/PH5P.php	/^    private function closeCell() {$/;"	f
-closeHandler	Lexer/PEARSax3.php	/^    public function closeHandler(&$parser, $name) {$/;"	f
-closeTagOpenState	Lexer/PH5P.php	/^    private function closeTagOpenState() {$/;"	f
-code	AttrDef/CSS/FontFamily.php	/^                            $code = $font[$i];$/;"	v
-code	Bootstrap.php	/^            $code = str_replace('_', '-', substr($class, 22));$/;"	v
-code	EntityParser.php	/^            $code = $is_hex ? hexdec($matches[1]) : (int) $matches[2];$/;"	v
-code	HTMLModule/Text.php	/^        $code = $this->addElement('code',    'Inline', 'Inline', 'Common');$/;"	v
-code	Language.php	/^    public $code = 'en';$/;"	v
-code	LanguageFactory.php	/^            $code = $this->validator->validate($/;"	v
-code	LanguageFactory.php	/^            $code = $this->validator->validate($code, $config, $context);$/;"	v
-code	LanguageFactory.php	/^        if ($code === false) $code = 'en'; \/\/ malformed code becomes English$/;"	v
-code	LanguageFactory.php	/^    public function create($config, $context, $code = false) {$/;"	v
-col	ErrorCollector.php	/^            foreach ($col_array as $col => $struct) {$/;"	v
-col	ErrorCollector.php	/^        $col   = $token ? $token->col  : $this->context->get('CurrentCol',  true);$/;"	v
-coll_i	AttrCollections.php	/^            foreach ($module->attr_collections as $coll_i => $coll) {$/;"	v
-collect	Lexer/DOMLex.php	/^    protected function tokenizeDOM($node, &$tokens, $collect = false) {$/;"	v
-collection	ChildDef/Table.php	/^                    $collection = array();$/;"	v
-collection	ChildDef/Table.php	/^        $collection = array(); \/\/ collected nodes$/;"	v
-color	AttrDef/CSS/Color.php	/^                $color = '#' . $color;$/;"	v
-color	AttrDef/CSS/Color.php	/^            $color = "rgb($new_triad)";$/;"	v
-color	AttrDef/CSS/Color.php	/^        $color = trim($color);$/;"	v
-colors	AttrDef/CSS/Color.php	/^        if ($colors === null) $colors = $config->get('Core.ColorKeywords');$/;"	v
-colors	AttrDef/CSS/Color.php	/^        static $colors = null;$/;"	v
-colors	AttrDef/HTML/Color.php	/^        if ($colors === null) $colors = $config->get('Core.ColorKeywords');$/;"	v
-colors	AttrDef/HTML/Color.php	/^        static $colors = null;$/;"	v
-cols	ChildDef/Table.php	/^        $cols    = array();$/;"	v
-cols	Printer/ConfigForm.php	/^    public $cols = 18;$/;"	v
-comment	Lexer/DOMLex.php	/^            $comment = "\/<!--(.*?)(-->|\\z)\/is";$/;"	v
-comment	Lexer/PH5P.php	/^            $comment = $this->dom->createComment($token['data']);$/;"	v
-comment	Lexer/PH5P.php	/^        $comment = $this->dom->createComment($data);$/;"	v
-commentDashState	Lexer/PH5P.php	/^    private function commentDashState() {$/;"	f
-commentEndState	Lexer/PH5P.php	/^    private function commentEndState() {$/;"	f
-commentState	Lexer/PH5P.php	/^    private function commentState() {$/;"	f
-common	HTMLModuleManager.php	/^        $common = array($/;"	v
-common_ancestor	Lexer/PH5P.php	/^                        $common_ancestor = $this->stack[$fe_s_pos - 1];$/;"	v
-compare	DefinitionCache.php	/^        $compare = version_compare($version, $config->version);$/;"	v
-compareTo	Length.php	/^    public function compareTo($l) {$/;"	f
-compat	Bootstrap.php	/^            $compat = version_compare(PHP_VERSION, '5.1.2', '<=') &&$/;"	v
-compress	Printer/ConfigForm.php	/^    protected $compress = false;$/;"	v
-cond	Lexer/PH5P.php	/^                $cond = isset($entity);$/;"	v
-cond	Lexer/PH5P.php	/^                $cond = strlen($e_name) > 0;$/;"	v
-conf	URIDefinition.php	/^            $conf = $config->get('URI.' . $name);$/;"	v
-config	Config.php	/^        $config = HTMLPurifier_Config::create($ret, $schema);$/;"	v
-config	Config.php	/^        $config = new HTMLPurifier_Config($definition);$/;"	v
-config	Printer/ConfigForm.php	/^            $config = $config[1];$/;"	v
-config	URISchemeRegistry.php	/^        if (!$config) $config = HTMLPurifier_Config::createDefault();$/;"	v
-configLookup	AttrDef/HTML/LinkTypes.php	/^        $configLookup = array($/;"	v
-confiscateAttr	AttrTransform.php	/^    public function confiscateAttr(&$attr, $key) {$/;"	f
-content	ChildDef/Table.php	/^        $content = array();$/;"	v
-content_model	ContentSets.php	/^        $content_model = $def->content_model;$/;"	v
-content_model	HTMLModule.php	/^        $content_model = trim($content_model);$/;"	v
-content_model_type	HTMLModule.php	/^        $content_model_type = strtolower(trim($content_model_type));$/;"	v
-content_sets	HTMLModule.php	/^    public $content_sets = array();$/;"	v
-content_sets	HTMLModule/Forms.php	/^    public $content_sets = array($/;"	v
-content_sets	HTMLModule/List.php	/^    public $content_sets = array('Flow' => 'List');$/;"	v
-content_sets	HTMLModule/Scripting.php	/^    public $content_sets = array('Block' => 'script | noscript', 'Inline' => 'script | noscript');$/;"	v
-content_sets	HTMLModule/Text.php	/^    public $content_sets = array($/;"	v
-contents	HTMLModule/Edit.php	/^        $contents = 'Chameleon: #PCDATA | Inline ! #PCDATA | Flow';$/;"	v
-context	ConfigSchema/Validator.php	/^    protected $context = array();$/;"	v
-context	ErrorCollector.php	/^            $context = array_pop($context_stack);$/;"	v
-context	Printer.php	/^        $context = new HTMLPurifier_Context();$/;"	v
-context	Printer/HTMLDefinition.php	/^        $context = new HTMLPurifier_Context();$/;"	v
-context_stack	ErrorCollector.php	/^        $context_stack = array(array());$/;"	v
-convert	UnitConverter.php	/^    public function convert($length, $to_unit) {$/;"	f
-convertFromUTF8	Encoder.php	/^    public static function convertFromUTF8($str, $config, $context) {$/;"	f
-convertToASCIIDumbLossless	Encoder.php	/^    public static function convertToASCIIDumbLossless($str) {$/;"	f
-convertToLookup	ContentSets.php	/^    protected function convertToLookup($string) {$/;"	f
-convertToUTF8	Encoder.php	/^    public static function convertToUTF8($str, $config, $context) {$/;"	f
-converter	Length.php	/^            $converter = new HTMLPurifier_UnitConverter();$/;"	v
-copy	DefinitionCache/Decorator.php	/^    public function copy() {$/;"	f
-copy	DefinitionCache/Decorator/Cleanup.php	/^    public function copy() {$/;"	f
-copy	DefinitionCache/Decorator/Memory.php	/^    public function copy() {$/;"	f
-could	AttrDef/CSS/TextDecoration.php	/^ * @note This class could be generalized into a version that acts sort of$/;"	c
-cp	UnitConverter.php	/^        $cp = ($log < 0) ? $this->internalPrecision - $log : $this->internalPrecision; \/\/ internal precision$/;"	v
-create	Config.php	/^    public static function create($config, $schema = null) {$/;"	f
-create	DefinitionCacheFactory.php	/^    public function create($type, $config) {$/;"	f
-create	ElementDef.php	/^    public static function create($content_model, $content_model_type, $attr) {$/;"	f
-create	LanguageFactory.php	/^    public function create($config, $context, $code = false) {$/;"	f
-create	Lexer.php	/^    public static function create($config) {$/;"	f
-createComment	TokenFactory.php	/^    public function createComment($data) {$/;"	f
-createDefault	Config.php	/^    public static function createDefault() {$/;"	f
-createEmpty	TokenFactory.php	/^    public function createEmpty($name, $attr = array()) {$/;"	f
-createEnd	TokenFactory.php	/^    public function createEnd($name) {$/;"	f
-createStart	TokenFactory.php	/^    public function createStart($name, $attr = array()) {$/;"	f
-createText	TokenFactory.php	/^    public function createText($data) {$/;"	f
-css	AttrDef/CSS.php	/^        $css = $this->parseCDATA($css);$/;"	v
-css	AttrTransform/ImgSpace.php	/^    protected $css = array($/;"	v
-css	Filter/ExtractStyleBlocks.php	/^            $css = str_replace($/;"	v
-css	Filter/ExtractStyleBlocks.php	/^            $css = substr($css, 0, -3);$/;"	v
-css	Filter/ExtractStyleBlocks.php	/^            $css = substr($css, 4);$/;"	v
-css	Filter/ExtractStyleBlocks.php	/^        $css = $this->_tidy->print->plain();$/;"	v
-css	Filter/ExtractStyleBlocks.php	/^        $css = trim($css);$/;"	v
-css_definition	Filter/ExtractStyleBlocks.php	/^        $css_definition = $config->getDefinition('CSS');$/;"	v
-css_name	AttrTransform/Length.php	/^    public function __construct($name, $css_name = null) {$/;"	v
-current	Injector.php	/^        $current = $this->inputTokens[$i];$/;"	v
-current	Injector.php	/^    protected function current(&$i, &$current) {$/;"	f
-current	Lexer/PH5P.php	/^                    $current = end($this->stack)->nodeName;$/;"	v
-current_col	Lexer/DirectLex.php	/^                $current_col = $rcursor - (is_bool($nl_pos) ? 0 : $nl_pos + 1);$/;"	v
-current_col	Lexer/DirectLex.php	/^            $current_col  = 0;$/;"	v
-current_col	Lexer/DirectLex.php	/^            $current_col  = false;$/;"	v
-current_line	Lexer/DirectLex.php	/^                    $current_line = 1 + $this->substrCount($html, $nl, 0, $cursor);$/;"	v
-current_line	Lexer/DirectLex.php	/^            $current_line = 1;$/;"	v
-current_line	Lexer/DirectLex.php	/^            $current_line = false;$/;"	v
-current_parent	Strategy/MakeWellFormed.php	/^            $current_parent = array_pop($this->stack);$/;"	v
-current_token	AttrValidator.php	/^        $current_token =& $context->get('CurrentToken', true);$/;"	v
-cursor	AttrDef/CSS/Filter.php	/^        $cursor = $function_length + 1;$/;"	v
-cursor	Lexer/DirectLex.php	/^                    $cursor = $end ? $position_comment_end : $position_comment_end + 3;$/;"	v
-cursor	Lexer/DirectLex.php	/^                    $cursor = $position_next_gt + 1;$/;"	v
-cursor	Lexer/DirectLex.php	/^                    $cursor = $size;$/;"	v
-cursor	Lexer/DirectLex.php	/^                    $cursor = strpos($string, $char, $cursor);$/;"	v
-cursor	Lexer/DirectLex.php	/^                $cursor  = $position_next_lt + 1;$/;"	v
-cursor	Lexer/DirectLex.php	/^                $cursor = $position_next_gt + 1;$/;"	v
-cursor	Lexer/DirectLex.php	/^        $cursor = 0; \/\/ current position in string (moves forward)$/;"	v
-cursor	Lexer/DirectLex.php	/^        $cursor = 0; \/\/ our location in the text$/;"	v
-custom_injectors	Strategy/MakeWellFormed.php	/^        $custom_injectors = $injectors['Custom'];$/;"	v
-d	Config.php	/^            $d = $this->def->info[$key];$/;"	v
-d_defs	AttrValidator.php	/^        $d_defs = $definition->info_global_attr;$/;"	v
-d_int	ConfigSchema/Validator.php	/^            $d_int = HTMLPurifier_VarParser::$types[$d->type];$/;"	v
-data	Generator.php	/^        $data = preg_replace('#\/\/\\s*$#', '', $token->data);$/;"	v
-data	Lexer/DOMLex.php	/^                        $data = substr($data, 0, -3);$/;"	v
-data	Lexer/DOMLex.php	/^                    $data = substr($new_data, 4);$/;"	v
-data	Lexer/DOMLex.php	/^            $data = $node->data;$/;"	v
-data	Lexer/PH5P.php	/^        $data = $this->characters('^>', $this->char);$/;"	v
-data	Lexer/PH5P.php	/^        $data = str_replace("\\r", null, $data);$/;"	v
-data	Lexer/PH5P.php	/^        $data = str_replace("\\r\\n", "\\n", $data);$/;"	v
-data	PropertyList.php	/^    protected $data = array();$/;"	v
-data	Strategy/RemoveForeignElements.php	/^                    $data = $token->data;$/;"	v
-dataHandler	Lexer/PEARSax3.php	/^    public function dataHandler(&$parser, $data) {$/;"	f
-dataState	Lexer/PH5P.php	/^    private function dataState() {$/;"	f
-declarations	AttrDef/CSS.php	/^        $declarations = explode(';', $css);$/;"	v
-decorate	DefinitionCache/Decorator.php	/^    public function decorate(&$cache) {$/;"	f
-decorator	DefinitionCache/Decorator.php	/^        $decorator = $this->copy();$/;"	v
-decorator	DefinitionCacheFactory.php	/^            $decorator = new $class;$/;"	v
-decorators	DefinitionCacheFactory.php	/^    protected $decorators = array();$/;"	v
-def	AttrDef/CSS/Background.php	/^        $def = $config->getCSSDefinition();$/;"	v
-def	AttrDef/CSS/Border.php	/^        $def = $config->getCSSDefinition();$/;"	v
-def	AttrDef/CSS/Font.php	/^        $def = $config->getCSSDefinition();$/;"	v
-def	AttrDef/CSS/ListStyle.php	/^        $def = $config->getCSSDefinition();$/;"	v
-def	ChildDef/StrictBlockquote.php	/^            $def = $config->getHTMLDefinition();$/;"	v
-def	ChildDef/StrictBlockquote.php	/^        $def = $config->getHTMLDefinition();$/;"	v
-def	Config.php	/^        $def = $this->def->info[$key];$/;"	v
-def	ElementDef.php	/^        $def = new HTMLPurifier_ElementDef();$/;"	v
-def	Filter/ExtractStyleBlocks.php	/^                    $def = $css_definition->info[$name];$/;"	v
-def	HTMLDefinition.php	/^        $def = $this->manager->getElement($parent, true);$/;"	v
-def	HTMLModuleManager.php	/^                $def = $new_def;$/;"	v
-def	HTMLModuleManager.php	/^        $def = false;$/;"	v
-def	Injector.php	/^        $def = $config->getHTMLDefinition();$/;"	v
-def	Length.php	/^        $def = new HTMLPurifier_AttrDef_CSS_Number();$/;"	v
-def	Lexer/DOMLex.php	/^        $def = $config->getDefinition('HTML');$/;"	v
-def	Printer/ConfigForm.php	/^                $def = $this->config->def->info["$ns.$directive"];$/;"	v
-def	Printer/ConfigForm.php	/^        $def = $config->def->info["$ns.$directive"];$/;"	v
-def	Printer/HTMLDefinition.php	/^        $def = $this->def;$/;"	v
-def	Strategy/FixNesting.php	/^                    $def = $definition->info[$tokens[$i]->name];$/;"	v
-def	Strategy/FixNesting.php	/^                    $def = $definition->info_parent_def;$/;"	v
-def	URI.php	/^            $def = $config->getDefinition('URI');$/;"	v
-def	URIFilter/MakeAbsolute.php	/^        $def = $config->getDefinition('URI');$/;"	v
-def_i	AttrCollections.php	/^                $def_i = trim($def_i, '*');$/;"	v
-def_i	AttrCollections.php	/^        foreach ($attr as $def_i => $def) {$/;"	v
-def_injectors	Strategy/MakeWellFormed.php	/^        $def_injectors = $definition->info_injector;$/;"	v
-default	StringHashParser.php	/^    public $default = 'ID';$/;"	v
-defaultLevel	HTMLModule/Tidy.php	/^    public $defaultLevel = null;$/;"	v
-defaultLevel	HTMLModule/Tidy/Name.php	/^    public $defaultLevel = 'heavy';$/;"	v
-defaultLevel	HTMLModule/Tidy/Proprietary.php	/^    public $defaultLevel = 'light';$/;"	v
-defaultLevel	HTMLModule/Tidy/Strict.php	/^    public $defaultLevel = 'light';$/;"	v
-defaultLevel	HTMLModule/Tidy/Transitional.php	/^    public $defaultLevel = 'heavy';$/;"	v
-defaultLevel	HTMLModule/Tidy/XHTML.php	/^    public $defaultLevel = 'medium';$/;"	v
-default_port	URIScheme.php	/^    public $default_port = null;$/;"	v
-default_port	URIScheme/ftp.php	/^    public $default_port = 21;$/;"	v
-default_port	URIScheme/http.php	/^    public $default_port = 80;$/;"	v
-default_port	URIScheme/https.php	/^    public $default_port = 443;$/;"	v
-default_port	URIScheme/nntp.php	/^    public $default_port = 119;$/;"	v
-defaults	ConfigSchema.php	/^    public $defaults = array();$/;"	v
-defines_child_def	HTMLModule.php	/^    public $defines_child_def = false;$/;"	v
-defines_child_def	HTMLModule/Edit.php	/^    public $defines_child_def = true;$/;"	v
-defines_child_def	HTMLModule/Tidy/Strict.php	/^    public $defines_child_def = true;$/;"	v
-definition	AttrDef/CSS.php	/^        $definition = $config->getCSSDefinition();$/;"	v
-definition	AttrValidator.php	/^        $definition = $config->getHTMLDefinition();$/;"	v
-definition	Config.php	/^        $definition = HTMLPurifier_ConfigSchema::instance();$/;"	v
-definition	Strategy/FixNesting.php	/^        $definition = $config->getHTMLDefinition();$/;"	v
-definition	Strategy/MakeWellFormed.php	/^        $definition = $config->getHTMLDefinition();$/;"	v
-definition	Strategy/RemoveForeignElements.php	/^        $definition = $config->getHTMLDefinition();$/;"	v
-defs	AttrValidator.php	/^        $defs = $definition->info[$token->name]->attr;$/;"	v
-delete	HTMLDefinition.php	/^                            $delete = false;$/;"	v
-delete	HTMLDefinition.php	/^                        $delete = false;$/;"	v
-delete	HTMLDefinition.php	/^                    $delete = true;$/;"	v
-delete	HTMLDefinition.php	/^                $delete = true;$/;"	v
-delete	Strategy/MakeWellFormed.php	/^        $delete = array_shift($token);$/;"	v
-depth	ChildDef/StrictBlockquote.php	/^        $depth = 0;$/;"	v
-depth	LanguageFactory.php	/^        static $depth = 0; \/\/ recursion protection$/;"	v
-depth	Strategy/FixNesting.php	/^            for ($j = $i, $depth = 0; ; $j++) {$/;"	v
-descendants_are_inline	ElementDef.php	/^    public $descendants_are_inline = false;$/;"	v
-describing	ConfigSchema/Interchange/Directive.php	/^ * Interchange component class describing configuration directives.$/;"	c
-dest_state	UnitConverter.php	/^            if (isset($x[$to_unit])) $dest_state = $k;$/;"	v
-dest_unit	UnitConverter.php	/^                $dest_unit = $to_unit;$/;"	v
-dest_unit	UnitConverter.php	/^                $dest_unit = self::$units[$state][$dest_state][0];$/;"	v
-destroy	Context.php	/^    public function destroy($name) {$/;"	f
-dh	ConfigSchema/InterchangeBuilder.php	/^        $dh = opendir($dir);$/;"	v
-dh	DefinitionCache/Serializer.php	/^        $dh  = opendir($dir);$/;"	v
-digits	AttrDef/Integer.php	/^            $digits = $integer = substr($integer, 1); \/\/ rm unnecessary plus$/;"	v
-digits	AttrDef/Integer.php	/^            $digits = $integer;$/;"	v
-digits	AttrDef/Integer.php	/^            $digits = substr($integer, 1);$/;"	v
-dir	ConfigSchema/InterchangeBuilder.php	/^        if (!$dir) $dir = HTMLPURIFIER_PREFIX . '\/HTMLPurifier\/ConfigSchema\/schema\/';$/;"	v
-dir	DefinitionCache/Serializer.php	/^        $dir = $this->generateDirectoryPath($config);$/;"	v
-directive	Config.php	/^                foreach ($namespace_values as $directive => $value) {$/;"	v
-directive	Config.php	/^            $directive = $value;$/;"	v
-directive	Config.php	/^            if ($directive == 'DefinitionID' || $directive == 'DefinitionRev') continue;$/;"	v
-directive	ConfigSchema/InterchangeBuilder.php	/^        $directive = new HTMLPurifier_ConfigSchema_Interchange_Directive();$/;"	v
-directive	Printer/ConfigForm.php	/^        foreach ($directives as $directive => $value) {$/;"	v
-directive_disp	Printer/ConfigForm.php	/^                    $directive_disp = $directive;$/;"	v
-directive_disp	Printer/ConfigForm.php	/^                    $directive_disp = substr($directive, 0, $this->compress - 2) . '...';$/;"	v
-directives	ConfigSchema/Interchange.php	/^    public $directives = array();$/;"	v
-directly	PropertyListIterator.php	/^ * Property list iterator. Do not instantiate this class directly.$/;"	c
-directory	DefinitionCache/Serializer.php	/^        $directory = $this->generateDirectoryPath($config);$/;"	v
-discard	Printer/HTMLDefinition.php	/^        foreach ($array as $discard => $obj) {$/;"	v
-div	HTMLModule/Legacy.php	/^        $div = $this->addBlankElement('div');$/;"	v
-div	UnitConverter.php	/^    private function div($s1, $s2, $scale) {$/;"	f
-dl	HTMLModule/Legacy.php	/^        $dl = $this->addBlankElement('dl');$/;"	v
-doSetup	CSSDefinition.php	/^    protected function doSetup($config) {$/;"	f
-doSetup	Definition.php	/^    abstract protected function doSetup($config);$/;"	f
-doSetup	HTMLDefinition.php	/^    protected function doSetup($config) {$/;"	f
-doSetup	URIDefinition.php	/^    protected function doSetup($config) {$/;"	f
-doSetupProprietary	CSSDefinition.php	/^    protected function doSetupProprietary($config) {$/;"	f
-doSetupTricky	CSSDefinition.php	/^    protected function doSetupTricky($config) {$/;"	f
-doc	Lexer/DOMLex.php	/^        $doc = new DOMDocument();$/;"	v
-doc	Lexer/PH5P.php	/^            $doc = $parser->save();$/;"	v
-doc_url	Printer/ConfigForm.php	/^        $name, $doc_url = null, $compress = false$/;"	v
-doctype	DoctypeRegistry.php	/^            $doctype = 'HTML 4.01';$/;"	v
-doctype	DoctypeRegistry.php	/^            $doctype = 'XHTML 1.0';$/;"	v
-doctype	DoctypeRegistry.php	/^            $doctype = new HTMLPurifier_Doctype($/;"	v
-doctype	DoctypeRegistry.php	/^        $doctype = $config->get('HTML.CustomDoctype');$/;"	v
-doctype	DoctypeRegistry.php	/^        $doctype = $config->get('HTML.Doctype');$/;"	v
-doctype	DoctypeRegistry.php	/^        if (isset($this->aliases[$doctype])) $doctype = $this->aliases[$doctype];$/;"	v
-doctype	Lexer/PH5P.php	/^            $doctype = new DOMDocumentType(null, null, 'HTML');$/;"	v
-doctype	Printer/HTMLDefinition.php	/^        $doctype = $this->def->doctype;$/;"	v
-doctypeNameState	Lexer/PH5P.php	/^    private function doctypeNameState() {$/;"	f
-doctypeState	Lexer/PH5P.php	/^    private function doctypeState() {$/;"	f
-does	AttrDef/CSS/Multiple.php	/^ *       shorthand declaration.  Thus, this class does not allow inherit.$/;"	c
-doesn	IDAccumulator.php	/^     * @note This function doesn't care about duplicates$/;"	f
-domainlabel	AttrDef/URI/Host.php	/^        $domainlabel   = "$an($and*$an)?";$/;"	v
-done	AttrDef/CSS/Border.php	/^        $done = array(); \/\/ segments we've finished$/;"	v
-dp	UnitConverter.php	/^        $dp = strpos($n, '.'); \/\/ decimal position$/;"	v
-e	AttrValidator.php	/^        $e =& $context->get('ErrorCollector', true);$/;"	v
-e	HTMLModule/Target.php	/^            $e = $this->addBlankElement($name);$/;"	v
-e	HTMLModule/Tidy.php	/^                            $e = $this->addBlankElement($element);$/;"	v
-e	HTMLModule/Tidy.php	/^                            $e = $this->info[$element];$/;"	v
-e	HTMLModule/Tidy.php	/^                        $e = $this->addBlankElement($element);$/;"	v
-e	HTMLModule/Tidy.php	/^                        $e = $this->info[$element];$/;"	v
-e	HTMLModule/Tidy.php	/^                        $e = $this;$/;"	v
-e	Lexer/DirectLex.php	/^            $e =& $context->get('ErrorCollector');$/;"	v
-e	Lexer/DirectLex.php	/^        $e = false;$/;"	v
-e	Strategy/FixNesting.php	/^        $e =& $context->get('ErrorCollector', true);$/;"	v
-e	Strategy/MakeWellFormed.php	/^        $e = $context->get('ErrorCollector', true);$/;"	v
-e	Strategy/RemoveForeignElements.php	/^            $e =& $context->get('ErrorCollector');$/;"	v
-e	Strategy/RemoveForeignElements.php	/^        $e = false;$/;"	v
-e_name	Lexer/PH5P.php	/^                $e_name = $this->characters($char_class, $this->char + $char + 1);$/;"	v
-e_name	Lexer/PH5P.php	/^                $e_name = $this->characters('0-9A-Za-z;', $this->char + 1);$/;"	v
-el	ChildDef/Custom.php	/^        $el = '[#a-zA-Z0-9_.-]+';$/;"	v
-el	Lexer/PH5P.php	/^                    $el = $this->insertElement($token);$/;"	v
-el	Lexer/PH5P.php	/^        $el = $this->dom->createElement($token['name']);$/;"	v
-elattr	HTMLDefinition.php	/^            foreach ($allowed_attributes_mutable as $elattr => $d) {$/;"	v
-element	ContentSets.php	/^                foreach ($set as $element => $x) {$/;"	v
-element	Generator.php	/^    public function generateAttributes($assoc_array_of_attributes, $element = false) {$/;"	v
-element	HTMLDefinition.php	/^                            $element = htmlspecialchars($bits[0]);$/;"	v
-element	HTMLDefinition.php	/^                $element = $chunk;$/;"	v
-element	HTMLDefinition.php	/^                $element = htmlspecialchars($element); \/\/ PHP doesn't escape errors, be careful!$/;"	v
-element	HTMLDefinition.php	/^            $element = $module->addBlankElement($element_name);$/;"	v
-element	HTMLDefinition.php	/^            $element = $module->info[$element_name];$/;"	v
-element	HTMLDefinition.php	/^            foreach ($allowed_elements as $element => $d) {$/;"	v
-element	HTMLDefinition.php	/^        $element = $module->addBlankElement($element_name);$/;"	v
-element	HTMLDefinition.php	/^        $element = $module->addElement($element_name, $type, $contents, $attr_collections, $attributes);$/;"	v
-element	HTMLModule/Name.php	/^            $element = $this->addBlankElement($name);$/;"	v
-element	HTMLModule/Tidy.php	/^                        $element = $params['element'];$/;"	v
-element	HTMLModule/Tidy.php	/^                    $element = $params['element'];$/;"	v
-element	Injector.php	/^            if (is_int($element)) $element = $attributes;$/;"	v
-element	Injector.php	/^        foreach ($this->needed as $element => $attributes) {$/;"	v
-element	Lexer/PH5P.php	/^                        $element = $this->insertElement($token);$/;"	v
-element	Lexer/PH5P.php	/^                    $element = $this->insertElement($token, false);$/;"	v
-element	Lexer/PH5P.php	/^                $element = $this->insertElement($token);$/;"	v
-element	Lexer/PH5P.php	/^                $element = $this->insertElement($token, false);$/;"	v
-element	Lexer/PH5P.php	/^            $element = $this->insertElement($token);$/;"	v
-element	Lexer/PH5P.php	/^            $element = $this->insertElement($token, false);$/;"	v
-element	Printer.php	/^    protected function element($tag, $contents, $attr = array(), $escape = true) {$/;"	f
-element	Strategy/MakeWellFormed.php	/^                            $element = clone $parent;$/;"	v
-element	Strategy/MakeWellFormed.php	/^                    $element = clone $skipped_tags[$j];$/;"	v
-elementEmpty	Printer.php	/^    protected function elementEmpty($tag, $attr = array()) {$/;"	f
-elementInScope	Lexer/PH5P.php	/^    private function elementInScope($el, $table = false) {$/;"	f
-elementLookup	HTMLModuleManager.php	/^    public $elementLookup = array();$/;"	v
-elements	ChildDef.php	/^    public $elements = array();$/;"	v
-elements	ChildDef/Required.php	/^            $elements = array_flip($elements);$/;"	v
-elements	ChildDef/Required.php	/^            $elements = explode('|', $elements);$/;"	v
-elements	ChildDef/Required.php	/^            $elements = str_replace(' ', '', $elements);$/;"	v
-elements	ChildDef/Required.php	/^    public $elements = array();$/;"	v
-elements	ChildDef/Table.php	/^    public $elements = array('tr' => true, 'tbody' => true, 'thead' => true,$/;"	v
-elements	HTMLDefinition.php	/^        $elements = array();$/;"	v
-elements	HTMLModule.php	/^    public $elements = array();$/;"	v
-elements	HTMLModule/Name.php	/^        $elements = array('a', 'applet', 'form', 'frame', 'iframe', 'img', 'map');$/;"	v
-elements	HTMLModule/Scripting.php	/^    public $elements = array('script', 'noscript');$/;"	v
-elements	HTMLModule/Target.php	/^        $elements = array('a');$/;"	v
-elements	HTMLModuleManager.php	/^        $elements = array();$/;"	v
-elements	Lexer/PH5P.php	/^                    $elements = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6');$/;"	v
-elements	Lexer/PH5P.php	/^        $elements = array_diff(array('dd', 'dt', 'li', 'p', 'td', 'th', 'tr'), $exclude);$/;"	v
-elements	Printer/HTMLDefinition.php	/^                $elements = $def->elements;$/;"	v
-elements	Printer/HTMLDefinition.php	/^                $elements = array();$/;"	v
-elements	Printer/HTMLDefinition.php	/^                $elements = array_flip(array('col', 'caption', 'colgroup', 'thead',$/;"	v
-elements	Printer/HTMLDefinition.php	/^            $elements = array();$/;"	v
-elements	Strategy/MakeWellFormed.php	/^                        $elements = $definition->info[$parent->name]->child->getAllowedElements($config);$/;"	v
-elements_in_stack	Lexer/PH5P.php	/^            $elements_in_stack = count($this->stack);$/;"	v
-em	HTMLModule/Text.php	/^        $em = $this->addElement('em',      'Inline', 'Inline', 'Common');$/;"	v
-embed	HTMLModule/SafeEmbed.php	/^        $embed = $this->addElement($/;"	v
-embeds	AttrDef/URI.php	/^        $embeds = (bool) $string;$/;"	v
-emit	Lexer/PH5P.php	/^        $emit = $this->tree->emitToken($token);$/;"	v
-emitToken	Lexer/PH5P.php	/^    private function emitToken($token) {$/;"	f
-emitToken	Lexer/PH5P.php	/^    public function emitToken($token) {$/;"	f
-encode	PercentEncoder.php	/^    public function encode($string) {$/;"	f
-encoder	URI.php	/^            $encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . ':');$/;"	v
-encoding	Encoder.php	/^        $encoding = $config->get('Core.Encoding');$/;"	v
-encoding	PercentEncoder.php	/^            $encoding = strtoupper($encoding);$/;"	v
-encoding	PercentEncoder.php	/^            $encoding = substr($part, 0, 2);$/;"	v
-encodings	Encoder.php	/^        static $encodings = array();$/;"	v
-end	Lexer/DirectLex.php	/^                        $end = false;$/;"	v
-end	Lexer/DirectLex.php	/^                        $end = true;$/;"	v
-end	Printer.php	/^    protected function end($tag) {$/;"	f
-entities	Lexer/PH5P.php	/^    private $entities = array('AElig;','AElig','AMP;','AMP','Aacute;','Aacute',$/;"	v
-entity	EntityParser.php	/^        $entity = $matches[0];$/;"	v
-entity	Lexer/PH5P.php	/^                        $entity = $id;$/;"	v
-entity	Lexer/PH5P.php	/^                $entity = $this->character($start, $this->char);$/;"	v
-entity	Lexer/PH5P.php	/^        $entity = $this->entity();$/;"	v
-entity	Lexer/PH5P.php	/^    private function entity() {$/;"	f
-entityDataState	Lexer/PH5P.php	/^    private function entityDataState() {$/;"	f
-entityInAttributeValueState	Lexer/PH5P.php	/^    private function entityInAttributeValueState() {$/;"	f
-entry	Lexer/PH5P.php	/^                $entry = $this->a_formatting[$a];$/;"	v
-entry	Lexer/PH5P.php	/^            $entry = $this->a_formatting[$a];$/;"	v
-entry	Lexer/PH5P.php	/^            $entry = end($this->a_formatting);$/;"	v
-entry	Lexer/PH5P.php	/^        $entry = end($this->a_formatting);$/;"	v
-enumToCSS	AttrTransform/EnumToCSS.php	/^    protected $enumToCSS = array();$/;"	v
-error	ConfigSchema/Validator.php	/^    protected function error($target, $msg) {$/;"	f
-error	ConfigSchema/ValidatorAtom.php	/^    protected function error($msg) {$/;"	f
-error	ErrorCollector.php	/^                $error = $this->locale->getErrorName($severity);$/;"	v
-error	ErrorCollector.php	/^        $error = array($/;"	v
-error	Language.php	/^    public $error = false;$/;"	v
-error	Strategy/MakeWellFormed.php	/^            $error = $injector->prepare($config, $context);$/;"	v
-error	VarParser.php	/^    protected function error($msg) {$/;"	f
-errorGeneric	VarParser.php	/^    protected function errorGeneric($var, $type) {$/;"	f
-errorInconsistent	VarParser.php	/^    protected function errorInconsistent($class, $type) {$/;"	f
-errorNames	Language.php	/^    public $errorNames = array();$/;"	v
-errorNames	Language/messages/en.php	/^$errorNames = array($/;"	v
-errors	ErrorCollector.php	/^        if ($errors === null) $errors = $this->errors;$/;"	v
-errors	ErrorCollector.php	/^    public function getHTMLFormatted($config, $errors = null) {$/;"	v
-errors	ErrorStruct.php	/^    public $errors = array();$/;"	v
-escape	Generator.php	/^    public function escape($string, $quote = ENT_COMPAT) {$/;"	f
-escape	Lexer/PH5P.php	/^    private $escape = false;$/;"	v
-escape	Printer.php	/^    protected function escape($string) {$/;"	f
-escapeCDATA	Lexer.php	/^    protected static function escapeCDATA($string) {$/;"	f
-escapeCommentedCDATA	Lexer.php	/^    protected static function escapeCommentedCDATA($string) {$/;"	f
-escapeHandler	Lexer/PEARSax3.php	/^    public function escapeHandler(&$parser, $data) {$/;"	f
-escape_invalid_children	ChildDef/Required.php	/^        $escape_invalid_children = $config->get('Core.EscapeInvalidChildren');$/;"	v
-escape_invalid_tags	Strategy/MakeWellFormed.php	/^        $escape_invalid_tags = $config->get('Core.EscapeInvalidTags');$/;"	v
-escape_invalid_tags	Strategy/RemoveForeignElements.php	/^        $escape_invalid_tags = $config->get('Core.EscapeInvalidTags');$/;"	v
-evalArray	ConfigSchema/InterchangeBuilder.php	/^    protected function evalArray($contents) {$/;"	f
-evalExpression	VarParser/Native.php	/^    protected function evalExpression($expr) {$/;"	f
-exclude_stack	Strategy/FixNesting.php	/^        $exclude_stack = array();$/;"	v
-excluded	Strategy/FixNesting.php	/^                        $excluded = true;$/;"	v
-excluded	Strategy/FixNesting.php	/^            $excluded = false;$/;"	v
-excludes	ElementDef.php	/^    public $excludes = array();$/;"	v
-excludes	Strategy/FixNesting.php	/^                $excludes = $def->excludes;$/;"	v
-excludes	Strategy/FixNesting.php	/^                $excludes = array(); \/\/ not used, but good to initialize anyway$/;"	v
-execute	Strategy.php	/^    abstract public function execute($tokens, $config, $context);$/;"	f
-execute	Strategy/Composite.php	/^    public function execute($tokens, $config, $context) {$/;"	f
-execute	Strategy/FixNesting.php	/^    public function execute($tokens, $config, $context) {$/;"	f
-execute	Strategy/MakeWellFormed.php	/^    public function execute($tokens, $config, $context) {$/;"	f
-execute	Strategy/RemoveForeignElements.php	/^    public function execute($tokens, $config, $context) {$/;"	f
-execute	Strategy/ValidateAttributes.php	/^    public function execute($tokens, $config, $context) {$/;"	f
-exists	Context.php	/^    public function exists($name) {$/;"	f
-expandIdentifiers	AttrCollections.php	/^    public function expandIdentifiers(&$attr, $attr_types) {$/;"	f
-expects	AttrTransform/SafeParam.php	/^ *      This class expects an injector to add the necessary parameters tags.$/;"	c
-export	ConfigSchema/Builder/Xml.php	/^    protected function export($var) {$/;"	f
-external	ConfigSchema/Interchange/Directive.php	/^    public $external = array();$/;"	v
-extra	Config.php	/^            $extra = " on line {$frame['line']} in file {$frame['file']}";$/;"	v
-extra	Config.php	/^            $extra = '';$/;"	v
-extractBody	Lexer.php	/^    public function extractBody($html) {$/;"	f
-f	HTMLModule/Tidy.php	/^                    $f =& $e->$type;$/;"	v
-factor	UnitConverter.php	/^                $factor = $this->div(self::$units[$state][$unit], self::$units[$state][$dest_unit], $cp);$/;"	v
-factory	Config.php	/^        $factory = HTMLPurifier_DefinitionCacheFactory::instance();$/;"	v
-factory	Language.php	/^        $factory = HTMLPurifier_LanguageFactory::instance();$/;"	v
-fallback	Language.php	/^    public $fallback = false;$/;"	v
-fallback	Language/messages/en-x-test.php	/^$fallback = 'en';$/;"	v
-fallback	Language/messages/en-x-testmini.php	/^$fallback = 'en';$/;"	v
-fallback	Language/messages/en.php	/^$fallback = false;$/;"	v
-fallback	LanguageFactory.php	/^                $fallback = $raw_fallback ? $raw_fallback : 'en';$/;"	v
-fallback	LanguageFactory.php	/^                $fallback = 'en';$/;"	v
-fallback	LanguageFactory.php	/^        $fallback = ($code != 'en') ? 'en' : false;$/;"	v
-fallback_cache	LanguageFactory.php	/^            $fallback_cache = $this->cache[$fallback];$/;"	v
-fallbacks	LanguageFactory.php	/^     * Creates a language object, handles class fallbacks$/;"	c
-fb_s_pos	Lexer/PH5P.php	/^                        $fb_s_pos = array_search($furthest_block, $this->stack, true);$/;"	v
-fe_af_pos	Lexer/PH5P.php	/^                                $fe_af_pos = $a;$/;"	v
-fe_af_pos	Lexer/PH5P.php	/^                        $fe_af_pos = array_search($formatting_element, $this->a_formatting, true);$/;"	v
-fe_s_pos	Lexer/PH5P.php	/^                        $fe_s_pos = array_search($formatting_element, $this->stack, true);$/;"	v
-fh	StringHashParser.php	/^        $fh = fopen($file, 'r');$/;"	v
-fields	Printer/ConfigForm.php	/^    protected $fields = array();$/;"	v
-file	Bootstrap.php	/^            $file = 'HTMLPurifier\/Language\/classes\/' . $code . '.php';$/;"	v
-file	Bootstrap.php	/^            $file = str_replace('_', '\/', $class) . '.php';$/;"	v
-file	Bootstrap.php	/^        $file = HTMLPurifier_Bootstrap::getPath($class);$/;"	v
-file	DefinitionCache/Serializer.php	/^        $file = $this->generateFilePath($config);$/;"	v
-file	EntityLookup.php	/^            $file = HTMLPURIFIER_PREFIX . '\/HTMLPurifier\/EntityLookup\/entities.ser';$/;"	v
-file	LanguageFactory.php	/^            $file  = $this->dir . '\/Language\/classes\/' . $code . '.php';$/;"	v
-filename	LanguageFactory.php	/^            $filename = $this->dir . '\/Language\/messages\/en.php';$/;"	v
-filename	LanguageFactory.php	/^        $filename = $this->dir . '\/Language\/messages\/' . $code . '.php';$/;"	v
-files	ConfigSchema/InterchangeBuilder.php	/^        $files = array();$/;"	v
-filter	AttrDef/HTML/Class.php	/^    protected function filter($tokens, $config, $context) {$/;"	f
-filter	AttrDef/HTML/Nmtokens.php	/^    protected function filter($tokens, $config, $context) {$/;"	f
-filter	PropertyListIterator.php	/^    public function __construct(Iterator $iterator, $filter = null) {$/;"	v
-filter	URIDefinition.php	/^    public function filter(&$uri, $config, $context) {$/;"	f
-filter	URIFilter.php	/^    abstract public function filter(&$uri, $config, $context);$/;"	f
-filter	URIFilter/DisableExternal.php	/^    public function filter(&$uri, $config, $context) {$/;"	f
-filter	URIFilter/DisableExternalResources.php	/^    public function filter(&$uri, $config, $context) {$/;"	f
-filter	URIFilter/HostBlacklist.php	/^    public function filter(&$uri, $config, $context) {$/;"	f
-filter	URIFilter/MakeAbsolute.php	/^    public function filter(&$uri, $config, $context) {$/;"	f
-filter	URIFilter/Munge.php	/^    public function filter(&$uri, $config, $context) {$/;"	f
-filters	URIDefinition.php	/^    protected $filters = array();$/;"	v
-final	AttrDef/CSS/Font.php	/^        $final = ''; \/\/ output$/;"	v
-final	AttrDef/CSS/FontFamily.php	/^        $final = '';$/;"	v
-final	AttrDef/CSS/FontFamily.php	/^        $final = rtrim($final, ', ');$/;"	v
-final	AttrDef/CSS/Multiple.php	/^        $final = '';$/;"	v
-final	AttrDef/CSS/TextDecoration.php	/^        $final = '';$/;"	v
-final	AttrDef/CSS/TextDecoration.php	/^        $final = rtrim($final);$/;"	v
-finalize	Config.php	/^    public function finalize() {$/;"	f
-finalized	Config.php	/^    protected $finalized = false;$/;"	v
-first	AttrDef/URI/IPv6.php	/^                $first = explode(':', $first);$/;"	v
-first_char	Lexer/DirectLex.php	/^            $first_char = @$quoted_value[0];$/;"	v
-first_char	Lexer/DirectLex.php	/^            $first_char = @$string[$cursor];$/;"	v
-five	Printer.php	/^        if ($five === null) $five = version_compare(PHP_VERSION, '5', '>=');$/;"	v
-five	Printer.php	/^        static $five = null;$/;"	v
-fixes	HTMLModule/Tidy.php	/^        $fixes = $this->makeFixes();$/;"	v
-fixesForLevel	HTMLModule/Tidy.php	/^    public $fixesForLevel = array($/;"	v
-fixes_lookup	HTMLModule/Tidy.php	/^        $fixes_lookup = $this->getFixesForLevel($level);$/;"	v
-float	AttrDef/CSS/AlphaValue.php	/^        $float = (float) $result;$/;"	v
-flush	DefinitionCache.php	/^    abstract public function flush($config);$/;"	f
-flush	DefinitionCache/Decorator.php	/^    public function flush($config) {$/;"	f
-flush	DefinitionCache/Null.php	/^    public function flush($config) {$/;"	f
-flush	DefinitionCache/Serializer.php	/^    public function flush($config) {$/;"	f
-font	AttrDef/CSS/FontFamily.php	/^                $font = $new_font;$/;"	v
-font	AttrDef/CSS/FontFamily.php	/^                $font = substr($font, 1, $length - 2);$/;"	v
-font	AttrDef/CSS/FontFamily.php	/^            $font = str_replace("'", "\\\\'", $font);$/;"	v
-font	AttrDef/CSS/FontFamily.php	/^            $font = str_replace("\\\\", "\\\\\\\\", $font);$/;"	v
-font	AttrDef/CSS/FontFamily.php	/^            $font = trim($font);$/;"	v
-font_family	AttrDef/CSS/Font.php	/^                    $font_family =$/;"	v
-font_size	AttrDef/CSS/Font.php	/^                        $font_size = $bits[$i];$/;"	v
-fonts	AttrDef/CSS/FontFamily.php	/^        $fonts = explode(',', $string);$/;"	v
-for	AttrDef.php	/^ * Base class for all validating attribute definitions.$/;"	c
-for	AttrDef/CSS/Multiple.php	/^ * Framework class for strings that involve multiple values.$/;"	c
-for	Bootstrap.php	/^     * Autoload function for HTML Purifier$/;"	f
-for	Config.php	/^     * Convenience function for error reporting$/;"	f
-for	ConfigSchema/Validator.php	/^     * Convenience function for generating HTMLPurifier_ConfigSchema_ValidatorAtom$/;"	f
-for	ConfigSchema/ValidatorAtom.php	/^ * Fluent interface for validating the contents of member variables.$/;"	i
-for	DefinitionCache/Serializer.php	/^     * Convenience wrapper function for file_put_contents$/;"	f
-for	EntityParser.php	/^     * Callback function for substituteNonSpecialEntities() that does the work.$/;"	f
-for	EntityParser.php	/^     * Callback function for substituteSpecialEntities() that does the work.$/;"	f
-for	Exception.php	/^ * Global exception class for HTML Purifier; any exceptions we throw$/;"	c
-for	HTMLModule/Tidy.php	/^ * Abstract class for a set of proprietary modules that clean up (tidy)$/;"	c
-for	Language/classes/en-x-test.php	/^\/\/ private class for unit testing$/;"	c
-for	Lexer.php	/^     * Callback function for escapeCDATA() that does the work.$/;"	f
-for	Lexer.php	/^ * @note The unit tests will instantiate this class for testing purposes, as$/;"	c
-for	Lexer/DOMLex.php	/^     * Callback function for undoing escaping of stray angled brackets$/;"	f
-for	Lexer/DirectLex.php	/^     * Callback function for script CDATA fudge$/;"	f
-for	Token.php	/^     * Convenience function for DirectLex settings line\/col position.$/;"	f
-forbidden	AttrDef/HTML/Class.php	/^        $forbidden = $config->get('Attr.ForbiddenClasses');$/;"	v
-forbidden_attributes	HTMLDefinition.php	/^        $forbidden_attributes = $config->get('HTML.ForbiddenAttributes');$/;"	v
-forbidden_elements	HTMLDefinition.php	/^        $forbidden_elements   = $config->get('HTML.ForbiddenElements');$/;"	v
-force_php	Encoder.php	/^    public static function cleanUTF8($str, $force_php = false) {$/;"	v
-form	HTMLModule/Forms.php	/^        $form = $this->addElement('form', 'Form',$/;"	v
-form_pointer	Lexer/PH5P.php	/^    private $form_pointer = null;$/;"	v
-formatMessage	Language.php	/^    public function formatMessage($key, $args = array()) {$/;"	f
-formatting	Lexer/PH5P.php	/^    private $formatting = array('a','b','big','em','font','i','nobr','s','small','strike','strong','tt','u');$/;"	v
-formatting_element	Lexer/PH5P.php	/^                                $formatting_element = $this->a_formatting[$a];$/;"	v
-formatting_elements	Lexer/PH5P.php	/^        $formatting_elements = count($this->a_formatting);$/;"	v
-forward	Injector.php	/^    protected function forward(&$i, &$current) {$/;"	f
-forwardUntilEndToken	Injector.php	/^    protected function forwardUntilEndToken(&$i, &$current, &$nesting) {$/;"	f
-foster_parent	Lexer/PH5P.php	/^    private $foster_parent = null;$/;"	v
-found_double_hyphen	Strategy/RemoveForeignElements.php	/^                        $found_double_hyphen = true; \/\/ prevent double-erroring$/;"	v
-found_double_hyphen	Strategy/RemoveForeignElements.php	/^                    $found_double_hyphen = false;$/;"	v
-found_slash	AttrDef/CSS/Font.php	/^                                        $found_slash = true;$/;"	v
-found_slash	AttrDef/CSS/Font.php	/^                            $found_slash = true;$/;"	v
-found_slash	AttrDef/CSS/Font.php	/^                    $found_slash = false;$/;"	v
-fragment	URIParser.php	/^        $fragment   = !empty($matches[8]) ? $matches[9] : null;$/;"	v
-frame	Config.php	/^            $frame = $backtrace[1];$/;"	v
-from	AttrDef.php	/^     * Factory method for creating this class from a string.$/;"	c
-full	Config.php	/^        $full = $this->getAll();$/;"	v
-func	Bootstrap.php	/^                    if ($compat) $func = implode('::', $func);$/;"	v
-function	AttrDef/CSS/Filter.php	/^        $function = trim(substr($value, 0, $function_length));$/;"	v
-function_length	AttrDef/CSS/Filter.php	/^        $function_length = strcspn($value, '(');$/;"	v
-furthest_block	Lexer/PH5P.php	/^                                $furthest_block = $this->stack[$s];$/;"	v
-gen	ChildDef/Required.php	/^        $gen = new HTMLPurifier_Generator($config, $context);$/;"	v
-gen_config	Printer/ConfigForm.php	/^            $gen_config = $config;$/;"	v
-gen_config	Printer/ConfigForm.php	/^            $gen_config = $config[0];$/;"	v
-generateAttributes	Generator.php	/^    public function generateAttributes($assoc_array_of_attributes, $element = false) {$/;"	f
-generateBaseDirectoryPath	DefinitionCache/Serializer.php	/^    public function generateBaseDirectoryPath($config) {$/;"	f
-generateChildDef	ContentSets.php	/^    public function generateChildDef(&$def, $module) {$/;"	f
-generateChildDefCallback	ContentSets.php	/^    public function generateChildDefCallback($matches) {$/;"	f
-generateDirectoryPath	DefinitionCache/Serializer.php	/^    public function generateDirectoryPath($config) {$/;"	f
-generateFilePath	DefinitionCache/Serializer.php	/^    public function generateFilePath($config) {$/;"	f
-generateFromToken	Generator.php	/^    public function generateFromToken($token) {$/;"	f
-generateFromTokens	Generator.php	/^    public function generateFromTokens($tokens) {$/;"	f
-generateImpliedEndTags	Lexer/PH5P.php	/^    private function generateImpliedEndTags($exclude = array()) {$/;"	f
-generateKey	DefinitionCache.php	/^    public function generateKey($config) {$/;"	f
-generateScriptFromToken	Generator.php	/^    public function generateScriptFromToken($token) {$/;"	f
-generator	Language.php	/^                    if (!$generator) $generator = $this->context->get('Generator');$/;"	v
-generator	Language.php	/^        $generator = false;$/;"	v
-generator	Strategy/MakeWellFormed.php	/^        $generator = new HTMLPurifier_Generator($config, $context);$/;"	v
-generator	Strategy/RemoveForeignElements.php	/^        $generator = new HTMLPurifier_Generator($config, $context);$/;"	v
-generic_names	AttrDef/CSS/FontFamily.php	/^        static $generic_names = array($/;"	v
-get	AttrTypes.php	/^    public function get($type) {$/;"	f
-get	Config.php	/^    public function get($key, $a = null) {$/;"	f
-get	Context.php	/^    public function &get($name, $ignore_error = false) {$/;"	f
-get	DefinitionCache.php	/^    abstract public function get($config);$/;"	f
-get	DefinitionCache/Decorator.php	/^    public function get($config) {$/;"	f
-get	DefinitionCache/Decorator/Cleanup.php	/^    public function get($config) {$/;"	f
-get	DefinitionCache/Decorator/Memory.php	/^    public function get($config) {$/;"	f
-get	DefinitionCache/Null.php	/^    public function get($config) {$/;"	f
-get	DefinitionCache/Serializer.php	/^    public function get($config) {$/;"	f
-get	DoctypeRegistry.php	/^    public function get($doctype) {$/;"	f
-get	PropertyList.php	/^    public function get($name) {$/;"	f
-getAccessed	StringHash.php	/^    public function getAccessed() {$/;"	f
-getAll	Config.php	/^    public function getAll() {$/;"	f
-getAllowedDirectivesForForm	Config.php	/^    public static function getAllowedDirectivesForForm($allowed, $schema = null) {$/;"	f
-getAllowedElements	ChildDef.php	/^    public function getAllowedElements($config) {$/;"	f
-getAllowedElements	ChildDef/StrictBlockquote.php	/^    public function getAllowedElements($config) {$/;"	f
-getAnonymousModule	HTMLDefinition.php	/^    public function getAnonymousModule() {$/;"	f
-getBatch	Config.php	/^    public function getBatch($namespace) {$/;"	f
-getBatchSerial	Config.php	/^    public function getBatchSerial($namespace) {$/;"	f
-getCSS	Printer/ConfigForm.php	/^    public static function getCSS() {$/;"	f
-getCSSDefinition	Config.php	/^    public function getCSSDefinition($raw = false) {$/;"	f
-getChild	ErrorStruct.php	/^    public function getChild($type, $id) {$/;"	f
-getChildDef	ContentSets.php	/^    public function getChildDef($def, $module) {$/;"	f
-getChildDef	HTMLModule.php	/^    public function getChildDef($def) {return false;}$/;"	f
-getChildDef	HTMLModule/Edit.php	/^    public function getChildDef($def) {$/;"	f
-getChildDef	HTMLModule/Tidy/Strict.php	/^    public function getChildDef($def) {$/;"	f
-getClass	Printer.php	/^    protected function getClass($obj, $sec_prefix = '') {$/;"	f
-getDefinition	Config.php	/^    public function getDefinition($type, $raw = false) {$/;"	f
-getDirective	ConfigSchema/Interchange/Id.php	/^    public function getDirective() {$/;"	f
-getDoctypeFromConfig	DoctypeRegistry.php	/^    public function getDoctypeFromConfig($config) {$/;"	f
-getElement	HTMLModuleManager.php	/^    public function getElement($name, $trusted = null) {$/;"	f
-getElementCategory	Lexer/PH5P.php	/^    private function getElementCategory($node) {$/;"	f
-getElements	HTMLModuleManager.php	/^    public function getElements() {$/;"	f
-getErrorName	Language.php	/^    public function getErrorName($int) {$/;"	f
-getFallbackFor	LanguageFactory.php	/^    public function getFallbackFor($code) {$/;"	f
-getFixType	HTMLModule/Tidy.php	/^    public function getFixType($name) {$/;"	f
-getFixesForLevel	HTMLModule/Tidy.php	/^    public function getFixesForLevel($level) {$/;"	f
-getFormattedContext	ConfigSchema/Validator.php	/^    protected function getFormattedContext() {$/;"	f
-getHTMLDefinition	Config.php	/^    public function getHTMLDefinition($raw = false) {$/;"	f
-getHTMLFormatted	ErrorCollector.php	/^    public function getHTMLFormatted($config, $errors = null) {$/;"	f
-getJavaScript	Printer/ConfigForm.php	/^    public static function getJavaScript() {$/;"	f
-getMessage	Language.php	/^    public function getMessage($key) {$/;"	f
-getN	Length.php	/^    public function getN() {return $this->n;}$/;"	f
-getParent	PropertyList.php	/^    public function getParent() {$/;"	f
-getPath	Bootstrap.php	/^    public static function getPath($class) {$/;"	f
-getRaw	ErrorCollector.php	/^    public function getRaw() {$/;"	f
-getRewind	Injector.php	/^    public function getRewind() {$/;"	f
-getRootNamespace	ConfigSchema/Interchange/Id.php	/^    public function getRootNamespace() {$/;"	f
-getScheme	URISchemeRegistry.php	/^    public function getScheme($scheme, $config, $context) {$/;"	f
-getSchemeObj	URI.php	/^    public function getSchemeObj($config, $context) {$/;"	f
-getSerial	Config.php	/^    public function getSerial() {$/;"	f
-getSigFigs	UnitConverter.php	/^    public function getSigFigs($n) {$/;"	f
-getTypeName	VarParser.php	/^    static public function getTypeName($type) {$/;"	f
-getUnit	Length.php	/^    public function getUnit() {return $this->unit;}$/;"	f
-h	HTMLModule/Legacy.php	/^            $h = $this->addBlankElement("h$i");$/;"	v
-handleElement	Injector.php	/^    public function handleElement(&$token) {}$/;"	f
-handleElement	Injector/AutoParagraph.php	/^    public function handleElement(&$token) {$/;"	f
-handleElement	Injector/DisplayLinkURI.php	/^    public function handleElement(&$token) {$/;"	f
-handleElement	Injector/RemoveEmpty.php	/^    public function handleElement(&$token) {$/;"	f
-handleElement	Injector/SafeObject.php	/^    public function handleElement(&$token) {$/;"	f
-handleEnd	Injector.php	/^    public function handleEnd(&$token) {$/;"	f
-handleEnd	Injector/DisplayLinkURI.php	/^    public function handleEnd(&$token) {$/;"	f
-handleEnd	Injector/SafeObject.php	/^    public function handleEnd(&$token) {$/;"	f
-handleText	Injector.php	/^    public function handleText(&$token) {}$/;"	f
-handleText	Injector/AutoParagraph.php	/^    public function handleText(&$token) {$/;"	f
-handleText	Injector/Linkify.php	/^    public function handleText(&$token) {$/;"	f
-handleText	Injector/PurifierLinkify.php	/^    public function handleText(&$token) {$/;"	f
-has	Lexer.php	/^     * @note The behavior of this class has changed, rather than accepting$/;"	c
-has	PropertyList.php	/^    public function has($name) {$/;"	f
-has_space	Lexer/DirectLex.php	/^        $has_space = strpos($string, ' ');$/;"	v
-hash	ConfigSchema/InterchangeBuilder.php	/^            $hash = new HTMLPurifier_StringHash($hash);$/;"	v
-hash	DefinitionCache.php	/^            $hash == $config->getBatchSerial($this->type) &&$/;"	v
-haystack	Lexer/DirectLex.php	/^            $haystack = substr($haystack, $offset, $length);$/;"	v
-head_pointer	Lexer/PH5P.php	/^    private $head_pointer = null;$/;"	v
-heavyHeader	Printer/HTMLDefinition.php	/^    protected function heavyHeader($text, $num = 1) {$/;"	f
-hex	AttrDef/CSS/Color.php	/^                $hex = $color;$/;"	v
-hex	AttrDef/CSS/Color.php	/^                $hex = substr($color, 1);$/;"	v
-hex	AttrDef/HTML/Color.php	/^        else $hex = $string;$/;"	v
-hex	AttrDef/HTML/Color.php	/^        if ($length === 3) $hex = $hex[0].$hex[0].$hex[1].$hex[1].$hex[2].$hex[2];$/;"	v
-hex	AttrDef/HTML/Color.php	/^        if ($string[0] === '#') $hex = substr($string, 1);$/;"	v
-hex	AttrDef/URI/IPv6.php	/^        $hex = '[0-9a-fA-F]';$/;"	v
-hidden_elements	Strategy/RemoveForeignElements.php	/^        $hidden_elements     = $config->get('Core.HiddenElements');$/;"	v
-hierarchical	URIScheme.php	/^    public $hierarchical = false;$/;"	v
-hierarchical	URIScheme/ftp.php	/^    public $hierarchical = true;$/;"	v
-hierarchical	URIScheme/http.php	/^    public $hierarchical = true;$/;"	v
-host	URIParser.php	/^            $host       = !empty($matches[3]) ? $matches[3] : '';$/;"	v
-host_def	URI.php	/^            $host_def = new HTMLPurifier_AttrDef_URI_Host();$/;"	v
-host_parts	URIFilter/DisableExternal.php	/^        $host_parts = array_reverse(explode('.', $uri->host));$/;"	v
-hr	HTMLModule/Legacy.php	/^        $hr = $this->addBlankElement('hr');$/;"	v
-html	ConfigSchema/Builder/Xml.php	/^        $html = $purifier->purify($html);$/;"	v
-html	Filter/ExtractStyleBlocks.php	/^        $html = preg_replace_callback('#<style(?:\\s.*)?>(.+)<\/style>#isU', array($this, 'styleCallback'), $html);$/;"	v
-html	Generator.php	/^            $html = (string) $tidy; \/\/ explicit cast necessary$/;"	v
-html	Generator.php	/^        $html = '';$/;"	v
-html	Generator.php	/^        if ($nl !== "\\n") $html = str_replace("\\n", $nl, $html);$/;"	v
-html	Lexer.php	/^            $html = $this->escapeCommentedCDATA($html);$/;"	v
-html	Lexer.php	/^            $html = $this->extractBody($html);$/;"	v
-html	Lexer.php	/^        $html = $this->_entity_parser->substituteNonSpecialEntities($html);$/;"	v
-html	Lexer.php	/^        $html = $this->escapeCDATA($html);$/;"	v
-html	Lexer.php	/^        $html = HTMLPurifier_Encoder::cleanUTF8($html);$/;"	v
-html	Lexer.php	/^        $html = str_replace("\\r", "\\n", $html);$/;"	v
-html	Lexer.php	/^        $html = str_replace("\\r\\n", "\\n", $html);$/;"	v
-html	Lexer/DOMLex.php	/^                $html = preg_replace("\/<($char)\/i", '&lt;\\\\1', $html);$/;"	v
-html	Lexer/DOMLex.php	/^            $html = preg_replace_callback($comment, array($this, 'callbackArmorCommentEntities'), $html);$/;"	v
-html	Lexer/DOMLex.php	/^            $html = preg_replace_callback($comment, array($this, 'callbackUndoCommentSubst'), $html); \/\/ fix comments$/;"	v
-html	Lexer/DOMLex.php	/^        $html = $this->normalize($html, $config, $context);$/;"	v
-html	Lexer/DOMLex.php	/^        $html = $this->wrapHTML($html, $config, $context);$/;"	v
-html	Lexer/DirectLex.php	/^            $html = preg_replace_callback('#(<script[^>]*>)(\\s*[^<].+?)(<\/script>)#si',$/;"	v
-html	Lexer/DirectLex.php	/^        $html = $this->normalize($html, $config, $context);$/;"	v
-html	Lexer/PH5P.php	/^            $html = $this->dom->createElement('html');$/;"	v
-i	AttrDef/CSS/Background.php	/^        $i = 0; \/\/ number of catches$/;"	v
-i	AttrDef/CSS/BackgroundPosition.php	/^        $i = 0;$/;"	v
-i	AttrDef/CSS/Composite.php	/^        foreach ($this->defs as $i => $def) {$/;"	v
-i	AttrDef/CSS/Font.php	/^                            $i = $j;$/;"	v
-i	AttrDef/CSS/ListStyle.php	/^        $i = 0; \/\/ number of catches$/;"	v
-i	ChildDef/Required.php	/^            foreach ($elements as $i => $x) {$/;"	v
-i	ChildDef/StrictBlockquote.php	/^        foreach ($result as $i => $token) {$/;"	v
-i	ConfigSchema/Validator.php	/^        foreach ($interchange->directives as $i => $directive) {$/;"	v
-i	ContentSets.php	/^            foreach ($this->lookup as $i => $set) {$/;"	v
-i	ContentSets.php	/^        foreach ($array as $i => $k) {$/;"	v
-i	Encoder.php	/^        for( $i = 0; $i < $len; $i++ ) {$/;"	v
-i	HTMLDefinition.php	/^        foreach ($this->info_injector as $i => $injector) {$/;"	v
-i	HTMLModule/Presentation.php	/^        $i = $this->addElement('i',      'Inline', 'Inline', 'Common');$/;"	v
-i	HTMLModuleManager.php	/^            foreach ($module->info_injector as $i => $injector) {$/;"	v
-i	Injector.php	/^        if ($i === null) $i = $this->inputIndex + 1;$/;"	v
-i	Injector.php	/^        if ($i === null) $i = $this->inputIndex - 1;$/;"	v
-i	Injector.php	/^        if ($i === null) $i = $this->inputIndex;$/;"	v
-i	Injector.php	/^     *          functions by setting $i = null beforehand!$/;"	v
-i	Injector/AutoParagraph.php	/^                    $i = null;$/;"	v
-i	Injector/AutoParagraph.php	/^                $i = $nesting = null;$/;"	v
-i	Injector/AutoParagraph.php	/^                $i = null;$/;"	v
-i	Injector/Linkify.php	/^        \/\/ $i = index$/;"	v
-i	Injector/PurifierLinkify.php	/^        \/\/ $i = index$/;"	v
-i	Injector/SafeObject.php	/^                $i = count($this->objectStack) - 1;$/;"	v
-i	Language.php	/^        foreach ($args as $i => $value) {$/;"	v
-i	Printer.php	/^            if ($i > 0 && !($polite && $i == 1)) $ret .= ', ';$/;"	v
-i	Printer.php	/^            if ($polite && $i == 1) $ret .= 'and ';$/;"	v
-i	Printer.php	/^        $i = count($array);$/;"	v
-i	Printer/ConfigForm.php	/^                    foreach ($value as $i => $v) {$/;"	v
-i	Strategy/FixNesting.php	/^                    $i = $parent_index;$/;"	v
-i	Strategy/FixNesting.php	/^                    if ($i == 0 || $i == $size - 1) {$/;"	v
-i	Strategy/MakeWellFormed.php	/^                    foreach ($this->injectors as $i => $injector) {$/;"	v
-i	Strategy/MakeWellFormed.php	/^                $i = false;$/;"	v
-i	Strategy/MakeWellFormed.php	/^                foreach ($this->injectors as $i => $injector) {$/;"	v
-i	Strategy/MakeWellFormed.php	/^        $i = false; \/\/ injector index$/;"	v
-i	URIFilter/DisableExternal.php	/^        foreach ($this->ourHostParts as $i => $x) {$/;"	v
-i	UnitConverter.php	/^            \/\/ Pre-condition: $i == 0$/;"	v
-i	VarParser/Flexible.php	/^                    foreach ($var as $i => $j) $var[$i] = trim($j);$/;"	v
-iconv	Encoder.php	/^        if ($iconv === null) $iconv = function_exists('iconv');$/;"	v
-iconv	Encoder.php	/^        static $iconv = null;$/;"	v
-id	AttrDef/HTML/ID.php	/^            if (strpos($id, $prefix) !== 0) $id = $prefix . $id;$/;"	v
-id	AttrDef/HTML/ID.php	/^        $id = trim($id); \/\/ trim it first$/;"	v
-id	AttrTransform/Name.php	/^        $id = $this->confiscateAttr($attr, 'name');$/;"	v
-id	ConfigSchema/InterchangeBuilder.php	/^        $id = $directive->id->toString(); \/\/ convenience$/;"	v
-id	ConfigSchema/InterchangeBuilder.php	/^    protected function id($id) {$/;"	f
-id	ConfigSchema/Validator.php	/^            $id = $directive->id->toString();$/;"	v
-id	ConfigSchema/Validator.php	/^        $id = $d->id->toString();$/;"	v
-id	Lexer/PH5P.php	/^                    $id = substr($e_name, 0, $c);$/;"	v
-id_accumulator	AttrDef/HTML/ID.php	/^            $id_accumulator =& $context->get('IDAccumulator');$/;"	v
-id_accumulator	AttrValidator.php	/^            $id_accumulator = HTMLPurifier_IDAccumulator::build($config, $context);$/;"	v
-id_accumulator	IDAccumulator.php	/^        $id_accumulator = new HTMLPurifier_IDAccumulator();$/;"	v
-id_string	ConfigSchema/Validator.php	/^        $id_string = $id->toString();$/;"	v
-ids	IDAccumulator.php	/^    public $ids = array();$/;"	v
-if	HTMLDefinition.php	/^ *       update that class if things here change.$/;"	c
-ignore_error	Context.php	/^    public function &get($name, $ignore_error = false) {$/;"	v
-img	HTMLModule/Image.php	/^        $img = $this->addElement($/;"	v
-img	HTMLModule/Legacy.php	/^        $img = $this->addBlankElement('img');$/;"	v
-implementations	DefinitionCacheFactory.php	/^    protected $implementations = array();$/;"	v
-in	Encoder.php	/^                        !($in == 9 || $in == 13 || $in == 10) \/\/ save \\r\\t\\n$/;"	v
-in	Encoder.php	/^                    if (($in <= 31 || $in == 127) &&$/;"	v
-in	Encoder.php	/^            $in = ord($str{$i});$/;"	v
-in	Encoder.php	/^     * @note This is very similar to the unichr function in$/;"	f
-inBody	Lexer/PH5P.php	/^    private function inBody($token) {$/;"	f
-inCaption	Lexer/PH5P.php	/^    private function inCaption($token) {$/;"	f
-inCell	Lexer/PH5P.php	/^    private function inCell($token) {$/;"	f
-inColumnGroup	Lexer/PH5P.php	/^    private function inColumnGroup($token) {$/;"	f
-inFrameset	Lexer/PH5P.php	/^    private function inFrameset($token) {$/;"	f
-inHead	Lexer/PH5P.php	/^    private function inHead($token) {$/;"	f
-inRow	Lexer/PH5P.php	/^    private function inRow($token) {$/;"	f
-inSelect	Lexer/PH5P.php	/^    private function inSelect($token) {$/;"	f
-inTable	Lexer/PH5P.php	/^    private function inTable($token) {$/;"	f
-inTableBody	Lexer/PH5P.php	/^    private function inTableBody($token) {$/;"	f
-in_stack	Lexer/PH5P.php	/^                                $in_stack = in_array($formatting_element, $this->stack, true);$/;"	v
-index	Config.php	/^    public function mergeArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true) {$/;"	v
-index	Config.php	/^    public static function loadArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {$/;"	v
-index	Config.php	/^    public static function prepareArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {$/;"	v
-info	AttrCollections.php	/^    public $info = array();$/;"	v
-info	AttrDef/CSS/Border.php	/^    protected $info = array();$/;"	v
-info	AttrDef/CSS/Font.php	/^    protected $info = array();$/;"	v
-info	AttrTypes.php	/^    protected $info = array();$/;"	v
-info	CSSDefinition.php	/^    public $info = array();$/;"	v
-info	ConfigSchema.php	/^    public $info = array();$/;"	v
-info	ConfigSchema/InterchangeBuilder.php	/^        $info = parse_ini_file($dir . 'info.ini');$/;"	v
-info	ContentSets.php	/^    public $info = array();$/;"	v
-info	HTMLDefinition.php	/^    public $info = array();$/;"	v
-info	HTMLModule.php	/^    public $info = array();$/;"	v
-info_attr_transform_post	HTMLDefinition.php	/^    public $info_attr_transform_post = array();$/;"	v
-info_attr_transform_post	HTMLModule.php	/^    public $info_attr_transform_post = array();$/;"	v
-info_attr_transform_pre	HTMLDefinition.php	/^    public $info_attr_transform_pre = array();$/;"	v
-info_attr_transform_pre	HTMLModule.php	/^    public $info_attr_transform_pre = array();$/;"	v
-info_block_wrapper	HTMLDefinition.php	/^    public $info_block_wrapper = 'p';$/;"	v
-info_content_sets	HTMLDefinition.php	/^    public $info_content_sets = array();$/;"	v
-info_global_attr	HTMLDefinition.php	/^    public $info_global_attr = array();$/;"	v
-info_injector	HTMLDefinition.php	/^    public $info_injector = array();$/;"	v
-info_injector	HTMLModule.php	/^    public $info_injector = array();$/;"	v
-info_parent	HTMLDefinition.php	/^    public $info_parent = 'div';$/;"	v
-info_tag_transform	HTMLDefinition.php	/^    public $info_tag_transform = array();$/;"	v
-info_tag_transform	HTMLModule.php	/^    public $info_tag_transform = array();$/;"	v
-inherit	Config.php	/^    public static function inherit(HTMLPurifier_Config $config) {$/;"	f
-init	ChildDef/StrictBlockquote.php	/^    private function init($config) {$/;"	f
-init	ChildDef/StrictBlockquote.php	/^    protected $init = false;$/;"	v
-initPhase	Lexer/PH5P.php	/^    private function initPhase($token) {$/;"	f
-injector	HTMLModuleManager.php	/^                    $injector = new $class;$/;"	v
-injector	Strategy/MakeWellFormed.php	/^                $injector = "HTMLPurifier_Injector_$injector";$/;"	v
-injector	Strategy/MakeWellFormed.php	/^                $injector = new $injector;$/;"	v
-injector	Strategy/MakeWellFormed.php	/^            $injector = "HTMLPurifier_Injector_$injector";$/;"	v
-injector	Strategy/MakeWellFormed.php	/^        foreach ($injectors as $injector => $b) {$/;"	v
-injector	Strategy/MakeWellFormed.php	/^    protected function processToken($token, $injector = -1) {$/;"	v
-injectors	Strategy/MakeWellFormed.php	/^        $injectors = $config->getBatch('AutoFormat');$/;"	v
-input	HTMLModule/Forms.php	/^        $input = $this->addElement('input', 'Formctrl', 'Empty', 'Common', array($/;"	v
-insertBefore	Strategy/MakeWellFormed.php	/^    private function insertBefore($token) {$/;"	f
-insertComment	Lexer/PH5P.php	/^    private function insertComment($data) {$/;"	f
-insertElement	Lexer/PH5P.php	/^    private function insertElement($token, $append = true, $check = false) {$/;"	f
-insertText	Lexer/PH5P.php	/^    private function insertText($data) {$/;"	f
-inside_tag	Lexer/DirectLex.php	/^                    $inside_tag = false;$/;"	v
-inside_tag	Lexer/DirectLex.php	/^                $inside_tag = false;$/;"	v
-inside_tag	Lexer/DirectLex.php	/^                $inside_tag = true;$/;"	v
-inside_tag	Lexer/DirectLex.php	/^        $inside_tag = false; \/\/ whether or not we're parsing the inside of a tag$/;"	v
-inst	Lexer.php	/^                    $inst = new HTMLPurifier_Lexer_DOMLex();$/;"	v
-inst	Lexer.php	/^                    $inst = new HTMLPurifier_Lexer_DirectLex();$/;"	v
-inst	Lexer.php	/^                    $inst = new HTMLPurifier_Lexer_PH5P();$/;"	v
-inst	Lexer.php	/^            $inst = $lexer;$/;"	v
-inst	Lexer.php	/^        $inst = null;$/;"	v
-instance	ConfigSchema.php	/^    public static function instance($prototype = null) {$/;"	f
-instance	DefinitionCacheFactory.php	/^            $instance = $prototype;$/;"	v
-instance	DefinitionCacheFactory.php	/^            $instance = new HTMLPurifier_DefinitionCacheFactory();$/;"	v
-instance	DefinitionCacheFactory.php	/^    public static function instance($prototype = null) {$/;"	f
-instance	EntityLookup.php	/^            $instance = $prototype;$/;"	v
-instance	EntityLookup.php	/^            $instance = new HTMLPurifier_EntityLookup();$/;"	v
-instance	EntityLookup.php	/^        static $instance = null;$/;"	v
-instance	EntityLookup.php	/^    public static function instance($prototype = false) {$/;"	f
-instance	LanguageFactory.php	/^            $instance = $prototype;$/;"	v
-instance	LanguageFactory.php	/^            $instance = new HTMLPurifier_LanguageFactory();$/;"	v
-instance	LanguageFactory.php	/^        static $instance = null;$/;"	v
-instance	LanguageFactory.php	/^    public static function instance($prototype = null) {$/;"	f
-instance	URISchemeRegistry.php	/^            $instance = $prototype;$/;"	v
-instance	URISchemeRegistry.php	/^            $instance = new HTMLPurifier_URISchemeRegistry();$/;"	v
-instance	URISchemeRegistry.php	/^        static $instance = null;$/;"	v
-instance	URISchemeRegistry.php	/^    public static function instance($prototype = null) {$/;"	f
-int	AttrDef/CSS/Filter.php	/^            $int = (int) $value;$/;"	v
-int	AttrDef/HTML/MultiLength.php	/^        $int = (int) $int;$/;"	v
-int	AttrDef/HTML/MultiLength.php	/^        $int = substr($string, 0, $length - 1);$/;"	v
-int	AttrDef/HTML/Pixels.php	/^        $int = (int) $string;$/;"	v
-int	EntityParser.php	/^            $int = $is_hex ? hexdec($matches[1]) : (int) $matches[2];$/;"	v
-int	PercentEncoder.php	/^            $int = hexdec($encoding);$/;"	v
-integer	AttrDef/Integer.php	/^            if ($digits === '0') $integer = '0'; \/\/ rm minus sign for zero$/;"	v
-integer	AttrDef/Integer.php	/^        $integer = $this->parseCDATA($integer);$/;"	v
-integer	AttrDef/Integer.php	/^        if (!$this->zero     && $integer == 0) return false;$/;"	v
-interchange	ConfigSchema/InterchangeBuilder.php	/^        $interchange = new HTMLPurifier_ConfigSchema_Interchange();$/;"	v
-internal_precision	UnitConverter.php	/^    public function __construct($output_precision = 4, $internal_precision = 10, $force_no_bcmath = false) {$/;"	v
-into	ChildDef/StrictBlockquote.php	/^        \/\/ trick the parent class into thinking it allows more$/;"	c
-ip	AttrDef/URI/Host.php	/^            $ip = substr($string, 1, $length - 2);$/;"	v
-ip	AttrDef/URI/IPv6.php	/^                $ip = array_map('dechex', $ip);$/;"	v
-ip	AttrDef/URI/IPv6.php	/^                $ip = explode('.', $find[0]);$/;"	v
-ipv4	AttrDef/URI/Host.php	/^        $ipv4 = $this->ipv4->validate($string, $config, $context);$/;"	v
-is	ChildDef/Custom.php	/^ * @warning Currently this class is an all or nothing proposition, that is,$/;"	c
-is	ChildDef/Empty.php	/^ * @warning validateChildren() in this class is actually never called, because$/;"	c
-is	Config.php	/^ * @warning This class is strongly defined: that means that the class$/;"	c
-is	ConfigSchema.php	/^     * This class is friendly with HTMLPurifier_Config. If you need introspection$/;"	c
-is	Doctype.php	/^ * @note This class is inspected by Printer_HTMLDefinition->renderDoctype.$/;"	c
-is	ElementDef.php	/^ * @note This class is inspected by HTMLPurifier_Printer_HTMLDefinition.$/;"	c
-is	HTMLDefinition.php	/^ * @note This class is inspected by Printer_HTMLDefinition; please$/;"	c
-is	Lexer.php	/^ *       This means that, even though this class is not runnable, it will$/;"	c
-is	Lexer/PEARSax3.php	/^     * Close tag event handler, interface is defined by PEAR package.$/;"	i
-is	Lexer/PEARSax3.php	/^     * Data event handler, interface is defined by PEAR package.$/;"	i
-is	Lexer/PEARSax3.php	/^     * Escaped text handler, interface is defined by PEAR package.$/;"	i
-is	Lexer/PEARSax3.php	/^     * Open tag event handler, interface is defined by PEAR package.$/;"	i
-is	PercentEncoder.php	/^     * @warning This function is affected by $preserve, even though the$/;"	f
-is	Token/Tag.php	/^     * Static bool marker that indicates the class is a tag.$/;"	c
-is	TokenFactory.php	/^ *       constructor).  This class is for that optimization.$/;"	c
-isFinalized	Config.php	/^    public function isFinalized($error = false) {$/;"	f
-isOld	DefinitionCache.php	/^    public function isOld($key, $config) {$/;"	f
-isValid	Length.php	/^    public function isValid() {$/;"	f
-isWsOrNbsp	Injector/RemoveEmpty.php	/^                    $isWsOrNbsp = $plain === '' || ctype_space($plain);$/;"	v
-is_child	ChildDef/Custom.php	/^            $is_child = ($nesting == 0); \/\/ direct$/;"	v
-is_child	ChildDef/Required.php	/^            $is_child = ($nesting == 0);$/;"	v
-is_child	ChildDef/Table.php	/^            $is_child = ($nesting == 0);$/;"	v
-is_collecting	ChildDef/Table.php	/^                        $is_collecting = true;$/;"	v
-is_collecting	ChildDef/Table.php	/^                    $is_collecting = false;$/;"	v
-is_collecting	ChildDef/Table.php	/^        $is_collecting = false; \/\/ are we globbing together tokens to package$/;"	v
-is_collecting	ChildDef/Table.php	/^        if (!empty($collection) && $is_collecting == false){$/;"	v
-is_deleting	ChildDef/Required.php	/^                    $is_deleting = true;$/;"	v
-is_deleting	ChildDef/Required.php	/^                $is_deleting = false;$/;"	v
-is_deleting	ChildDef/Required.php	/^        $is_deleting = false;$/;"	v
-is_end_tag	Lexer/DirectLex.php	/^                $is_end_tag = (strpos($segment,'\/') === 0);$/;"	v
-is_folder	URIFilter/MakeAbsolute.php	/^                $is_folder = true;$/;"	v
-is_folder	URIFilter/MakeAbsolute.php	/^            $is_folder = false;$/;"	v
-is_folder	URIFilter/MakeAbsolute.php	/^        $is_folder = false;$/;"	v
-is_hex	EntityParser.php	/^            $is_hex = (@$entity[2] === 'x');$/;"	v
-is_important	AttrDef/CSS/ImportantDecorator.php	/^                $is_important = true;$/;"	v
-is_important	AttrDef/CSS/ImportantDecorator.php	/^        $is_important = false;$/;"	v
-is_inline	ChildDef/StrictBlockquote.php	/^                            $is_inline = false;$/;"	v
-is_inline	ChildDef/StrictBlockquote.php	/^                        $is_inline = true;$/;"	v
-is_inline	ChildDef/StrictBlockquote.php	/^        $is_inline = false;$/;"	v
-is_inline	Strategy/FixNesting.php	/^                    $is_inline = $count - 1;$/;"	v
-is_inline	Strategy/FixNesting.php	/^                    $is_inline = false;$/;"	v
-is_inline	Strategy/FixNesting.php	/^        $is_inline = $definition->info_parent_def->descendants_are_inline;$/;"	v
-is_num	EntityParser.php	/^        $is_num = (@$matches[0][1] === '#');$/;"	v
-is_self_closing	Lexer/DirectLex.php	/^                $is_self_closing = (strrpos($segment,'\/') === $strlen_segment-1);$/;"	v
-is_tag	Token/Tag.php	/^    public $is_tag = true;$/;"	v
-is_whitespace	Token/Comment.php	/^    public $is_whitespace = true;$/;"	v
-itself	StringHashParser.php	/^ * files, but the class itself is usage agnostic.$/;"	c
-ix	Strategy/MakeWellFormed.php	/^        foreach ($this->injectors as $ix => $injector) {$/;"	v
-j	AttrDef/CSS/Font.php	/^                            $j = $i;$/;"	v
-j	Strategy/MakeWellFormed.php	/^                    \/\/ notice we exclude $j == 0, i.e. the current ending tag, from$/;"	v
-k	CSSDefinition.php	/^        foreach ($this->info as $k => $v) {$/;"	v
-k	ConfigSchema/InterchangeBuilder.php	/^        foreach ($hash as $k => $v) {$/;"	v
-k	ElementDef.php	/^        foreach ($a2 as $k => $v) {$/;"	v
-k	ElementDef.php	/^        foreach($def->attr as $k => $v) {$/;"	v
-k	Filter/ExtractStyleBlocks.php	/^        foreach ($this->_tidy->css as $k => $decls) {$/;"	v
-k	HTMLDefinition.php	/^            foreach ($module->info_injector as $k => $v) {$/;"	v
-k	HTMLDefinition.php	/^            foreach($module->info_attr_transform_post as $k => $v) {$/;"	v
-k	HTMLDefinition.php	/^            foreach($module->info_attr_transform_pre as $k => $v) {$/;"	v
-k	HTMLDefinition.php	/^            foreach($module->info_tag_transform as $k => $v) {$/;"	v
-k	HTMLDefinition.php	/^        foreach ($this->info as $k => $v) {$/;"	v
-k	HTMLModuleManager.php	/^            foreach ($modules as $k => $m) {$/;"	v
-k	UnitConverter.php	/^        foreach (self::$units as $k => $x) {$/;"	v
-key	AttrCollections.php	/^            foreach ($this->info[$merge[$i]] as $key => $value) {$/;"	v
-key	AttrDef/CSS/Background.php	/^            foreach ($caught as $key => $status) {$/;"	v
-key	AttrDef/CSS/Filter.php	/^            $key   = trim($key);$/;"	v
-key	AttrDef/CSS/ListStyle.php	/^            foreach ($caught as $key => $status) {$/;"	v
-key	Config.php	/^            $key = "$key.$a";$/;"	v
-key	Config.php	/^            $key = "$key.$directive";$/;"	v
-key	Config.php	/^            $key = str_replace('_', '.', $key);$/;"	v
-key	Config.php	/^        foreach ($config_array as $key => $value) {$/;"	v
-key	Config.php	/^        foreach ($schema->info as $key => $def) {$/;"	v
-key	ConfigSchema.php	/^        foreach ($this->info as $key => $v) {$/;"	v
-key	ContentSets.php	/^            foreach ($module->content_sets as $key => $value) {$/;"	v
-key	ContentSets.php	/^        foreach ($this->lookup as $key => $lookup) {$/;"	v
-key	Context.php	/^        foreach ($context_array as $key => $discard) {$/;"	v
-key	DefinitionCache/Decorator/Memory.php	/^        $key = $this->generateKey($config);$/;"	v
-key	DefinitionCache/Serializer.php	/^            $key = substr($filename, 0, strlen($filename) - 4);$/;"	v
-key	DefinitionCache/Serializer.php	/^        $key = $this->generateKey($config);$/;"	v
-key	Generator.php	/^        foreach ($assoc_array_of_attributes as $key => $value) {$/;"	v
-key	HTMLDefinition.php	/^        foreach ($forbidden_attributes as $key => $v) {$/;"	v
-key	Lexer/DirectLex.php	/^            $key = substr($string, $key_begin, $key_end - $key_begin);$/;"	v
-key	Lexer/PEARSax3.php	/^        foreach ($attrs as $key => $attr) {$/;"	v
-key	PropertyListIterator.php	/^        $key = $this->getInnerIterator()->key();$/;"	v
-key	Strategy/ValidateAttributes.php	/^        foreach ($tokens as $key => $token) {$/;"	v
-key	Token/Tag.php	/^        foreach ($attr as $key => $value) {$/;"	v
-key	VarParser/Flexible.php	/^                    foreach ($var as $key => $value) {$/;"	v
-key_begin	Lexer/DirectLex.php	/^            $key_begin = $cursor; \/\/we're currently at the start of the key$/;"	v
-key_end	Lexer/DirectLex.php	/^            $key_end = $cursor; \/\/ now at the end of the key$/;"	v
-keys	AttrDef/CSS/URI.php	/^        $keys   = array(  '(',   ')',   ',',   ' ',   '"',   "'");$/;"	v
-keys	ChildDef/Required.php	/^        $keys = array_keys($elements);$/;"	v
-keys	ContentSets.php	/^    protected $keys = array();$/;"	v
-keys	HTMLDefinition.php	/^                    $keys = array("$tag@$attr", $attr, "*@$attr", "$tag.$attr", "*.$attr");$/;"	v
-keys	HTMLDefinition.php	/^                $keys = array($attr, "*@$attr", "*.$attr");$/;"	v
-keys	Language.php	/^                $keys = array_keys($value);$/;"	v
-keys	LanguageFactory.php	/^    public $keys = array('fallback', 'messages', 'errorNames');$/;"	v
-keys	VarParser.php	/^                    $keys = array_keys($var);$/;"	v
-keys	VarParser/Flexible.php	/^                $keys = array_keys($var);$/;"	v
-keywords	AttrDef/CSS/BackgroundPosition.php	/^        $keywords = array();$/;"	v
-l	Injector/Linkify.php	/^        \/\/ $l = is link$/;"	v
-l	Injector/PurifierLinkify.php	/^        \/\/ $l = is link$/;"	v
-l	Length.php	/^            $l = $converter->convert($l, $this->unit);$/;"	v
-l	Lexer/PH5P.php	/^    private function character($s, $l = 0) {$/;"	v
-label	HTMLModule/Forms.php	/^        $label = $this->addElement('label', 'Formctrl', 'Optional: #PCDATA | Inline', 'Common', array($/;"	v
-lang	AttrTransform/Lang.php	/^        $lang     = isset($attr['lang']) ? $attr['lang'] : false;$/;"	v
-lang	LanguageFactory.php	/^                $lang = $this->create($config, $context, $fallback);$/;"	v
-lang	LanguageFactory.php	/^                $lang = new $class($config, $context);$/;"	v
-lang	LanguageFactory.php	/^            $lang = new HTMLPurifier_Language($config, $context);$/;"	v
-languages_seen	LanguageFactory.php	/^        static $languages_seen = array(); \/\/ recursion guard$/;"	v
-last	Lexer/DOMLex.php	/^            $last = end($tokens);$/;"	v
-last	Lexer/PH5P.php	/^                $last = true;$/;"	v
-last	Lexer/PH5P.php	/^            $last = count($this->token['attr']) - 1;$/;"	v
-last	Lexer/PH5P.php	/^        $last = count($this->token['attr']) - 1;$/;"	v
-last	Lexer/PH5P.php	/^        $last = false;$/;"	v
-last_char	AttrDef/HTML/Length.php	/^        $last_char = $string[$length - 1];$/;"	v
-last_char	AttrDef/HTML/MultiLength.php	/^        $last_char = $string[$length - 1];$/;"	v
-last_char	Lexer/DirectLex.php	/^            $last_char  = @$quoted_value[strlen($quoted_value)-1];$/;"	v
-last_node	Lexer/PH5P.php	/^                            $last_node = $node;$/;"	v
-last_node	Lexer/PH5P.php	/^                        $last_node = $furthest_block;$/;"	v
-lbit	AttrDef/CSS/BackgroundPosition.php	/^            $lbit = ctype_lower($bit) ? $bit : strtolower($bit);$/;"	v
-lclass	Printer.php	/^        $lclass = strtolower($class);$/;"	v
-left	AttrDef/CSS/Number.php	/^        $left  = ltrim($left,  '0');$/;"	v
-len	Encoder.php	/^        $len = strlen($str);$/;"	v
-len	Lexer/PH5P.php	/^                $len = strlen($e_name);$/;"	v
-len	Lexer/PH5P.php	/^            $len  = strcspn($this->data, '<&', $this->char);$/;"	v
-lenc	Encoder.php	/^            $lenc = strtolower($encoding);$/;"	v
-leng	Lexer/PH5P.php	/^                    $leng = count($this->a_formatting);$/;"	v
-leng	Lexer/PH5P.php	/^        $leng = count($this->stack);$/;"	v
-length	AttrDef/CSS/Color.php	/^                $length = strlen($part);$/;"	v
-length	AttrDef/CSS/Color.php	/^            $length = strlen($color);$/;"	v
-length	AttrDef/CSS/Color.php	/^            $length = strlen($hex);$/;"	v
-length	AttrDef/CSS/FontFamily.php	/^                $length = strlen($font);$/;"	v
-length	AttrDef/CSS/Length.php	/^        $length = HTMLPurifier_Length::make($string);$/;"	v
-length	AttrDef/CSS/Multiple.php	/^        $length = count($parts);$/;"	v
-length	AttrDef/CSS/Percentage.php	/^        $length = strlen($string);$/;"	v
-length	AttrDef/HTML/Color.php	/^        $length = strlen($hex);$/;"	v
-length	AttrDef/HTML/Length.php	/^        $length = strlen($string);$/;"	v
-length	AttrDef/HTML/MultiLength.php	/^        $length = strlen($string);$/;"	v
-length	AttrDef/HTML/Pixels.php	/^        $length = strlen($string);$/;"	v
-length	AttrDef/Lang.php	/^            $length = strlen($subtags[$i]);$/;"	v
-length	AttrDef/Lang.php	/^        $length = strlen($subtags[0]);$/;"	v
-length	AttrDef/Lang.php	/^        $length = strlen($subtags[1]);$/;"	v
-length	AttrDef/URI/Host.php	/^        $length = strlen($string);$/;"	v
-length	AttrTransform/Length.php	/^        $length = $this->confiscateAttr($attr, $this->name);$/;"	v
-length	Lexer/DirectLex.php	/^            $length = false;$/;"	v
-length	Lexer/DirectLex.php	/^            $length = strlen($html);$/;"	v
-length	Lexer/PH5P.php	/^                        $length = count($this->stack);$/;"	v
-length	PercentEncoder.php	/^            $length = strlen($part);$/;"	v
-length	Strategy/FixNesting.php	/^                $length = $j - $i + 1;$/;"	v
-length	Strategy/FixNesting.php	/^                $length = $j - $i - 1;$/;"	v
-level	HTMLModule/Tidy.php	/^        $level = $config->get('HTML.TidyLevel');$/;"	v
-levels	HTMLModule/Tidy.php	/^    public $levels = array(0 => 'none', 'light', 'medium', 'heavy');$/;"	v
-lexer	Lexer.php	/^                    $lexer = 'DOMLex';$/;"	v
-lexer	Lexer.php	/^                    $lexer = 'DirectLex';$/;"	v
-lexer	Lexer.php	/^            $lexer = $config->get('Core.LexerImpl');$/;"	v
-lexer	Lexer.php	/^            $lexer = $config;$/;"	v
-lexer	Lexer/PH5P.php	/^            $lexer = new HTMLPurifier_Lexer_DirectLex();$/;"	v
-li	HTMLModule/Legacy.php	/^        $li = $this->addBlankElement('li');$/;"	v
-li_types	HTMLModule/Tidy/XHTMLAndHTML4.php	/^            $li_types = $ul_types + $ol_types;$/;"	v
-line	ErrorCollector.php	/^        $line  = $token ? $token->line : $this->context->get('CurrentLine', true);$/;"	v
-line	ErrorCollector.php	/^        foreach ($this->lines as $line => $col_array) {$/;"	v
-line	ErrorCollector.php	/^    private function _renderStruct(&$ret, $struct, $line = null, $col = null) {$/;"	v
-line	StringHashParser.php	/^                    $line = trim($line);$/;"	v
-line	StringHashParser.php	/^            $line = fgets($fh);$/;"	v
-line	StringHashParser.php	/^            $line = rtrim($line, "\\n\\r");$/;"	v
-line	StringHashParser.php	/^            if (!$state && $line === '') continue;$/;"	v
-line	Token/Comment.php	/^    public function __construct($data, $line = null, $col = null) {$/;"	v
-line	Token/Text.php	/^    public function __construct($data, $line = null, $col = null) {$/;"	v
-line_height	AttrDef/CSS/Font.php	/^                                $line_height = $bits[$j];$/;"	v
-line_height	AttrDef/CSS/Font.php	/^                            $line_height = false;$/;"	v
-line_height	AttrDef/CSS/Font.php	/^                        $line_height = false;$/;"	v
-lines	ErrorCollector.php	/^    protected $lines = array();$/;"	v
-list	Config.php	/^        $list = array();$/;"	v
-list	HTMLDefinition.php	/^        $list = str_replace(array(' ', "\\t"), '', $list);$/;"	v
-list	HTMLModule.php	/^        if (is_string($list)) $list = func_get_args();$/;"	v
-list	Printer/HTMLDefinition.php	/^            $list = array();$/;"	v
-list	Printer/HTMLDefinition.php	/^        $list = array();$/;"	v
-list_of_children	ChildDef/Custom.php	/^        $list_of_children = '';$/;"	v
-list_of_children	ChildDef/Custom.php	/^        $list_of_children = ',' . rtrim($list_of_children, ',');$/;"	v
-listify	Language.php	/^    public function listify($array) {$/;"	f
-listify	Printer.php	/^    protected function listify($array, $polite = false) {$/;"	f
-listifyAttr	Printer/HTMLDefinition.php	/^    protected function listifyAttr($array) {$/;"	f
-listifyObjectList	Printer/HTMLDefinition.php	/^    protected function listifyObjectList($array) {$/;"	f
-listifyTagLookup	Printer/HTMLDefinition.php	/^    protected function listifyTagLookup($array) {$/;"	f
-load	IDAccumulator.php	/^    public function load($array_of_ids) {$/;"	f
-load	Language.php	/^    public function load() {$/;"	f
-loadArray	Config.php	/^    public function loadArray($config_array) {$/;"	f
-loadArray	Context.php	/^    public function loadArray($context_array) {$/;"	f
-loadArrayFromForm	Config.php	/^    public static function loadArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {$/;"	f
-loadIni	Config.php	/^    public function loadIni($filename) {$/;"	f
-loadLanguage	LanguageFactory.php	/^    public function loadLanguage($code) {$/;"	f
-lock	Config.php	/^        $lock = $this->lock;$/;"	v
-log	UnitConverter.php	/^        $log = (int) floor(log(abs($n), 10));$/;"	v
-lookup	AttrDef/CSS/BackgroundPosition.php	/^        $lookup = array($/;"	v
-lookup	AttrDef/CSS/Filter.php	/^        $lookup = array();$/;"	v
-lookup	ConfigSchema/InterchangeBuilder.php	/^    protected function lookup($array) {$/;"	f
-lookup	ContentSets.php	/^    public $lookup = array();$/;"	v
-lookup	HTMLModuleManager.php	/^        $lookup = $config->get('HTML.AllowedModules');$/;"	v
-lookup	VarParser.php	/^            $lookup = array_flip(HTMLPurifier_VarParser::$types);$/;"	v
-loops	Lexer/DirectLex.php	/^        $loops = 0;$/;"	v
-lower	AttrDef/CSS/Color.php	/^        $lower = strtolower($color);$/;"	v
-lowercase_string	AttrDef/CSS/Font.php	/^        $lowercase_string = strtolower($string);$/;"	v
-mBytes	Encoder.php	/^                        $mBytes = 1;$/;"	v
-mBytes	Encoder.php	/^                    $mBytes = 1;$/;"	v
-mBytes	Encoder.php	/^                    $mBytes = 2;$/;"	v
-mBytes	Encoder.php	/^                    $mBytes = 3;$/;"	v
-mBytes	Encoder.php	/^                    $mBytes = 4;$/;"	v
-mBytes	Encoder.php	/^                    $mBytes = 5;$/;"	v
-mBytes	Encoder.php	/^                    $mBytes = 6;$/;"	v
-mBytes	Encoder.php	/^        $mBytes = 1; \/\/ cached expected number of octets in the current sequence$/;"	v
-mState	Encoder.php	/^                        $mState = 0;$/;"	v
-mState	Encoder.php	/^                    $mState = 0;$/;"	v
-mState	Encoder.php	/^                    $mState = 1;$/;"	v
-mState	Encoder.php	/^                    $mState = 2;$/;"	v
-mState	Encoder.php	/^                    $mState = 3;$/;"	v
-mState	Encoder.php	/^                    $mState = 4;$/;"	v
-mState	Encoder.php	/^                    $mState = 5;$/;"	v
-mState	Encoder.php	/^        $mState = 0; \/\/ cached expected number of octets after the current octet$/;"	v
-mUcs4	Encoder.php	/^                        $mUcs4  = 0;$/;"	v
-mUcs4	Encoder.php	/^                    $mUcs4  = 0;$/;"	v
-mUcs4	Encoder.php	/^                    $mUcs4 = ($in);$/;"	v
-mUcs4	Encoder.php	/^                    $mUcs4 = ($mUcs4 & 0x03) << 24;$/;"	v
-mUcs4	Encoder.php	/^                    $mUcs4 = ($mUcs4 & 0x07) << 18;$/;"	v
-mUcs4	Encoder.php	/^                    $mUcs4 = ($mUcs4 & 0x0F) << 12;$/;"	v
-mUcs4	Encoder.php	/^                    $mUcs4 = ($mUcs4 & 0x1F) << 6;$/;"	v
-mUcs4	Encoder.php	/^                    $mUcs4 = ($mUcs4 & 1) << 30;$/;"	v
-mUcs4	Encoder.php	/^        $mUcs4  = 0; \/\/ cached Unicode character$/;"	v
-mainPhase	Lexer/PH5P.php	/^    private function mainPhase($token) {$/;"	f
-maintain_line_numbers	Lexer/DirectLex.php	/^            $maintain_line_numbers = $config->get('Core.CollectErrors');$/;"	v
-maintain_line_numbers	Lexer/DirectLex.php	/^        $maintain_line_numbers = $config->get('Core.MaintainLineNumbers');$/;"	v
-make	AttrDef.php	/^    public function make($string) {$/;"	f
-make	AttrDef/Enum.php	/^    public function make($string) {$/;"	f
-make	AttrDef/HTML/Bool.php	/^    public function make($string) {$/;"	f
-make	AttrDef/HTML/Pixels.php	/^    public function make($string) {$/;"	f
-make	AttrDef/URI.php	/^    public function make($string) {$/;"	f
-make	ConfigSchema/Interchange/Id.php	/^    public static function make($id) {$/;"	f
-make	DoctypeRegistry.php	/^    public function make($config) {$/;"	f
-make	Length.php	/^    static public function make($s) {$/;"	f
-makeFixes	HTMLModule/Tidy.php	/^    public function makeFixes() {}$/;"	f
-makeFixes	HTMLModule/Tidy/Name.php	/^    public function makeFixes() {$/;"	f
-makeFixes	HTMLModule/Tidy/Proprietary.php	/^    public function makeFixes() {$/;"	f
-makeFixes	HTMLModule/Tidy/Strict.php	/^    public function makeFixes() {$/;"	f
-makeFixes	HTMLModule/Tidy/XHTML.php	/^    public function makeFixes() {$/;"	f
-makeFixes	HTMLModule/Tidy/XHTMLAndHTML4.php	/^    public function makeFixes() {$/;"	f
-makeFixesForLevel	HTMLModule/Tidy.php	/^    public function makeFixesForLevel($fixes) {$/;"	f
-makeFromSerial	ConfigSchema.php	/^    public static function makeFromSerial() {$/;"	f
-makeLookup	HTMLModule.php	/^    public function makeLookup($list) {$/;"	f
-makeReplace	URIFilter/Munge.php	/^    protected function makeReplace($uri, $config, $context) {$/;"	f
-margin	CSSDefinition.php	/^        $margin =$/;"	v
-marker	Lexer/PH5P.php	/^                        $marker = end(array_keys($this->a_formatting, self::MARKER, true));$/;"	v
-markupDeclarationOpenState	Lexer/PH5P.php	/^    private function markupDeclarationOpenState() {$/;"	f
-match	AttrDef/URI/Host.php	/^        $match = preg_match("\/^($domainlabel\\.)*$toplabel\\.?$\/i", $string);$/;"	v
-matches	Lexer.php	/^        $matches = array();$/;"	v
-matches	URIParser.php	/^            $matches = array();$/;"	v
-matches	URIParser.php	/^        $matches = array();$/;"	v
-max	AttrDef/CSS/Length.php	/^    public function __construct($min = null, $max = null) {$/;"	v
-max	AttrDef/CSS/Multiple.php	/^    public function __construct($single, $max = 4) {$/;"	v
-max	AttrDef/HTML/Pixels.php	/^        else $max = (int) $string;$/;"	v
-max	AttrDef/HTML/Pixels.php	/^        if ($string === '') $max = null;$/;"	v
-max	CSSDefinition.php	/^            $max === null ?$/;"	v
-max	CSSDefinition.php	/^        $max = $config->get('CSS.MaxImgLength');$/;"	v
-max	HTMLModule/Image.php	/^        $max = $config->get('HTML.MaxImgLength');$/;"	v
-max	HTMLModule/SafeEmbed.php	/^        $max = $config->get('HTML.MaxImgLength');$/;"	v
-max	HTMLModule/SafeObject.php	/^        $max = $config->get('HTML.MaxImgLength');$/;"	v
-may	Bootstrap.php	/^ *      This class may be used without any other files from HTML Purifier.$/;"	c
-measures	AttrDef/CSS/BackgroundPosition.php	/^        $measures = array();$/;"	v
-merge	AttrCollections.php	/^                $merge = array_merge($merge, $this->info[$merge[$i]][0]);$/;"	v
-merge	AttrCollections.php	/^        $merge = $attr[0];$/;"	v
-mergeArrayFromForm	Config.php	/^    public function mergeArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true) {$/;"	f
-mergeIn	ElementDef.php	/^    public function mergeIn($def) {$/;"	f
-mergeInAttrIncludes	HTMLModule.php	/^    public function mergeInAttrIncludes(&$attr, $attr_includes) {$/;"	f
-mergeable_keys_list	LanguageFactory.php	/^    protected $mergeable_keys_list = array();$/;"	v
-mergeable_keys_map	LanguageFactory.php	/^    protected $mergeable_keys_map = array('messages' => true, 'errorNames' => true);$/;"	v
-messages	Language.php	/^    public $messages = array();$/;"	v
-messages	Language/messages/en-x-test.php	/^$messages = array($/;"	v
-messages	Language/messages/en-x-testmini.php	/^$messages = array($/;"	v
-messages	Language/messages/en.php	/^$messages = array($/;"	v
-method	DefinitionCacheFactory.php	/^        $method = $config->get('Cache.DefinitionImpl');$/;"	v
-minimized	AttrDef.php	/^    public $minimized = false;$/;"	v
-minimized	AttrDef/HTML/Bool.php	/^    public $minimized = true;$/;"	v
-module	HTMLDefinition.php	/^        $module  = $this->getAnonymousModule();$/;"	v
-module	HTMLDefinition.php	/^        $module = $this->getAnonymousModule();$/;"	v
-module	HTMLModuleManager.php	/^                $module = $original_module;$/;"	v
-module	HTMLModuleManager.php	/^                $module = $prefix . $original_module;$/;"	v
-module	HTMLModuleManager.php	/^            $module = $this->modules[$module_name];$/;"	v
-module	HTMLModuleManager.php	/^            $module = new $module();$/;"	v
-module	HTMLModuleManager.php	/^        if (is_object($module)) $module = $module->name;$/;"	v
-module_i	ContentSets.php	/^        foreach ($modules as $module_i => $module) {$/;"	v
-modules	ContentSets.php	/^        if (!is_array($modules)) $modules = array($modules);$/;"	v
-modules	Doctype.php	/^    public $modules = array();$/;"	v
-modules	DoctypeRegistry.php	/^        if (!is_array($modules)) $modules = array($modules);$/;"	v
-modules	HTMLModuleManager.php	/^        $modules = $this->doctype->modules;$/;"	v
-modules	HTMLModuleManager.php	/^        $modules = array_merge($modules, $this->userModules);$/;"	v
-modules	HTMLModuleManager.php	/^    public $modules = array();$/;"	v
-mq	Config.php	/^        $mq = $mq_fix && function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();$/;"	v
-msg	ErrorCollector.php	/^            $msg = $this->locale->formatMessage($msg, $args);$/;"	v
-msg	ErrorCollector.php	/^            $msg = $this->locale->getMessage($msg);$/;"	v
-msg	ErrorCollector.php	/^        if (!empty($subst)) $msg = strtr($msg, $subst);$/;"	v
-mul	UnitConverter.php	/^    private function mul($s1, $s2, $scale) {$/;"	f
-mungeRgb	AttrDef.php	/^    protected function mungeRgb($string) {$/;"	f
-muteErrorHandler	Encoder.php	/^    public static function muteErrorHandler() {}$/;"	f
-muteErrorHandler	Lexer/DOMLex.php	/^    public function muteErrorHandler($errno, $errstr) {}$/;"	f
-n	HTMLModuleManager.php	/^            $n = array();$/;"	v
-n	HTMLModuleManager.php	/^        foreach ($elements as $n => $v) {$/;"	v
-n	Injector/SafeObject.php	/^                $n = $token->attr['name'];$/;"	v
-n	Length.php	/^        $n = substr($s, 0, $n_length);$/;"	v
-n	Length.php	/^     * String unit. False is permitted if $n = 0.$/;"	v
-n	Lexer/PH5P.php	/^                                $n = -1;$/;"	v
-n	UnitConverter.php	/^                $n = $this->mul($n, $factor, $cp);$/;"	v
-n	UnitConverter.php	/^                $n = '0';$/;"	v
-n	UnitConverter.php	/^                $n = bcadd($n, $neg . '0.' .  str_repeat('0', $rp) . '5', $rp + 1);$/;"	v
-n	UnitConverter.php	/^                $n = bcadd($n, $neg . '5' . str_repeat('0', $new_log - $sigfigs), 0);$/;"	v
-n	UnitConverter.php	/^                $n = bcdiv($n, '1', $rp);$/;"	v
-n	UnitConverter.php	/^                $n = substr($n, 0, $sigfigs + strlen($neg)) . str_repeat('0', $new_log - $sigfigs + 1);$/;"	v
-n	UnitConverter.php	/^            $n = $this->mul($n, self::$units[$state][$dest_state][1], $cp);$/;"	v
-n	UnitConverter.php	/^        $n    = $length->getN();$/;"	v
-n	UnitConverter.php	/^        $n = $this->round($n, $sigfigs);$/;"	v
-n	UnitConverter.php	/^        $n = ltrim($n, '0+-');$/;"	v
-n	UnitConverter.php	/^        $n = rtrim($n, '.');$/;"	v
-n	UnitConverter.php	/^        if (strpos($n, '.') !== false) $n = rtrim($n, '0');$/;"	v
-n_length	Length.php	/^        $n_length = strspn($s, '1234567890.+-');$/;"	v
-name	AttrCollections.php	/^        foreach ($this->info as $name => $attr) {$/;"	v
-name	AttrDef/HTML/Class.php	/^        $name = $config->getDefinition('HTML')->doctype->name;$/;"	v
-name	AttrDef/HTML/Class.php	/^        if ($name == "XHTML 1.1" || $name == "XHTML 2.0") {$/;"	v
-name	AttrTransform/NameSync.php	/^        $name = $attr['name'];$/;"	v
-name	AttrTransform/SafeEmbed.php	/^    public $name = "SafeEmbed";$/;"	v
-name	AttrTransform/SafeObject.php	/^    public $name = "SafeObject";$/;"	v
-name	AttrTransform/SafeParam.php	/^    public $name = "SafeParam";$/;"	v
-name	CSSDefinition.php	/^                $name = htmlspecialchars($name);$/;"	v
-name	CSSDefinition.php	/^            foreach ($allowed_attributes as $name => $d) {$/;"	v
-name	CSSDefinition.php	/^            foreach ($this->info as $name => $d) {$/;"	v
-name	ChildDef.php	/^     * Type of child definition, usually right-most part of class name lowercase.$/;"	c
-name	Config.php	/^        foreach ($lookup as $name => $b) $list[] = $name;$/;"	v
-name	Config.php	/^        foreach ($this->plist->squash() as $name => $value) {$/;"	v
-name	DefinitionCache/Decorator/Cleanup.php	/^    public $name = 'Cleanup';$/;"	v
-name	DefinitionCache/Decorator/Memory.php	/^    public $name = 'Memory';$/;"	v
-name	DefinitionCacheFactory.php	/^     * @param $long Full class name of cache object, for construction$/;"	c
-name	DoctypeRegistry.php	/^        $name = $doctype->name;$/;"	v
-name	Filter/ExtractStyleBlocks.php	/^                foreach ($style as $name => $value) {$/;"	v
-name	Filter/ExtractStyleBlocks.php	/^    public $name = 'ExtractStyleBlocks';$/;"	v
-name	Filter/YouTube.php	/^    public $name = 'YouTube';$/;"	v
-name	HTMLDefinition.php	/^            foreach ($this->info as $name => $d) {$/;"	v
-name	HTMLModule/Bdo.php	/^    public $name = 'Bdo';$/;"	v
-name	HTMLModule/CommonAttributes.php	/^    public $name = 'CommonAttributes';$/;"	v
-name	HTMLModule/Edit.php	/^    public $name = 'Edit';$/;"	v
-name	HTMLModule/Forms.php	/^    public $name = 'Forms';$/;"	v
-name	HTMLModule/Hypertext.php	/^    public $name = 'Hypertext';$/;"	v
-name	HTMLModule/Image.php	/^    public $name = 'Image';$/;"	v
-name	HTMLModule/Legacy.php	/^    public $name = 'Legacy';$/;"	v
-name	HTMLModule/List.php	/^    public $name = 'List';$/;"	v
-name	HTMLModule/Name.php	/^    public $name = 'Name';$/;"	v
-name	HTMLModule/NonXMLCommonAttributes.php	/^    public $name = 'NonXMLCommonAttributes';$/;"	v
-name	HTMLModule/Object.php	/^    public $name = 'Object';$/;"	v
-name	HTMLModule/Presentation.php	/^    public $name = 'Presentation';$/;"	v
-name	HTMLModule/Proprietary.php	/^    public $name = 'Proprietary';$/;"	v
-name	HTMLModule/Ruby.php	/^    public $name = 'Ruby';$/;"	v
-name	HTMLModule/SafeEmbed.php	/^    public $name = 'SafeEmbed';$/;"	v
-name	HTMLModule/SafeObject.php	/^    public $name = 'SafeObject';$/;"	v
-name	HTMLModule/Scripting.php	/^    public $name = 'Scripting';$/;"	v
-name	HTMLModule/StyleAttribute.php	/^    public $name = 'StyleAttribute';$/;"	v
-name	HTMLModule/Tables.php	/^    public $name = 'Tables';$/;"	v
-name	HTMLModule/Target.php	/^    public $name = 'Target';$/;"	v
-name	HTMLModule/Text.php	/^    public $name = 'Text';$/;"	v
-name	HTMLModule/Tidy.php	/^        foreach ($fixes as $name => $fix) {$/;"	v
-name	HTMLModule/Tidy/Name.php	/^    public $name = 'Tidy_Name';$/;"	v
-name	HTMLModule/Tidy/Proprietary.php	/^    public $name = 'Tidy_Proprietary';$/;"	v
-name	HTMLModule/Tidy/Strict.php	/^    public $name = 'Tidy_Strict';$/;"	v
-name	HTMLModule/Tidy/Transitional.php	/^    public $name = 'Tidy_Transitional';$/;"	v
-name	HTMLModule/Tidy/XHTML.php	/^    public $name = 'Tidy_XHTML';$/;"	v
-name	HTMLModule/XMLCommonAttributes.php	/^    public $name = 'XMLCommonAttributes';$/;"	v
-name	HTMLModuleManager.php	/^            foreach ($module->info as $name => $def) {$/;"	v
-name	HTMLModuleManager.php	/^            foreach ($module->info as $name => $v) {$/;"	v
-name	HTMLModuleManager.php	/^     * module's class name. This array is usually lazy loaded, but a$/;"	c
-name	Injector/AutoParagraph.php	/^    public $name = 'AutoParagraph';$/;"	v
-name	Injector/DisplayLinkURI.php	/^    public $name = 'DisplayLinkURI';$/;"	v
-name	Injector/Linkify.php	/^    public $name = 'Linkify';$/;"	v
-name	Injector/PurifierLinkify.php	/^    public $name = 'PurifierLinkify';$/;"	v
-name	Injector/SafeObject.php	/^            foreach ($this->addParam as $name => $value) {$/;"	v
-name	Injector/SafeObject.php	/^    public $name = 'SafeObject';$/;"	v
-name	Lexer/PH5P.php	/^        $name = $node->tagName;$/;"	v
-name	Printer/CSSDefinition.php	/^            $name = $this->getClass($obj, 'AttrDef_');$/;"	v
-name	Printer/HTMLDefinition.php	/^        foreach ($array as $name => $discard) {$/;"	v
-name	Printer/HTMLDefinition.php	/^        foreach ($array as $name => $obj) {$/;"	v
-name	Printer/HTMLDefinition.php	/^        foreach ($this->def->info as $name => $def) {$/;"	v
-name	Printer/HTMLDefinition.php	/^        foreach ($this->def->info_content_sets as $name => $lookup) {$/;"	v
-name	Token/Text.php	/^    public $name = '#PCDATA'; \/**< PCDATA tag name compatible with DTD. *\/$/;"	v
-name	URIDefinition.php	/^        foreach ($this->filters as $name => $f) {$/;"	v
-name	URIDefinition.php	/^        foreach ($this->postFilters as $name => $f) {$/;"	v
-name	URIDefinition.php	/^        foreach ($this->registeredFilters as $name => $filter) {$/;"	v
-name	URIFilter/DisableExternal.php	/^    public $name = 'DisableExternal';$/;"	v
-name	URIFilter/DisableExternalResources.php	/^    public $name = 'DisableExternalResources';$/;"	v
-name	URIFilter/HostBlacklist.php	/^    public $name = 'HostBlacklist';$/;"	v
-name	URIFilter/MakeAbsolute.php	/^    public $name = 'MakeAbsolute';$/;"	v
-name	URIFilter/Munge.php	/^    public $name = 'Munge';$/;"	v
-names	Printer/HTMLDefinition.php	/^     * Listifies a list of objects by retrieving class names and internal state$/;"	c
-namespace	Config.php	/^                $namespace = $key;$/;"	v
-namespace	Config.php	/^            $namespace = $key;$/;"	v
-namespace	Config.php	/^        if ($namespace == 'HTML' || $namespace == 'CSS' || $namespace == 'URI') {$/;"	v
-namespace_values	Config.php	/^                $namespace_values = $value;$/;"	v
-needed	Injector.php	/^    public $needed = array();$/;"	v
-needed	Injector/AutoParagraph.php	/^    public $needed = array('p');$/;"	v
-needed	Injector/DisplayLinkURI.php	/^    public $needed = array('a');$/;"	v
-needed	Injector/Linkify.php	/^    public $needed = array('a' => array('href'));$/;"	v
-needed	Injector/PurifierLinkify.php	/^    public $needed = array('a' => array('href'));$/;"	v
-needed	Injector/SafeObject.php	/^    public $needed = array('object', 'param');$/;"	v
-needs_end	Injector/AutoParagraph.php	/^                    $needs_end = true;$/;"	v
-needs_end	Injector/AutoParagraph.php	/^        $needs_end   = false;$/;"	v
-needs_start	Injector/AutoParagraph.php	/^                        $needs_start = true;$/;"	v
-needs_start	Injector/AutoParagraph.php	/^        $needs_start = false;$/;"	v
-needs_tracking	Lexer.php	/^        $needs_tracking =$/;"	v
-neg	UnitConverter.php	/^        $neg = $n < 0 ? '-' : ''; \/\/ Negative sign$/;"	v
-negative	AttrDef/Integer.php	/^        $negative = true, $zero = true, $positive = true$/;"	v
-negative	AttrDef/Integer.php	/^    protected $negative = true;$/;"	v
-nest	Injector/SafeObject.php	/^            $nest = count($this->currentNesting) - 1;$/;"	v
-nesting	ChildDef/Custom.php	/^        $nesting = 0; \/\/ depth into the nest$/;"	v
-nesting	ChildDef/Required.php	/^        $nesting = 0;$/;"	v
-nesting	ChildDef/Table.php	/^        $nesting = 0; \/\/ current depth so we can determine nodes$/;"	v
-nesting	Injector.php	/^        if ($nesting === null) $nesting = 0;$/;"	v
-nesting	Injector/AutoParagraph.php	/^        else $nesting = 0;$/;"	v
-nesting	Injector/AutoParagraph.php	/^        if ($current instanceof HTMLPurifier_Token_Start) $nesting = 1;$/;"	v
-new	Injector/SafeObject.php	/^            $new = array($token);$/;"	v
-new	Printer/HTMLDefinition.php	/^                $new = $this->getClass($new, 'TagTransform_');$/;"	v
-new	VarParser/Flexible.php	/^                        $new = array();$/;"	v
-new_cache	DefinitionCacheFactory.php	/^            $new_cache = $decorator->decorate($cache);$/;"	v
-new_data	Lexer/DOMLex.php	/^                $new_data = trim($data);$/;"	v
-new_declarations	AttrDef/CSS.php	/^        $new_declarations = '';$/;"	v
-new_decls	Filter/ExtractStyleBlocks.php	/^            $new_decls = array();$/;"	v
-new_def	HTMLModuleManager.php	/^            $new_def = clone $module->info[$name];$/;"	v
-new_font	AttrDef/CSS/FontFamily.php	/^                $new_font = '';$/;"	v
-new_html	Lexer/PH5P.php	/^        $new_html = $this->normalize($html, $config, $context);$/;"	v
-new_html	Lexer/PH5P.php	/^        $new_html = $this->wrapHTML($new_html, $config, $context);$/;"	v
-new_key	Token/Tag.php	/^                $new_key = strtolower($key);$/;"	v
-new_length	AttrDef/CSS/URI.php	/^            $new_length = strlen($uri) - 1;$/;"	v
-new_length	AttrDef/CSS/URI.php	/^        $new_length = strlen($uri_string) - 1;$/;"	v
-new_log	UnitConverter.php	/^        $new_log = (int) floor(log(abs($n), 10)); \/\/ Number of digits left of decimal - 1$/;"	v
-new_parts	AttrDef/CSS/Color.php	/^            $new_parts = array();$/;"	v
-new_selector	Filter/ExtractStyleBlocks.php	/^                    $new_selector = array(); \/\/ because multiple ones are possible$/;"	v
-new_stack	URIFilter/MakeAbsolute.php	/^            $new_stack = $this->_collapseStack($new_stack);$/;"	v
-new_stack	URIFilter/MakeAbsolute.php	/^            $new_stack = array_merge($this->basePathStack, $stack);$/;"	v
-new_string	AttrDef/Lang.php	/^        $new_string = $subtags[0];$/;"	v
-new_struct	ErrorCollector.php	/^        $new_struct = new HTMLPurifier_ErrorStruct();$/;"	v
-new_tag	TagTransform/Font.php	/^            $new_tag = clone $tag;$/;"	v
-new_tag	TagTransform/Font.php	/^        $new_tag = clone $tag;$/;"	v
-new_tag	TagTransform/Simple.php	/^        $new_tag = clone $tag;$/;"	v
-new_token	Strategy/MakeWellFormed.php	/^                        $new_token = new HTMLPurifier_Token_End($parent->name);$/;"	v
-new_token	Strategy/MakeWellFormed.php	/^                $new_token = new HTMLPurifier_Token_End($skipped_tags[$j]->name);$/;"	v
-new_triad	AttrDef/CSS/Color.php	/^            $new_triad = implode(',', $new_parts);$/;"	v
-new_uri	URIFilter/Munge.php	/^        $new_uri = $this->parser->parse($new_uri);$/;"	v
-new_uri	URIFilter/Munge.php	/^        $new_uri = strtr($this->target, $this->replace);$/;"	v
-next	Injector/RemoveEmpty.php	/^            $next = $this->inputTokens[$i];$/;"	v
-next	Injector/RemoveEmpty.php	/^        $next = false;$/;"	v
-next_node	Lexer/PH5P.php	/^        $next_node = strtolower($this->characters('A-Za-z', $this->char + 1));$/;"	v
-nl	Generator.php	/^        $nl = $this->config->get('Output.Newline');$/;"	v
-nl	Generator.php	/^        if ($nl === null) $nl = PHP_EOL;$/;"	v
-nl	Lexer/DirectLex.php	/^        $nl = "\\n";$/;"	v
-nl_pos	Lexer/DirectLex.php	/^                $nl_pos = strrpos($html, $nl, $rcursor - $length);$/;"	v
-node	Lexer/PH5P.php	/^                                $node = $clone;$/;"	v
-node	Lexer/PH5P.php	/^                                $node = $this->stack[$n];$/;"	v
-node	Lexer/PH5P.php	/^                        $node = $furthest_block;$/;"	v
-node	Lexer/PH5P.php	/^                        $node = $this->stack[$n];$/;"	v
-node	Lexer/PH5P.php	/^                        $node = end($this->stack);$/;"	v
-node	Lexer/PH5P.php	/^                    $node = end($this->stack)->nodeName;$/;"	v
-node	Lexer/PH5P.php	/^            $node = $this->stack[$leng - 1 - $n];$/;"	v
-node	Lexer/PH5P.php	/^            $node = $this->stack[$n];$/;"	v
-node	Lexer/PH5P.php	/^            $node = end($this->stack)->nodeName;$/;"	v
-node	Lexer/PH5P.php	/^        $node = end($this->stack);$/;"	v
-nonSpecialEntityCallback	EntityParser.php	/^    protected function nonSpecialEntityCallback($matches) {$/;"	f
-non_negative	AttrDef/CSS/Number.php	/^    protected $non_negative = false;$/;"	v
-non_xml	HTMLModuleManager.php	/^        $non_xml = array('NonXMLCommonAttributes');$/;"	v
-none	AttrDef/CSS/Background.php	/^        $none = false;$/;"	v
-none	AttrDef/CSS/ListStyle.php	/^                    else $none = true;$/;"	v
-none	AttrDef/CSS/ListStyle.php	/^        $none = false;$/;"	v
-normalize	Lexer.php	/^    public function normalize($html, $config, $context) {$/;"	f
-normalize	PercentEncoder.php	/^    public function normalize($string) {$/;"	f
-notifyEnd	Injector.php	/^    public function notifyEnd($token) {}$/;"	f
-ns	Printer/ConfigForm.php	/^        foreach ($all as $ns => $directives) {$/;"	v
-num	AttrDef/CSS/Color.php	/^                    $num = (float) substr($part, 0, $length - 1);$/;"	v
-num	AttrDef/CSS/Color.php	/^                    $num = (int) $part;$/;"	v
-num	AttrDef/CSS/Color.php	/^                    if ($num < 0) $num = 0;$/;"	v
-num	AttrDef/CSS/Color.php	/^                    if ($num > 100) $num = 100;$/;"	v
-num	AttrDef/CSS/Color.php	/^                    if ($num > 255) $num = 255;$/;"	v
-num	AttrDef/CSS/Multiple.php	/^        for ($i = 0, $num = 0; $i < $length && $num < $this->max; $i++) {$/;"	v
-num	Printer/HTMLDefinition.php	/^    protected function heavyHeader($text, $num = 1) {$/;"	v
-num_amp	Lexer.php	/^        $num_amp = substr_count($string, '&') - substr_count($string, '& ') -$/;"	v
-num_amp_2	Lexer.php	/^        $num_amp_2 = substr_count($string, '&') - substr_count($string, '& ') -$/;"	v
-num_equal	Lexer/DirectLex.php	/^        $num_equal = substr_count($string, '=');$/;"	v
-num_esc_amp	Lexer.php	/^        $num_esc_amp = substr_count($string, '&amp;');$/;"	v
-num_subtags	AttrDef/Lang.php	/^        $num_subtags = count($subtags);$/;"	v
-number	AttrDef/CSS/Number.php	/^                $number = substr($number, 1);$/;"	v
-number	AttrDef/CSS/Number.php	/^            $number = ltrim($number, '0');$/;"	v
-number	AttrDef/CSS/Number.php	/^        $number = $this->parseCDATA($number);$/;"	v
-number	AttrDef/CSS/Percentage.php	/^        $number = $this->number_def->validate($number, $config, $context);$/;"	v
-number	AttrDef/CSS/Percentage.php	/^        $number = substr($string, 0, $length - 1);$/;"	v
-nvalue	Printer/ConfigForm.php	/^                    $nvalue = '';$/;"	v
-nvar	VarParser/Flexible.php	/^                        $nvar = array();$/;"	v
-obj	ConfigSchema.php	/^        $obj = new stdclass();$/;"	v
-obj	ConfigSchema.php	/^        $obj = new stdclass;$/;"	v
-object	HTMLModule/SafeObject.php	/^        $object = $this->addElement($/;"	v
-objectStack	Injector/SafeObject.php	/^    protected $objectStack = array();$/;"	v
-oct	AttrDef/URI/IPv4.php	/^        $oct = '(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])'; \/\/ 0-255$/;"	v
-of	Printer.php	/^     * @param $obj Object to determine class of$/;"	c
-of	Printer.php	/^     * Retrieves the class of an object without prefixes, as well as metadata$/;"	c
-of	Token/Tag.php	/^ * Abstract class of a tag token (start, end or empty), and its behavior.$/;"	c
-offsetGet	StringHash.php	/^    public function offsetGet($index) {$/;"	f
-ok	AttrDef/CSS.php	/^                    $ok = true;$/;"	v
-ok	AttrDef/CSS.php	/^            $ok = false;$/;"	v
-ok	AttrDef/URI.php	/^            $ok = true;$/;"	v
-ok	AttrDef/URI.php	/^        $ok = false;$/;"	v
-ok	AttrValidator.php	/^        $ok =& $context->get('IDAccumulator', true);$/;"	v
-ok	HTMLModuleManager.php	/^                    $ok = true;$/;"	v
-ok	HTMLModuleManager.php	/^            $ok = false;$/;"	v
-ok	Injector/AutoParagraph.php	/^                $ok = $result;$/;"	v
-ok	Injector/AutoParagraph.php	/^        $ok = false;$/;"	v
-ok	Strategy/MakeWellFormed.php	/^                $ok = true;$/;"	v
-ok	Strategy/MakeWellFormed.php	/^            $ok = false;$/;"	v
-ok	Strategy/RemoveForeignElements.php	/^                                $ok = false;$/;"	v
-ok	Strategy/RemoveForeignElements.php	/^                        $ok = true;$/;"	v
-okay	ChildDef/Custom.php	/^        $okay =$/;"	v
-ol	HTMLModule/Legacy.php	/^        $ol = $this->addBlankElement('ol');$/;"	v
-ol_types	HTMLModule/Tidy/XHTMLAndHTML4.php	/^            $ol_types = array($/;"	v
-old	DefinitionCache/Serializer.php	/^            $old = umask(0022); \/\/ disable group and world writes$/;"	v
-old	Lexer/DOMLex.php	/^                $old = $html;$/;"	v
-old	Printer/HTMLDefinition.php	/^            foreach ($def->info_tag_transform as $old => $new) {$/;"	v
-old	Strategy/MakeWellFormed.php	/^        $old = array_splice($this->tokens, $this->t, $delete, $token);$/;"	v
-oldVersion	Lexer/DirectLex.php	/^            $oldVersion = version_compare(PHP_VERSION, '5.1', '<');$/;"	v
-old_lookup	ContentSets.php	/^            $old_lookup = $this->lookup;$/;"	v
-old_lookup	ContentSets.php	/^        $old_lookup = false;$/;"	v
-oldskip	Strategy/MakeWellFormed.php	/^            $oldskip = isset($old[0]) ? $old[0]->skip : array();$/;"	v
-only	AttrTransform/SafeParam.php	/^ *      This class only supports Flash. In the future, Quicktime support$/;"	c
-openHandler	Lexer/PEARSax3.php	/^    public function openHandler(&$parser, $name, $attrs, $closed) {$/;"	f
-open_quote	Lexer/DirectLex.php	/^            $open_quote = ($first_char == '"' || $first_char == "'");$/;"	v
-original	AttrDef/URI/IPv6.php	/^        $original = $aIP;$/;"	v
-original_module	HTMLModuleManager.php	/^            $original_module = $module;$/;"	v
-original_name	Strategy/RemoveForeignElements.php	/^                    $original_name = $token->name;$/;"	v
-other_directive	ConfigSchema/Validator.php	/^                $other_directive = $this->aliases[$s];$/;"	v
-ourHostParts	URIFilter/DisableExternal.php	/^    protected $ourHostParts = false;$/;"	v
-our_host	URIFilter/DisableExternal.php	/^        $our_host = $config->getDefinition('URI')->host;$/;"	v
-out	Encoder.php	/^        $out = '';$/;"	v
-overload	HTMLModuleManager.php	/^    public function registerModule($module, $overload = false) {$/;"	v
-p	HTMLModule/Legacy.php	/^        $p = $this->addBlankElement('p');$/;"	v
-p	HTMLModule/Text.php	/^        $p = $this->addElement('p', 'Block', 'Inline', 'Common');$/;"	v
-p	TokenFactory.php	/^        $p = clone $this->p_comment;$/;"	v
-p	TokenFactory.php	/^        $p = clone $this->p_empty;$/;"	v
-p	TokenFactory.php	/^        $p = clone $this->p_end;$/;"	v
-p	TokenFactory.php	/^        $p = clone $this->p_start;$/;"	v
-p	TokenFactory.php	/^        $p = clone $this->p_text;$/;"	v
-padding	CSSDefinition.php	/^        $padding =$/;"	v
-par	Injector/AutoParagraph.php	/^            $par = $raw_paragraphs[$i];$/;"	v
-par	Injector/AutoParagraph.php	/^        $par = new HTMLPurifier_Token_Start('p');$/;"	v
-paragraphs	Injector/AutoParagraph.php	/^        $paragraphs  = array(); \/\/ without empty paragraphs$/;"	v
-param	HTMLModule/SafeObject.php	/^        $param = $this->addElement('param', false, 'Empty', false,$/;"	v
-paramStack	Injector/SafeObject.php	/^    protected $paramStack  = array();$/;"	v
-parameters	AttrDef/CSS/Filter.php	/^        $parameters = substr($value, $cursor, $parameters_length);$/;"	v
-parameters_length	AttrDef/CSS/Filter.php	/^        $parameters_length = strcspn($value, ')', $cursor);$/;"	v
-params	AttrDef/CSS/Filter.php	/^        $params = explode(',', $parameters);$/;"	v
-params	HTMLModule/Tidy.php	/^        $params = array();$/;"	v
-parent	Config.php	/^        $parent = $parent ? $parent : $definition->defaultPlist;$/;"	v
-parent	Config.php	/^    public function __construct($definition, $parent = null) {$/;"	v
-parent	HTMLDefinition.php	/^        $parent = $config->get('HTML.Parent');$/;"	v
-parent	Injector.php	/^            $parent = $this->htmlDefinition->info[$parent_token->name];$/;"	v
-parent	Injector.php	/^            $parent = $this->htmlDefinition->info_parent_def;$/;"	v
-parent	Strategy/MakeWellFormed.php	/^                    $parent = array_pop($this->stack);$/;"	v
-parent_def	Strategy/FixNesting.php	/^                    $parent_def   = $definition->info[$parent_name];$/;"	v
-parent_def	Strategy/FixNesting.php	/^                    $parent_def   = $definition->info_parent_def;$/;"	v
-parent_index	Strategy/FixNesting.php	/^                $parent_index = $parent_name = $parent_def = null;$/;"	v
-parent_index	Strategy/FixNesting.php	/^                $parent_index = $stack[$count-1];$/;"	v
-parent_name	Strategy/FixNesting.php	/^                $parent_name  = $tokens[$parent_index]->name;$/;"	v
-parent_name	Strategy/FixNesting.php	/^        $parent_name = $definition->info_parent;$/;"	v
-parent_result	AttrDef/HTML/Length.php	/^        $parent_result = parent::validate($string, $config, $context);$/;"	v
-parent_result	AttrDef/HTML/MultiLength.php	/^        $parent_result = parent::validate($string, $config, $context);$/;"	v
-parent_token	Injector.php	/^            $parent_token = array_pop($this->currentNesting);$/;"	v
-parse	URIParser.php	/^    public function parse($uri) {$/;"	f
-parse	VarParser.php	/^    final public function parse($var, $type, $allow_null = false) {$/;"	f
-parseAttributeString	Lexer/DirectLex.php	/^    public function parseAttributeString($string, $config, $context) {$/;"	f
-parseCDATA	AttrDef.php	/^    public function parseCDATA($string) {$/;"	f
-parseContents	HTMLModule.php	/^    public function parseContents($contents) {$/;"	f
-parseData	Lexer.php	/^    public function parseData($string) {$/;"	f
-parseFile	StringHashParser.php	/^    public function parseFile($file) {$/;"	f
-parseHandle	StringHashParser.php	/^    protected function parseHandle($fh) {$/;"	f
-parseImplementation	VarParser.php	/^    protected function parseImplementation($var, $type, $allow_null) {$/;"	f
-parseImplementation	VarParser/Flexible.php	/^    protected function parseImplementation($var, $type, $allow_null) {$/;"	f
-parseImplementation	VarParser/Native.php	/^    protected function parseImplementation($var, $type, $allow_null) {$/;"	f
-parseMultiFile	StringHashParser.php	/^    public function parseMultiFile($file) {$/;"	f
-parseTinyMCEAllowedList	HTMLDefinition.php	/^    public function parseTinyMCEAllowedList($list) {$/;"	f
-parser	ConfigSchema/InterchangeBuilder.php	/^        $parser = new HTMLPurifier_StringHashParser();$/;"	v
-parser	Lexer/PEARSax3.php	/^        $parser = new XML_HTMLSax3();$/;"	v
-parser	Lexer/PH5P.php	/^            $parser = new HTML5($new_html);$/;"	v
-parser	URIDefinition.php	/^            $parser = new HTMLPurifier_URIParser();$/;"	v
-part	AttrDef/CSS/Color.php	/^                $part = trim($part);$/;"	v
-part	AttrDef/HTML/LinkTypes.php	/^            $part = strtolower(trim($part));$/;"	v
-parts	AttrDef/CSS/Color.php	/^            $parts = explode(',', $triad);$/;"	v
-parts	AttrDef/CSS/Multiple.php	/^        $parts = explode(' ', $string); \/\/ parseCDATA replaced \\r, \\t and \\n$/;"	v
-parts	AttrDef/CSS/TextDecoration.php	/^        $parts = explode(' ', $string);$/;"	v
-parts	AttrDef/HTML/LinkTypes.php	/^        $parts = explode(' ', $string);$/;"	v
-parts	PercentEncoder.php	/^        $parts = explode('%', $string);$/;"	v
-path	URIParser.php	/^        $path       = $matches[5]; \/\/ always present, can be empty$/;"	v
-path_parts	URI.php	/^        $path_parts = array();$/;"	v
-pattern	AttrDef/HTML/Nmtokens.php	/^        $pattern = '\/(?:(?<=\\s)|\\A)'. \/\/ look behind for space or string start$/;"	v
-pays	UnitConverter.php	/^     *      About precision: This conversion function pays very special$/;"	f
-pcdata_allowed	ChildDef/Required.php	/^        $pcdata_allowed = isset($this->elements['#PCDATA']);$/;"	v
-pcode	LanguageFactory.php	/^        $pcode = str_replace('-', '_', $code); \/\/ make valid PHP classname$/;"	v
-performInclusions	AttrCollections.php	/^    public function performInclusions(&$attr) {$/;"	f
-performs	AttrValidator.php	/^     *     because the operation this class performs on the token are$/;"	c
-plain	Injector/RemoveEmpty.php	/^                    $plain = str_replace("\\xC2\\xA0", "", $next->data);$/;"	v
-points	AttrDef/HTML/Length.php	/^        $points = (int) $points;$/;"	v
-points	AttrDef/HTML/Length.php	/^        $points = substr($string, 0, $length - 1);$/;"	v
-polite	Printer.php	/^    protected function listify($array, $polite = false) {$/;"	v
-populate	HTMLModule/Tidy.php	/^    public function populate($fixes) {$/;"	f
-port	URIParser.php	/^            $port       = !empty($matches[4]) ? (int) $matches[5] : null;$/;"	v
-port	URIParser.php	/^            $port = $host = $userinfo = null;$/;"	v
-position	Token.php	/^    public function position($l = null, $c = null) {$/;"	f
-position_comment_end	Lexer/DirectLex.php	/^                        $position_comment_end = strlen($html);$/;"	v
-position_comment_end	Lexer/DirectLex.php	/^                    $position_comment_end = strpos($html, '-->', $cursor);$/;"	v
-position_first_space	Lexer/DirectLex.php	/^                $position_first_space = strcspn($segment, $this->_whitespace);$/;"	v
-position_next_gt	Lexer/DirectLex.php	/^            $position_next_gt = strpos($html, '>', $cursor);$/;"	v
-position_next_lt	Lexer/DirectLex.php	/^            $position_next_lt = strpos($html, '<', $cursor);$/;"	v
-positive	AttrDef/Integer.php	/^    protected $positive = true;$/;"	v
-post	URIFilter.php	/^    public $post = false;$/;"	v
-post	URIFilter/Munge.php	/^    public $post = true;$/;"	v
-postFilter	Filter.php	/^    public function postFilter($html, $config, $context) {$/;"	f
-postFilter	Filter/YouTube.php	/^    public function postFilter($html, $config, $context) {$/;"	f
-postFilter	URIDefinition.php	/^    public function postFilter(&$uri, $config, $context) {$/;"	f
-postFilterCallback	Filter/YouTube.php	/^    protected function postFilterCallback($matches) {$/;"	f
-postFilters	URIDefinition.php	/^    protected $postFilters = array();$/;"	v
-postProcess	ConfigSchema.php	/^    public function postProcess() {$/;"	f
-post_regex	Filter/YouTube.php	/^        $post_regex = '#<span class="youtube-embed">([A-Za-z0-9\\-_]+)<\/span>#';$/;"	v
-pre	AttrDef/URI/IPv6.php	/^        $pre = '(?:\/(?:12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))';   \/\/ \/0 - \/128$/;"	v
-pre	HTMLModule/Legacy.php	/^        $pre = $this->addBlankElement('pre');$/;"	v
-pre	HTMLModule/Text.php	/^        $pre = $this->addElement('pre', 'Block', 'Inline', 'Common');$/;"	v
-preFilter	Filter.php	/^    public function preFilter($html, $config, $context) {$/;"	f
-preFilter	Filter/ExtractStyleBlocks.php	/^    public function preFilter($html, $config, $context) {$/;"	f
-preFilter	Filter/YouTube.php	/^    public function preFilter($html, $config, $context) {$/;"	f
-pre_regex	Filter/YouTube.php	/^        $pre_regex = '#<object[^>]+>.+?'.$/;"	v
-pre_replace	Filter/YouTube.php	/^        $pre_replace = '<span class="youtube-embed">\\1<\/span>';$/;"	v
-precise	UnitConverter.php	/^            $precise = (string) round(substr($r, 0, strlen($r) + $scale), -1);$/;"	v
-prefix	AttrDef/HTML/ID.php	/^        $prefix = $config->get('Attr.IDPrefix');$/;"	v
-prefix	ConfigSchema/Validator.php	/^        else $prefix = ucfirst($this->getFormattedContext());$/;"	v
-prefix	ConfigSchema/Validator.php	/^        if ($target !== false) $prefix = ucfirst($target) . ' in ' .  $this->getFormattedContext();$/;"	v
-prefix	HTMLModuleManager.php	/^     * Adds a class prefix that registerModule() will use to resolve a$/;"	c
-prefix	Printer.php	/^        $prefix = 'HTMLPurifier_' . $sec_prefix;$/;"	v
-prefix	Printer.php	/^        if (!$five) $prefix = strtolower($prefix);$/;"	v
-prefixes	HTMLModuleManager.php	/^    public $prefixes = array('HTMLPurifier_HTMLModule_');$/;"	v
-prepare	Injector.php	/^    public function prepare($config, $context) {$/;"	f
-prepare	Injector/PurifierLinkify.php	/^    public function prepare($config, $context) {$/;"	f
-prepare	Injector/RemoveEmpty.php	/^    public function prepare($config, $context) {$/;"	f
-prepare	Injector/SafeObject.php	/^    public function prepare($config, $context) {$/;"	f
-prepare	URIFilter.php	/^    public function prepare($config) {return true;}$/;"	f
-prepare	URIFilter/DisableExternal.php	/^    public function prepare($config) {$/;"	f
-prepare	URIFilter/HostBlacklist.php	/^    public function prepare($config) {$/;"	f
-prepare	URIFilter/MakeAbsolute.php	/^    public function prepare($config) {$/;"	f
-prepare	URIFilter/Munge.php	/^    public function prepare($config) {$/;"	f
-prepareArrayFromForm	Config.php	/^    public static function prepareArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {$/;"	f
-prepareGenerator	Printer.php	/^    public function prepareGenerator($config) {$/;"	f
-prependCSS	AttrTransform.php	/^    public function prependCSS(&$attr, $css) {$/;"	f
-prependCSS	TagTransform.php	/^    protected function prependCSS(&$attr, $css) {$/;"	f
-prepend_style	TagTransform/Font.php	/^        $prepend_style = '';$/;"	v
-preserve	PercentEncoder.php	/^    protected $preserve = array();$/;"	v
-prev	Injector/RemoveEmpty.php	/^                $prev = $this->inputTokens[$b];$/;"	v
-prev	Strategy/MakeWellFormed.php	/^                        $prev = $tokens[$t];$/;"	v
-processModule	HTMLModuleManager.php	/^    public function processModule($module) {$/;"	f
-processModules	HTMLDefinition.php	/^    protected function processModules($config) {$/;"	f
-processToken	Strategy/MakeWellFormed.php	/^    protected function processToken($token, $injector = -1) {$/;"	f
-processed	AttrCollections.php	/^        $processed = array();$/;"	v
-prop	AttrDef/CSS.php	/^        foreach ($propvalues as $prop => $value) {$/;"	v
-property	AttrDef/CSS.php	/^                $property = strtolower($property);$/;"	v
-property	AttrDef/CSS.php	/^            $property = trim($property);$/;"	v
-property	AttrDef/CSS.php	/^        $property = false;$/;"	v
-property	AttrTransform/ImgSpace.php	/^            $property = "margin-$suffix";$/;"	v
-property	HTMLModule/Tidy.php	/^            if (is_null($property)) $property = 'pre';$/;"	v
-property	HTMLModule/Tidy.php	/^        $property = $attr = null;$/;"	v
-property	Printer/CSSDefinition.php	/^        foreach ($this->def->info as $property => $obj) {$/;"	v
-propname	AttrDef/CSS/Border.php	/^            foreach ($this->info as $propname => $validator) {$/;"	v
-propvalues	AttrDef/CSS.php	/^        $propvalues = array();$/;"	v
-prototype	ConfigSchema.php	/^        } elseif (HTMLPurifier_ConfigSchema::$singleton === null || $prototype === true) {$/;"	v
-prototype	DefinitionCacheFactory.php	/^        } elseif ($instance === null || $prototype === true) {$/;"	v
-prototype	LanguageFactory.php	/^        } elseif ($instance === null || $prototype == true) {$/;"	v
-prototype	URISchemeRegistry.php	/^        } elseif ($instance === null || $prototype == true) {$/;"	v
-purifier	ConfigSchema/Builder/Xml.php	/^        $purifier = HTMLPurifier::getInstance();$/;"	v
-qf_encoder	URI.php	/^        $qf_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '\/?');$/;"	v
-query	URIParser.php	/^        $query      = !empty($matches[6]) ? $matches[7] : null;$/;"	v
-quote	AttrDef/CSS/FontFamily.php	/^                $quote = $font[0];$/;"	v
-quote	AttrDef/CSS/URI.php	/^            $quote = $uri[0];$/;"	v
-quote	Generator.php	/^    public function escape($string, $quote = ENT_COMPAT) {$/;"	v
-quoted_value	Lexer/DirectLex.php	/^            $quoted_value = trim($quoted_value);$/;"	v
-r	AttrDef/CSS/Background.php	/^                    $r = $bit;$/;"	v
-r	AttrDef/CSS/Background.php	/^                    $r = $this->info['background-' . $key]->validate($bit, $config, $context);$/;"	v
-r	AttrDef/CSS/BackgroundPosition.php	/^            $r = $this->length->validate($bit, $config, $context);$/;"	v
-r	AttrDef/CSS/BackgroundPosition.php	/^            $r = $this->percentage->validate($bit, $config, $context);$/;"	v
-r	AttrDef/CSS/Border.php	/^                $r = $validator->validate($bit, $config, $context);$/;"	v
-r	AttrDef/CSS/Font.php	/^                            $r = $this->info['line-height']->validate($/;"	v
-r	AttrDef/CSS/Font.php	/^                        $r = $this->info[$validator_name]->validate($/;"	v
-r	AttrDef/CSS/Font.php	/^                    $r = $this->info['font-family']->validate($/;"	v
-r	AttrDef/CSS/Font.php	/^                    $r = $this->info['font-size']->validate($/;"	v
-r	AttrDef/CSS/ListStyle.php	/^                $r = $this->info['list-style-' . $key]->validate($bit, $config, $context);$/;"	v
-r	Encoder.php	/^                $r === '' ||$/;"	v
-r	Encoder.php	/^            $r = iconv('UTF-8', "$encoding\/\/IGNORE", $c); \/\/ initial conversion$/;"	v
-r	HTMLModule/Tidy/Name.php	/^        $r = array();$/;"	v
-r	HTMLModule/Tidy/Proprietary.php	/^        $r = array();$/;"	v
-r	HTMLModule/Tidy/Strict.php	/^        $r = parent::makeFixes();$/;"	v
-r	HTMLModule/Tidy/XHTML.php	/^        $r = array();$/;"	v
-r	HTMLModule/Tidy/XHTMLAndHTML4.php	/^        $r = array();$/;"	v
-r	Injector.php	/^        $r = $this->rewind;$/;"	v
-r	URIDefinition.php	/^        $r = $filter->prepare($config);$/;"	v
-r	UnitConverter.php	/^            $r = sprintf('%.0f', (float) $r);$/;"	v
-r_URI	URIParser.php	/^        $r_URI = '!'.$/;"	v
-r_authority	URIParser.php	/^            $r_authority = "\/^((.+?)@)?(\\[[^\\]]+\\]|[^:]*)(:(\\d*))?\/";$/;"	v
-raw	ChildDef/Custom.php	/^            $raw = "($raw)";$/;"	v
-raw	ChildDef/Custom.php	/^        $raw = str_replace(' ', '', $this->dtd_regex);$/;"	v
-raw	Config.php	/^    public function getDefinition($type, $raw = false) {$/;"	v
-raw	Language.php	/^        $raw = $this->messages[$key];$/;"	v
-rawPosition	Token.php	/^    public function rawPosition($l, $c) {$/;"	f
-raw_aliases	ConfigSchema/InterchangeBuilder.php	/^            $raw_aliases = trim($hash->offsetGet('ALIASES'));$/;"	v
-raw_fallback	LanguageFactory.php	/^                $raw_fallback = $this->getFallbackFor($code);$/;"	v
-raw_paragraphs	Injector/AutoParagraph.php	/^        $raw_paragraphs = explode("\\n\\n", $data);$/;"	v
-rb	HTMLModule/Ruby.php	/^        $rb = $this->addElement('rb', false, 'Inline', 'Common');$/;"	v
-rcursor	Lexer/DirectLex.php	/^                $rcursor = $cursor - (int) $inside_tag;$/;"	v
-reconstructActiveFormattingElements	Lexer/PH5P.php	/^    private function reconstructActiveFormattingElements() {$/;"	f
-reflector	Bootstrap.php	/^                    $reflector = new ReflectionMethod($func[0], $func[1]);$/;"	v
-reg	ChildDef/Custom.php	/^        $reg = $raw;$/;"	v
-reg	ChildDef/Custom.php	/^        $reg = preg_replace("\/$el\/", '(,\\\\0)', $reg);$/;"	v
-reg	ChildDef/Custom.php	/^        $reg = preg_replace("\/([^,(|]\\(+),\/", '\\\\1', $reg);$/;"	v
-reg	ChildDef/Custom.php	/^        $reg = preg_replace("\/,\\(\/", '(', $reg);$/;"	v
-regexp	AttrDef/HTML/ID.php	/^        $regexp = $config->get('Attr.IDBlacklistRegexp');$/;"	v
-register	Context.php	/^    public function register($name, &$ref) {$/;"	f
-register	DefinitionCacheFactory.php	/^    public function register($short, $long) {$/;"	f
-register	DoctypeRegistry.php	/^    public function register($doctype, $xml = true, $modules = array(),$/;"	f
-register	URISchemeRegistry.php	/^    public function register($scheme, $scheme_obj) {$/;"	f
-registerAutoload	Bootstrap.php	/^    public static function registerAutoload() {$/;"	f
-registerFilter	URIDefinition.php	/^    public function registerFilter($filter) {$/;"	f
-registerModule	HTMLModuleManager.php	/^    public function registerModule($module, $overload = false) {$/;"	f
-registeredFilters	URIDefinition.php	/^    protected $registeredFilters = array();$/;"	v
-registeredModules	HTMLModuleManager.php	/^    public $registeredModules = array();$/;"	v
-registry	URI.php	/^        $registry = HTMLPurifier_URISchemeRegistry::instance();$/;"	v
-remove	DefinitionCache.php	/^    abstract public function remove($config);$/;"	f
-remove	DefinitionCache/Decorator.php	/^    public function remove($config) {$/;"	f
-remove	DefinitionCache/Null.php	/^    public function remove($config) {$/;"	f
-remove	DefinitionCache/Serializer.php	/^    public function remove($config) {$/;"	f
-remove	Strategy/MakeWellFormed.php	/^    private function remove() {$/;"	f
-remove_fixes	HTMLModule/Tidy.php	/^        $remove_fixes = $config->get('HTML.TidyRemove');$/;"	v
-remove_invalid_img	Strategy/RemoveForeignElements.php	/^        $remove_invalid_img  = $config->get('Core.RemoveInvalidImg');$/;"	v
-remove_script_contents	Strategy/RemoveForeignElements.php	/^        $remove_script_contents = $config->get('Core.RemoveScriptContents');$/;"	v
-remove_until	Strategy/RemoveForeignElements.php	/^                            $remove_until = $token->name;$/;"	v
-remove_until	Strategy/RemoveForeignElements.php	/^                            $remove_until = false;$/;"	v
-remove_until	Strategy/RemoveForeignElements.php	/^        $remove_until = false;$/;"	v
-render	Printer.php	/^    \/\/ function render() {}$/;"	f
-render	Printer/CSSDefinition.php	/^    public function render($config) {$/;"	f
-render	Printer/ConfigForm.php	/^    public function render($config, $allowed = true, $render_controls = true) {$/;"	f
-render	Printer/ConfigForm.php	/^    public function render($ns, $directive, $value, $name, $config) {$/;"	f
-render	Printer/HTMLDefinition.php	/^    public function render($config) {$/;"	f
-renderChildren	Printer/HTMLDefinition.php	/^    protected function renderChildren($def) {$/;"	f
-renderContentSets	Printer/HTMLDefinition.php	/^    protected function renderContentSets() {$/;"	f
-renderDoctype	Printer/HTMLDefinition.php	/^    protected function renderDoctype() {$/;"	f
-renderEnvironment	Printer/HTMLDefinition.php	/^    protected function renderEnvironment() {$/;"	f
-renderInfo	Printer/HTMLDefinition.php	/^    protected function renderInfo() {$/;"	f
-renderNamespace	Printer/ConfigForm.php	/^    protected function renderNamespace($ns, $directives) {$/;"	f
-replace	DefinitionCache.php	/^    abstract public function replace($def, $config);$/;"	f
-replace	DefinitionCache/Decorator.php	/^    public function replace($def, $config) {$/;"	f
-replace	DefinitionCache/Decorator/Cleanup.php	/^    public function replace($def, $config) {$/;"	f
-replace	DefinitionCache/Decorator/Memory.php	/^    public function replace($def, $config) {$/;"	f
-replace	DefinitionCache/Null.php	/^    public function replace($def, $config) {$/;"	f
-replace	DefinitionCache/Serializer.php	/^    public function replace($def, $config) {$/;"	f
-replace	Strategy/MakeWellFormed.php	/^            $replace = array($token);$/;"	v
-replace	URIFilter/Munge.php	/^    protected $replace = array();$/;"	v
-representing	DefinitionCache.php	/^ * Abstract class representing Definition cache managers that implements$/;"	c
-reprocess	Strategy/MakeWellFormed.php	/^                        $reprocess = true;$/;"	v
-reprocess	Strategy/MakeWellFormed.php	/^                    $reprocess = true;$/;"	v
-reprocess	Strategy/MakeWellFormed.php	/^                $reprocess = true;$/;"	v
-reprocess	Strategy/MakeWellFormed.php	/^            $reprocess = true;$/;"	v
-reprocess	Strategy/MakeWellFormed.php	/^            $reprocess ? $reprocess = false : $t++$/;"	v
-reprocess	Strategy/MakeWellFormed.php	/^        $reprocess  = false; \/\/ whether or not to reprocess the same token$/;"	v
-required	AttrDef.php	/^    public $required = false;$/;"	v
-required_attr	ElementDef.php	/^    public $required_attr = array();$/;"	v
-requires	AttrDef/URI/IPv6.php	/^ * @note This function requires brackets to have been removed from address$/;"	f
-reset	PropertyList.php	/^    public function reset($name = null) {$/;"	f
-resetAccessed	StringHash.php	/^    public function resetAccessed() {$/;"	f
-resetInsertionMode	Lexer/PH5P.php	/^    private function resetInsertionMode() {$/;"	f
-resolves	DoctypeRegistry.php	/^     * @note This function resolves aliases$/;"	f
-result	AttrDef/CSS.php	/^                $result = $definition->info[$property]->validate($/;"	v
-result	AttrDef/CSS.php	/^                $result = 'inherit';$/;"	v
-result	AttrDef/CSS/AlphaValue.php	/^        $result = parent::validate($number, $config, $context);$/;"	v
-result	AttrDef/CSS/AlphaValue.php	/^        if ($float < 0.0) $result = '0';$/;"	v
-result	AttrDef/CSS/AlphaValue.php	/^        if ($float > 1.0) $result = '1';$/;"	v
-result	AttrDef/CSS/Composite.php	/^            $result = $this->defs[$i]->validate($string, $config, $context);$/;"	v
-result	AttrDef/CSS/Multiple.php	/^            $result = $this->single->validate($parts[$i], $config, $context);$/;"	v
-result	AttrDef/CSS/URI.php	/^        $result = parent::validate($uri, $config, $context);$/;"	v
-result	AttrDef/CSS/URI.php	/^        $result = str_replace($keys, $values, $result);$/;"	v
-result	AttrDef/Enum.php	/^        $result = isset($this->valid_values[$string]);$/;"	v
-result	AttrDef/HTML/ID.php	/^            $result = ($trim === '');$/;"	v
-result	AttrDef/HTML/ID.php	/^            $result = true;$/;"	v
-result	AttrDef/URI.php	/^            $result = $scheme_obj->validate($uri, $config, $context);$/;"	v
-result	AttrDef/URI.php	/^            $result = $uri->validate($config, $context);$/;"	v
-result	AttrDef/URI.php	/^            $result = $uri_def->filter($uri, $config, $context);$/;"	v
-result	AttrDef/URI.php	/^            $result = $uri_def->postFilter($uri, $config, $context);$/;"	v
-result	AttrDef/URI/Email/SimpleCheck.php	/^        $result = preg_match('\/^[A-Z0-9._%-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}$\/i', $string);$/;"	v
-result	AttrTransform/Input.php	/^            $result = $this->pixels->validate($attr['size'], $config, $context);$/;"	v
-result	AttrTransform/NameSync.php	/^        $result = $this->idDef->validate($name, $config, $context);$/;"	v
-result	AttrValidator.php	/^                    $result = $defs[$attr_key]->validate($/;"	v
-result	AttrValidator.php	/^                    $result = false;$/;"	v
-result	AttrValidator.php	/^                $result = $d_defs[$attr_key]->validate($/;"	v
-result	AttrValidator.php	/^                $result = false;$/;"	v
-result	AttrValidator.php	/^            if ($result === false || $result === null) {$/;"	v
-result	ChildDef/Optional.php	/^        $result = parent::validateChildren($tokens_of_children, $config, $context);$/;"	v
-result	ChildDef/Required.php	/^        $result = array();$/;"	v
-result	ChildDef/StrictBlockquote.php	/^        $result = parent::validateChildren($tokens_of_children, $config, $context);$/;"	v
-result	ChildDef/StrictBlockquote.php	/^        if ($result === true) $result = $tokens_of_children;$/;"	v
-result	Encoder.php	/^        $result = '';$/;"	v
-result	Injector.php	/^        $result = $this->checkNeeded($config);$/;"	v
-result	Injector.php	/^        $result = $this->forward($i, $current);$/;"	v
-result	Injector/AutoParagraph.php	/^            $result = $this->_checkNeedsP($current);$/;"	v
-result	Length.php	/^        $result = $def->validate($this->n, false, false);$/;"	v
-result	Lexer.php	/^        $result = preg_match('!<body[^>]*>(.+?)<\/body>!is', $html, $matches);$/;"	v
-result	Strategy/FixNesting.php	/^                    $result = $def->child->validateChildren($/;"	v
-result	Strategy/FixNesting.php	/^                    $result = false;$/;"	v
-result	Strategy/FixNesting.php	/^                $result = false;$/;"	v
-result	Strategy/RemoveForeignElements.php	/^        $result = array();$/;"	v
-result	URI.php	/^        $result = '';$/;"	v
-result	URIDefinition.php	/^            $result = $f->filter($uri, $config, $context);$/;"	v
-result	URIFilter/MakeAbsolute.php	/^        $result = array();$/;"	v
-result	URIParser.php	/^        $result = preg_match($r_URI, $uri, $matches);$/;"	v
-result	VarParser/Native.php	/^        $result = eval("\\$var = $expr;");$/;"	v
-ret	AttrDef/CSS/Background.php	/^        $ret = array();$/;"	v
-ret	AttrDef/CSS/BackgroundPosition.php	/^        $ret = array();$/;"	v
-ret	AttrDef/CSS/Border.php	/^        $ret = ''; \/\/ return value$/;"	v
-ret	AttrDef/CSS/ListStyle.php	/^        $ret = array();$/;"	v
-ret	AttrDef/HTML/Class.php	/^        $ret = array();$/;"	v
-ret	ChildDef/StrictBlockquote.php	/^        $ret = array();$/;"	v
-ret	ChildDef/Table.php	/^            $ret = array_merge($ret, $collection);$/;"	v
-ret	ChildDef/Table.php	/^        $ret = array();$/;"	v
-ret	ChildDef/Table.php	/^        foreach ($content as $token_array) $ret = array_merge($ret, $token_array);$/;"	v
-ret	ChildDef/Table.php	/^        if ($caption !== false) $ret = array_merge($ret, $caption);$/;"	v
-ret	ChildDef/Table.php	/^        if ($cols !== false)    foreach ($cols as $token_array) $ret = array_merge($ret, $token_array);$/;"	v
-ret	ChildDef/Table.php	/^        if ($tfoot !== false)   $ret = array_merge($ret, $tfoot);$/;"	v
-ret	ChildDef/Table.php	/^        if ($thead !== false)   $ret = array_merge($ret, $thead);$/;"	v
-ret	Config.php	/^            $ret = HTMLPurifier_Config::createDefault();$/;"	v
-ret	Config.php	/^            $ret = new HTMLPurifier_Config($schema);$/;"	v
-ret	Config.php	/^         $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $this->def);$/;"	v
-ret	Config.php	/^        $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $schema);$/;"	v
-ret	Config.php	/^        $ret = array();$/;"	v
-ret	ConfigSchema/InterchangeBuilder.php	/^        $ret = array();$/;"	v
-ret	ContentSets.php	/^        $ret = array();$/;"	v
-ret	DefinitionCache/Decorator/Cleanup.php	/^        $ret = parent::get($config);$/;"	v
-ret	Encoder.php	/^        $ret = '';$/;"	v
-ret	Encoder.php	/^        $ret = array();$/;"	v
-ret	ErrorCollector.php	/^        $ret = array();$/;"	v
-ret	Filter/ExtractStyleBlocks.php	/^                    $ret = $def->validate($value, $config, $context);$/;"	v
-ret	HTMLModule.php	/^        $ret = array();$/;"	v
-ret	HTMLModule/Tidy.php	/^        $ret = array();$/;"	v
-ret	Language.php	/^        $ret = '';$/;"	v
-ret	Lexer/DOMLex.php	/^        $ret = '';$/;"	v
-ret	PercentEncoder.php	/^        $ret = '';$/;"	v
-ret	PercentEncoder.php	/^        $ret = array_shift($parts);$/;"	v
-ret	Printer.php	/^        $ret = '';$/;"	v
-ret	Printer/CSSDefinition.php	/^        $ret = '';$/;"	v
-ret	Printer/ConfigForm.php	/^        $ret = '';$/;"	v
-ret	Printer/HTMLDefinition.php	/^        $ret = '';$/;"	v
-ret	StringHashParser.php	/^        $ret     = array();$/;"	v
-ret	StringHashParser.php	/^        $ret = $this->parseHandle($fh);$/;"	v
-ret	StringHashParser.php	/^        $ret = array();$/;"	v
-ret_function	AttrDef/CSS/Filter.php	/^        $ret_function = "$function($ret_parameters)";$/;"	v
-ret_lookup	AttrDef/HTML/LinkTypes.php	/^        $ret_lookup = array();$/;"	v
-ret_parameters	AttrDef/CSS/Filter.php	/^        $ret_parameters = implode(',', $ret_params);$/;"	v
-ret_params	AttrDef/CSS/Filter.php	/^        $ret_params = array();$/;"	v
-return	ContentSets.php	/^            $return = $module->getChildDef($def);$/;"	v
-return	ContentSets.php	/^        $return = false;$/;"	v
-rewind	Injector.php	/^    protected $rewind = false;$/;"	v
-rewind	Injector.php	/^    public function rewind($index) {$/;"	f
-rewind_to	Strategy/MakeWellFormed.php	/^                    if ($rewind_to < 0) $rewind_to = 0;$/;"	v
-rewind_to	Strategy/MakeWellFormed.php	/^                $rewind_to = $this->injectors[$i]->getRewind();$/;"	v
-right	AttrDef/CSS/Number.php	/^        $right = rtrim($right, '0');$/;"	v
-right	AttrDef/CSS/Number.php	/^        if ($left === '' && $right === '') return false;$/;"	v
-rootElementPhase	Lexer/PH5P.php	/^    private function rootElementPhase($token) {$/;"	f
-round	UnitConverter.php	/^    private function round($n, $sigfigs) {$/;"	f
-row	Printer.php	/^    protected function row($name, $value) {$/;"	f
-rows	Printer/ConfigForm.php	/^    public $rows = 5;$/;"	v
-rows	Printer/ConfigForm.php	/^    public function setTextareaDimensions($cols = null, $rows = null) {$/;"	v
-rp	UnitConverter.php	/^        $rp = $sigfigs - $new_log - 1; \/\/ Number of decimal places needed$/;"	v
-rt	HTMLModule/Ruby.php	/^        $rt = $this->addElement('rt', false, 'Inline', 'Common', array('rbspan' => 'Number'));$/;"	v
-rtype	Config.php	/^        $rtype = is_int($def) ? $def : $def->type;$/;"	v
-s	ConfigSchema/Validator.php	/^            $s = $alias->toString();$/;"	v
-s	HTMLModule/Legacy.php	/^        $s = $this->addElement('s', 'Inline', 'Inline', 'Common');$/;"	v
-s_excludes	Strategy/FixNesting.php	/^                        $s_excludes = $definition->info[$tokens[$i]->name]->excludes;$/;"	v
-s_excludes	Strategy/FixNesting.php	/^                        $s_excludes = $definition->info_parent_def->excludes;$/;"	v
-s_part1	Lexer/PH5P.php	/^                        $s_part1 = array_slice($this->stack, 0, $fb_s_pos);$/;"	v
-s_part2	Lexer/PH5P.php	/^                        $s_part2 = array_slice($this->stack, $fb_s_pos + 1, count($this->stack));$/;"	v
-s_pos	Lexer/PH5P.php	/^                                $s_pos = array_search($node, $this->stack, true);$/;"	v
-safe	HTMLModule.php	/^    public $safe = true;$/;"	v
-safe	HTMLModule/Forms.php	/^    public $safe = false;$/;"	v
-safe	HTMLModule/Object.php	/^    public $safe = false;$/;"	v
-safe	HTMLModule/Scripting.php	/^    public $safe = false;$/;"	v
-same_quote	Lexer/DirectLex.php	/^            $same_quote = ($first_char == $last_char);$/;"	v
-save	Lexer/PH5P.php	/^    public function save() {$/;"	f
-scale	UnitConverter.php	/^    private function scale($r, $scale) {$/;"	f
-schema	Config.php	/^            $schema = HTMLPurifier_ConfigSchema::instance();$/;"	v
-schema	Config.php	/^    public static function create($config, $schema = null) {$/;"	v
-schema	Config.php	/^    public static function getAllowedDirectivesForForm($allowed, $schema = null) {$/;"	v
-schema	ConfigSchema/Builder/ConfigSchema.php	/^        $schema = new HTMLPurifier_ConfigSchema();$/;"	v
-scheme	URIParser.php	/^        $scheme     = !empty($matches[1]) ? $matches[2] : null;$/;"	v
-scheme_obj	AttrDef/URI.php	/^            $scheme_obj = $uri->getSchemeObj($config, $context);$/;"	v
-scheme_obj	URI.php	/^            $scheme_obj = $registry->getScheme($def->defaultScheme, $config, $context);$/;"	v
-scheme_obj	URI.php	/^            $scheme_obj = $registry->getScheme($this->scheme, $config, $context);$/;"	v
-scheme_obj	URIFilter/MakeAbsolute.php	/^            $scheme_obj = $uri->getSchemeObj($config, $context);$/;"	v
-scheme_obj	URIFilter/Munge.php	/^        $scheme_obj = $uri->getSchemeObj($config, $context);$/;"	v
-schemes	URISchemeRegistry.php	/^    protected $schemes = array();$/;"	v
-scope	Filter/ExtractStyleBlocks.php	/^        $scope = $config->get('Filter.ExtractStyleBlocks.Scope');$/;"	v
-scopes	Filter/ExtractStyleBlocks.php	/^            $scopes = array();$/;"	v
-scopes	Filter/ExtractStyleBlocks.php	/^            $scopes = array_map('trim', explode(',', $scope));$/;"	v
-scoping	Lexer/PH5P.php	/^    private $scoping = array('button','caption','html','marquee','object','table','td','th');$/;"	v
-scriptCallback	Lexer/DirectLex.php	/^    protected function scriptCallback($matches) {$/;"	f
-sec_prefix	Printer.php	/^    protected function getClass($obj, $sec_prefix = '') {$/;"	v
-second	AttrDef/URI/IPv6.php	/^                $second = explode(':', $second);$/;"	v
-seen	AttrCollections.php	/^        $seen  = array(); \/\/ recursion guard$/;"	v
-segment	Lexer/DirectLex.php	/^                    $segment = substr($html, $cursor, $strlen_segment);$/;"	v
-segment	Lexer/DirectLex.php	/^                    $segment = substr($segment, 0, $strlen_segment);$/;"	v
-segment	Lexer/DirectLex.php	/^                $segment = substr($html, $cursor, $strlen_segment);$/;"	v
-segment	URIFilter/MakeAbsolute.php	/^                    $segment = array_pop($result);$/;"	v
-segment_nc_encoder	URI.php	/^            $segment_nc_encoder = new HTMLPurifier_PercentEncoder($chars_sub_delims . '@');$/;"	v
-segments_encoder	URI.php	/^        $segments_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '\/');$/;"	v
-selector	Filter/ExtractStyleBlocks.php	/^                    $selector = implode(', ', $new_selector); \/\/ now it's a string$/;"	v
-selector	Filter/ExtractStyleBlocks.php	/^                $selector = trim($selector);$/;"	v
-selector	Filter/ExtractStyleBlocks.php	/^            foreach ($decls as $selector => $style) {$/;"	v
-selectors	Filter/ExtractStyleBlocks.php	/^                    $selectors = array_map('trim', explode(',', $selector));$/;"	v
-semicolon_pos	URIScheme/ftp.php	/^        $semicolon_pos = strrpos($uri->path, ';'); \/\/ reverse$/;"	v
-send	ErrorCollector.php	/^    public function send($severity, $msg) {$/;"	f
-sensitive	AttrDef/Enum.php	/^            $sensitive = false;$/;"	v
-sensitive	AttrDef/Enum.php	/^            $sensitive = true;$/;"	v
-sep	Language.php	/^        $sep      = $this->getMessage('Item separator');$/;"	v
-sep_last	Language.php	/^        $sep_last = $this->getMessage('Item separator last');$/;"	v
-serials	Config.php	/^    protected $serials = array();$/;"	v
-set	AttrTypes.php	/^    public function set($type, $impl) {$/;"	f
-set	Config.php	/^    public function set($key, $value, $a = null) {$/;"	f
-set	DefinitionCache.php	/^    abstract public function set($def, $config);$/;"	f
-set	DefinitionCache/Decorator.php	/^    public function set($def, $config) {$/;"	f
-set	DefinitionCache/Decorator/Cleanup.php	/^    public function set($def, $config) {$/;"	f
-set	DefinitionCache/Decorator/Memory.php	/^    public function set($def, $config) {$/;"	f
-set	DefinitionCache/Null.php	/^    public function set($def, $config) {$/;"	f
-set	DefinitionCache/Serializer.php	/^    public function set($def, $config) {$/;"	f
-set	PropertyList.php	/^    public function set($name, $value) {$/;"	f
-setParent	PropertyList.php	/^    public function setParent($plist) {$/;"	f
-setTextareaDimensions	Printer/ConfigForm.php	/^    public function setTextareaDimensions($cols = null, $rows = null) {$/;"	f
-setup	Definition.php	/^    public $setup = false;$/;"	v
-setup	Definition.php	/^    public function setup($config) {$/;"	f
-setup	DefinitionCacheFactory.php	/^    public function setup() {$/;"	f
-setup	EntityLookup.php	/^    public function setup($file = false) {$/;"	f
-setup	HTMLModule.php	/^    public function setup($config) {}$/;"	f
-setup	HTMLModule/Bdo.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/Edit.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/Forms.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/Hypertext.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/Image.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/Legacy.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/List.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/Name.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/Object.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/Presentation.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/Proprietary.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/Ruby.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/SafeEmbed.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/SafeObject.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/Scripting.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/StyleAttribute.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/Tables.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/Target.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/Text.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModule/Tidy.php	/^    public function setup($config) {$/;"	f
-setup	HTMLModuleManager.php	/^    public function setup($config) {$/;"	f
-setup	LanguageFactory.php	/^    public function setup() {$/;"	f
-setupConfigStuff	CSSDefinition.php	/^    protected function setupConfigStuff($config) {$/;"	f
-setupConfigStuff	HTMLDefinition.php	/^    protected function setupConfigStuff($config) {$/;"	f
-setupFilters	URIDefinition.php	/^    protected function setupFilters($config) {$/;"	f
-setupMemberVariables	URIDefinition.php	/^    protected function setupMemberVariables($config) {$/;"	f
-shift	Encoder.php	/^                    $shift = ($mState - 1) * 6;$/;"	v
-should	Encoder.php	/^ * @note All functions in this class should be static.$/;"	c
-should	Lexer.php	/^ * This class should not be directly instantiated, but you may use create() to$/;"	c
-sigfigs	UnitConverter.php	/^            $sigfigs = strlen(ltrim($n, '0.')); \/\/ eliminate extra decimal character$/;"	v
-sigfigs	UnitConverter.php	/^            $sigfigs = strlen(rtrim($n, '0'));$/;"	v
-sigfigs	UnitConverter.php	/^        $sigfigs = $this->getSigFigs($n);$/;"	v
-sigfigs	UnitConverter.php	/^        if ($sigfigs < $this->outputPrecision) $sigfigs = $this->outputPrecision;$/;"	v
-sign	AttrDef/CSS/Number.php	/^                $sign = '-';$/;"	v
-sign	AttrDef/CSS/Number.php	/^        $sign = '';$/;"	v
-single	StringHashParser.php	/^                $single = false;$/;"	v
-single	StringHashParser.php	/^                $single = true;$/;"	v
-single	StringHashParser.php	/^        $single  = false;$/;"	v
-size	AttrDef/CSS/Font.php	/^        for ($i = 0, $size = count($bits); $i < $size; $i++) {$/;"	v
-size	Generator.php	/^        for ($i = 0, $size = count($tokens); $i < $size; $i++) {$/;"	v
-size	Lexer/DirectLex.php	/^        $size   = strlen($string); \/\/ size of the string (stays the same)$/;"	v
-size	Strategy/FixNesting.php	/^            $size = count($tokens);$/;"	v
-size	Strategy/FixNesting.php	/^        for ($i = 0, $size = count($tokens) ; $i < $size; ) {$/;"	v
-size	Strategy/MakeWellFormed.php	/^            $size = count($this->stack);$/;"	v
-size	TagTransform/Font.php	/^                $size = (int) $attr['size'];$/;"	v
-skey	Config.php	/^            $skey = "$ns.$directive";$/;"	v
-skipped_tags	Strategy/MakeWellFormed.php	/^                    $skipped_tags = array_slice($this->stack, $j);$/;"	v
-skipped_tags	Strategy/MakeWellFormed.php	/^            $skipped_tags = false;$/;"	v
-small	HTMLModule/Presentation.php	/^        $small = $this->addElement('small',  'Inline', 'Inline', 'Common');$/;"	v
-so	Generator.php	/^ * @todo Refactor interface so that configuration\/context is determined$/;"	i
-special	Lexer/PH5P.php	/^    private $special = array('address','area','base','basefont','bgsound',$/;"	v
-specialEntityCallback	EntityParser.php	/^    protected function specialEntityCallback($matches) {$/;"	f
-special_cases	HTMLModuleManager.php	/^        $special_cases = $config->get('HTML.CoreModules');$/;"	v
-split	AttrDef/HTML/Class.php	/^    protected function split($string, $config, $context) {$/;"	f
-split	AttrDef/HTML/Nmtokens.php	/^    protected function split($string, $config, $context) {$/;"	f
-squash	PropertyList.php	/^    public function squash($force = false) {$/;"	f
-src	AttrTransform/ImgRequired.php	/^            $src = false;$/;"	v
-src	AttrTransform/ImgRequired.php	/^        $src = true;$/;"	v
-stack	ErrorCollector.php	/^                $stack = array_merge($stack, array_reverse($array, true));$/;"	v
-stack	ErrorCollector.php	/^        $stack = array($struct);$/;"	v
-stack	Lexer/PH5P.php	/^    public $stack = array();$/;"	v
-stack	Strategy/FixNesting.php	/^        $stack = array();$/;"	v
-stack	Strategy/MakeWellFormed.php	/^        $stack = array();$/;"	v
-stack	URIFilter/MakeAbsolute.php	/^            $stack = explode('\/', $uri->path);$/;"	v
-stack	URIFilter/MakeAbsolute.php	/^        $stack = $this->_collapseStack($stack); \/\/ do pre-parsing$/;"	v
-stack	URIFilter/MakeAbsolute.php	/^        $stack = explode('\/', $this->base->path);$/;"	v
-stack_length	Lexer/PH5P.php	/^                    $stack_length = count($this->stack) - 1;$/;"	v
-stage	AttrDef/CSS/Font.php	/^                        $stage = 2;$/;"	v
-stage	AttrDef/CSS/Font.php	/^                    if (count($caught) >= 3) $stage = 1;$/;"	v
-stage	AttrDef/CSS/Font.php	/^        $stage = 0; \/\/ this indicates what we're looking for$/;"	v
-stage_1	AttrDef/CSS/Font.php	/^        $stage_1 = array('font-style', 'font-variant', 'font-weight');$/;"	v
-standalone	ElementDef.php	/^    public $standalone = true;$/;"	v
-start	Lexer/PH5P.php	/^        $start = $this->char;$/;"	v
-start	Printer.php	/^    protected function start($tag, $attr = array()) {$/;"	f
-start_token	Strategy/FixNesting.php	/^            $start_token = $tokens[$i]; \/\/ to make token available via CurrentToken$/;"	v
-start_token	Strategy/FixNesting.php	/^        $start_token = false;$/;"	v
-state	StringHashParser.php	/^                    $state  = $this->default;$/;"	v
-state	StringHashParser.php	/^                $state  = false;$/;"	v
-state	StringHashParser.php	/^                $state = trim($line, '- ');$/;"	v
-state	StringHashParser.php	/^        $state   = false;$/;"	v
-state	UnitConverter.php	/^            $state = $dest_state;$/;"	v
-state	UnitConverter.php	/^            if (isset($x[$unit])) $state = $k;$/;"	v
-state	UnitConverter.php	/^        $state = $dest_state = false;$/;"	v
-status	AttrDef/CSS/BackgroundPosition.php	/^                $status = $lookup[$lbit];$/;"	v
-status	DefinitionCache/Decorator/Cleanup.php	/^        $status = parent::add($def, $config);$/;"	v
-status	DefinitionCache/Decorator/Cleanup.php	/^        $status = parent::replace($def, $config);$/;"	v
-status	DefinitionCache/Decorator/Cleanup.php	/^        $status = parent::set($def, $config);$/;"	v
-status	DefinitionCache/Decorator/Memory.php	/^        $status = parent::add($def, $config);$/;"	v
-status	DefinitionCache/Decorator/Memory.php	/^        $status = parent::replace($def, $config);$/;"	v
-status	DefinitionCache/Decorator/Memory.php	/^        $status = parent::set($def, $config);$/;"	v
-step_seven	Lexer/PH5P.php	/^                $step_seven = false;$/;"	v
-step_seven	Lexer/PH5P.php	/^                $step_seven = true;$/;"	v
-step_seven	Lexer/PH5P.php	/^            if(isset($step_seven) && $step_seven === true) {$/;"	v
-stop	Lexer/PH5P.php	/^                        $stop = false;$/;"	v
-str	Encoder.php	/^                $str = strtr($str, $clear_fix);$/;"	v
-str	Encoder.php	/^            $str = HTMLPurifier_Encoder::convertToASCIIDumbLossless($str);$/;"	v
-str	Encoder.php	/^            $str = iconv($encoding, 'utf-8\/\/IGNORE', $str);$/;"	v
-str	Encoder.php	/^            $str = iconv('utf-8', $encoding . '\/\/IGNORE', $str);$/;"	v
-str	Encoder.php	/^            $str = strtr($str, HTMLPurifier_Encoder::testEncodingSupportsASCII($encoding));$/;"	v
-str	Encoder.php	/^            $str = strtr($str, array_flip($ascii_fix));$/;"	v
-str	Encoder.php	/^            $str = utf8_decode($str);$/;"	v
-str	Encoder.php	/^            $str = utf8_encode($str);$/;"	v
-strategies	Strategy/Composite.php	/^    protected $strategies = array();$/;"	v
-strike	HTMLModule/Legacy.php	/^        $strike = $this->addElement('strike', 'Inline', 'Inline', 'Common');$/;"	v
-string	AttrDef.php	/^        $string = str_replace(array("\\n", "\\t", "\\r"), ' ', $string);$/;"	v
-string	AttrDef.php	/^        $string = trim($string);$/;"	v
-string	AttrDef/CSS/Background.php	/^        $string = $this->mungeRgb($string);$/;"	v
-string	AttrDef/CSS/Background.php	/^        $string = $this->parseCDATA($string);$/;"	v
-string	AttrDef/CSS/BackgroundPosition.php	/^        $string = $this->parseCDATA($string);$/;"	v
-string	AttrDef/CSS/Border.php	/^        $string = $this->mungeRgb($string);$/;"	v
-string	AttrDef/CSS/Border.php	/^        $string = $this->parseCDATA($string);$/;"	v
-string	AttrDef/CSS/Font.php	/^        $string = $this->parseCDATA($string);$/;"	v
-string	AttrDef/CSS/ImportantDecorator.php	/^                $string = rtrim(substr($temp, 0, -1));$/;"	v
-string	AttrDef/CSS/ImportantDecorator.php	/^        $string = $this->def->validate($string, $config, $context);$/;"	v
-string	AttrDef/CSS/ImportantDecorator.php	/^        $string = trim($string);$/;"	v
-string	AttrDef/CSS/Length.php	/^        $string = $this->parseCDATA($string);$/;"	v
-string	AttrDef/CSS/ListStyle.php	/^        $string = $this->parseCDATA($string);$/;"	v
-string	AttrDef/CSS/Multiple.php	/^        $string = $this->parseCDATA($string);$/;"	v
-string	AttrDef/CSS/Percentage.php	/^        $string = $this->parseCDATA($string);$/;"	v
-string	AttrDef/CSS/TextDecoration.php	/^        $string = strtolower($this->parseCDATA($string));$/;"	v
-string	AttrDef/Enum.php	/^            $string = ctype_lower($string) ? $string : strtolower($string);$/;"	v
-string	AttrDef/Enum.php	/^            $string = substr($string, 2);$/;"	v
-string	AttrDef/Enum.php	/^        $string = trim($string);$/;"	v
-string	AttrDef/HTML/Color.php	/^        $string = trim($string);$/;"	v
-string	AttrDef/HTML/Length.php	/^        $string = trim($string);$/;"	v
-string	AttrDef/HTML/LinkTypes.php	/^        $string = $this->parseCDATA($string);$/;"	v
-string	AttrDef/HTML/LinkTypes.php	/^        $string = implode(' ', array_keys($ret_lookup));$/;"	v
-string	AttrDef/HTML/MultiLength.php	/^        $string = trim($string);$/;"	v
-string	AttrDef/HTML/Nmtokens.php	/^        $string = trim($string);$/;"	v
-string	AttrDef/HTML/Pixels.php	/^            $string = substr($string, 0, $length - 2);$/;"	v
-string	AttrDef/HTML/Pixels.php	/^        $string = trim($string);$/;"	v
-string	AttrDef/Lang.php	/^        $string = trim($string);$/;"	v
-string	AttrDef/URI/Email/SimpleCheck.php	/^        $string = trim($string);$/;"	v
-string	AttrTypes.php	/^        else $string = '';$/;"	v
-string	ErrorCollector.php	/^                $string = '';$/;"	v
-string	Lexer.php	/^        $string = $this->_entity_parser->substituteSpecialEntities($string);$/;"	v
-string	Lexer.php	/^        $string = strtr($string, $this->_special_entity2str);$/;"	v
-string	Lexer/DirectLex.php	/^        $string = (string) $string; \/\/ quick typecast$/;"	v
-string	Lexer/PEARSax3.php	/^        $string = $this->normalize($string, $config, $context);$/;"	v
-string	Printer.php	/^        $string = HTMLPurifier_Encoder::cleanUTF8($string);$/;"	v
-string	Printer.php	/^        $string = htmlspecialchars($string, ENT_COMPAT, 'UTF-8');$/;"	v
-string	URIFilter/Munge.php	/^        $string = $uri->toString();$/;"	v
-stringTypes	VarParser.php	/^    static public $stringTypes = array($/;"	v
-stripped_token	Language.php	/^                        $stripped_token = clone $value;$/;"	v
-strlen_segment	Lexer/DirectLex.php	/^                    $strlen_segment = $position_comment_end - $cursor;$/;"	v
-strlen_segment	Lexer/DirectLex.php	/^                $strlen_segment = $position_next_gt - $cursor;$/;"	v
-strong	HTMLModule/Text.php	/^        $strong = $this->addElement('strong',  'Inline', 'Inline', 'Common');$/;"	v
-struct	ErrorCollector.php	/^                $struct = $this->lines[$line][$col] = $new_struct;$/;"	v
-struct	ErrorCollector.php	/^                $struct = $this->lines[$line][$col];$/;"	v
-struct	ErrorCollector.php	/^                $struct = $this->lines[-1] = $new_struct;$/;"	v
-struct	ErrorCollector.php	/^                $struct = $this->lines[-1];$/;"	v
-struct	ErrorCollector.php	/^            $struct = $struct->getChild(HTMLPurifier_ErrorStruct::ATTR, $attr);$/;"	v
-struct	ErrorCollector.php	/^            $struct = $struct->getChild(HTMLPurifier_ErrorStruct::CSSPROP, $cssprop);$/;"	v
-struct	ErrorCollector.php	/^        $struct = null;$/;"	v
-style	AttrTransform/ImgSpace.php	/^        $style = '';$/;"	v
-style	Filter/ExtractStyleBlocks.php	/^                $style = $this->cleanCSS($style, $config, $context);$/;"	v
-style	TagTransform/Simple.php	/^    public function __construct($transform_to, $style = null) {$/;"	v
-styleCallback	Filter/ExtractStyleBlocks.php	/^    protected function styleCallback($matches) {$/;"	f
-style_blocks	Filter/ExtractStyleBlocks.php	/^        $style_blocks = $this->_styleMatches;$/;"	v
-subst	ErrorCollector.php	/^        $subst = array();$/;"	v
-subst	Language.php	/^        $subst = array();$/;"	v
-substituteNonSpecialEntities	EntityParser.php	/^    public function substituteNonSpecialEntities($string) {$/;"	f
-substituteSpecialEntities	EntityParser.php	/^    public function substituteSpecialEntities($string) {$/;"	f
-substrCount	Lexer/DirectLex.php	/^    protected function substrCount($haystack, $needle, $offset, $length) {$/;"	f
-subtags	AttrDef/Lang.php	/^        $subtags = explode('-', $string);$/;"	v
-support	CSSDefinition.php	/^        $support = "(for information on implementing this, see the ".$/;"	v
-support	HTMLDefinition.php	/^        $support = "(for information on implementing this, see the ".$/;"	v
-swap	Strategy/MakeWellFormed.php	/^    private function swap($token) {$/;"	f
-synchronize_interval	Lexer/DirectLex.php	/^                    $loops % $synchronize_interval === 0 \/\/ time to synchronize!$/;"	v
-synchronize_interval	Lexer/DirectLex.php	/^        $synchronize_interval = $config->get('Core.DirectLexLineNumberSyncInterval');$/;"	v
-system_fonts	AttrDef/CSS/Font.php	/^        static $system_fonts = array($/;"	v
-t	AttrTransform/Input.php	/^        else $t = strtolower($attr['type']);$/;"	v
-t	AttrTransform/Input.php	/^        if (!isset($attr['type'])) $t = 'text';$/;"	v
-t	AttrTransform/Input.php	/^        if (!isset($attr['value']) && ($t === 'radio' || $t === 'checkbox')) {$/;"	v
-t	Strategy/MakeWellFormed.php	/^            $t = 0;$/;"	v
-t	Strategy/MakeWellFormed.php	/^            $t == 0 || isset($tokens[$t - 1]);$/;"	v
-t	Strategy/MakeWellFormed.php	/^        $t = false; \/\/ token index$/;"	v
-table	HTMLModule/Legacy.php	/^        $table = $this->addBlankElement('table');$/;"	v
-table	Lexer/PH5P.php	/^                        $table = $this->stack[$n];$/;"	v
-table	Lexer/PH5P.php	/^                    $table = $this->stack[$n];$/;"	v
-table	Lexer/PH5P.php	/^    private function elementInScope($el, $table = false) {$/;"	v
-tag	HTMLDefinition.php	/^            foreach ($this->info as $tag => $info) {$/;"	v
-tag	HTMLDefinition.php	/^        foreach ($this->info as $tag => $info) {$/;"	v
-tagNameState	Lexer/PH5P.php	/^    private function tagNameState() {$/;"	f
-tagOpenState	Lexer/PH5P.php	/^    private function tagOpenState() {$/;"	f
-tag_index	ChildDef/Table.php	/^                    $tag_index = 0;$/;"	v
-tag_index	ChildDef/Table.php	/^        $tag_index = 0; \/\/ the first node might be whitespace,$/;"	v
-tag_name	Lexer/DOMLex.php	/^                    $tag_name = $node->tagName, \/\/ somehow, it get's dropped$/;"	v
-td	HTMLModule/Legacy.php	/^        $td = $this->addBlankElement('td');$/;"	v
-temp	AttrDef/CSS/ImportantDecorator.php	/^            $temp = rtrim(substr($string, 0, -9));$/;"	v
-temp	ContentSets.php	/^                $temp = $this->convertToLookup($value);$/;"	v
-testEncodingSupportsASCII	Encoder.php	/^    public static function testEncodingSupportsASCII($encoding, $bypass = false) {$/;"	f
-tests	Encoder.php	/^     * This expensive function tests whether or not a given character$/;"	f
-text	Injector/AutoParagraph.php	/^        $text = $token->data;$/;"	v
-text	Lexer/PH5P.php	/^            $text = $this->dom->createTextNode($token['data']);$/;"	v
-text	Lexer/PH5P.php	/^        $text = $this->dom->createTextNode($data);$/;"	v
-text	PercentEncoder.php	/^            $text     = substr($part, 2);$/;"	v
-text	Printer.php	/^    protected function text($text) {$/;"	f
-textarea	HTMLModule/Forms.php	/^        $textarea = $this->addElement('textarea', 'Formctrl', 'Optional: #PCDATA', 'Common', array($/;"	v
-textify_comments	Strategy/RemoveForeignElements.php	/^                        $textify_comments = $token->name;$/;"	v
-textify_comments	Strategy/RemoveForeignElements.php	/^                        $textify_comments = false;$/;"	v
-textify_comments	Strategy/RemoveForeignElements.php	/^        $textify_comments = false;$/;"	v
-tfoot	ChildDef/Table.php	/^        $tfoot   = false;$/;"	v
-th	HTMLModule/Legacy.php	/^        $th = $this->addBlankElement('th');$/;"	v
-that	Bootstrap.php	/^ * Bootstrap class that contains meta-functionality for HTML Purifier such as$/;"	c
-that	ConfigSchema/InterchangeBuilder.php	/^     * Convenience function that creates an HTMLPurifier_ConfigSchema_Interchange_Id$/;"	f
-that	Definition.php	/^     * Setup function that aborts if already setup$/;"	f
-that	DefinitionCache/Decorator/Cleanup.php	/^ * Definition cache decorator class that cleans up the cache$/;"	c
-that	DefinitionCache/Decorator/Memory.php	/^ * Definition cache decorator class that saves all cache retrievals$/;"	c
-that	Encoder.php	/^     *       function that needs to be able to understand UTF-8 characters.$/;"	f
-that	ErrorCollector.php	/^ * Error collection class that enables HTML Purifier to report HTML$/;"	c
-that	HTMLModule.php	/^     * Convenience function that creates a totally blank, non-standalone$/;"	f
-that	HTMLModule.php	/^     * Convenience function that generates a lookup table with boolean$/;"	f
-that	HTMLModule.php	/^     * Convenience function that merges a list of attribute includes into$/;"	f
-that	HTMLModule.php	/^     * Convenience function that registers an element to a content set$/;"	f
-that	HTMLModule.php	/^     * Convenience function that sets up a new element$/;"	f
-that	HTMLModule.php	/^     * Convenience function that transforms single-string contents$/;"	f
-that	Lexer/DOMLex.php	/^     * Callback function that entity-izes ampersands in comments so that$/;"	f
-that	Lexer/DOMLex.php	/^     * Recursive function that tokenizes a node, putting it into an accumulator.$/;"	f
-that	Printer.php	/^     * Main function that renders object or aspect of that object$/;"	f
-that	Token.php	/^ * Abstract base token class that all others inherit from.$/;"	c
-the_same	Lexer/PH5P.php	/^        $the_same = count($this->tree->stack) > 0 && $next_node === end($this->tree->stack)->nodeName;$/;"	v
-thead	ChildDef/Table.php	/^        $thead   = false;$/;"	v
-tidy	Filter/ExtractStyleBlocks.php	/^        $tidy = $config->get('Filter.ExtractStyleBlocks.TidyImpl');$/;"	v
-tidy	Generator.php	/^            $tidy = new Tidy;$/;"	v
-tidyModules	Doctype.php	/^        $tidyModules = array(), $aliases = array(), $dtd_public = null, $dtd_system = null$/;"	v
-tidyModules	Doctype.php	/^    public $tidyModules = array();$/;"	v
-tidy_modules	DoctypeRegistry.php	/^        $tidy_modules = array(), $aliases = array(), $dtd_public = null, $dtd_system = null$/;"	v
-tidy_modules	DoctypeRegistry.php	/^        if (!is_array($tidy_modules)) $tidy_modules = array($tidy_modules);$/;"	v
-tmp	Encoder.php	/^                    $tmp = $in;$/;"	v
-tmp	Encoder.php	/^                    $tmp = ($tmp & 0x0000003F) << $shift;$/;"	v
-to	AttrDef/URI/IPv4.php	/^     * Lazy load function to prevent regex from being stuffed in$/;"	f
-to	ConfigSchema/Interchange.php	/^     * Convenience function to perform standard validation. Throws exception$/;"	f
-to	ContentSets.php	/^            'Could not determine which ChildDef class to instantiate',$/;"	c
-to	DoctypeRegistry.php	/^     * @note Use this function to get a copy of doctype that config$/;"	f
-to	Lexer.php	/^ *       many of the utility functions require a class to be instantiated.$/;"	c
-to	Lexer/DOMLex.php	/^ *       our own function to do that.$/;"	f
-toString	ConfigSchema/Interchange/Id.php	/^    public function toString() {$/;"	f
-toString	Length.php	/^    public function toString() {$/;"	f
-toString	URI.php	/^    public function toString() {$/;"	f
-toggleWriteability	Printer/ConfigForm.js	/^function toggleWriteability(id_of_patient, checked) {$/;"	f
-token	AttrDef/CSS/DenyElementDecorator.php	/^        $token = $context->get('CurrentToken', true);$/;"	v
-token	AttrDef/Switch.php	/^        $token = $context->get('CurrentToken', true);$/;"	v
-token	ChildDef/StrictBlockquote.php	/^            $token = $result[$i];$/;"	v
-token	ErrorCollector.php	/^        $token = $this->context->get('CurrentToken', true);$/;"	v
-token	Injector/AutoParagraph.php	/^                            $token = array($this->_pStart(), $token);$/;"	v
-token	Injector/AutoParagraph.php	/^                        if (!is_array($token)) $token = array($token);$/;"	v
-token	Injector/AutoParagraph.php	/^                    $token = array($this->_pStart());$/;"	v
-token	Injector/AutoParagraph.php	/^                    $token = array($this->_pStart(), $token);$/;"	v
-token	Injector/AutoParagraph.php	/^            $token = array();$/;"	v
-token	Injector/DisplayLinkURI.php	/^            $token = array($token, new HTMLPurifier_Token_Text(" ($url)"));$/;"	v
-token	Injector/Linkify.php	/^        $token = array();$/;"	v
-token	Injector/PurifierLinkify.php	/^        $token = array();$/;"	v
-token	Injector/RemoveEmpty.php	/^            $token = $i - $this->inputIndex + 1;$/;"	v
-token	Injector/SafeObject.php	/^                    $token = false;$/;"	v
-token	Injector/SafeObject.php	/^                $token = false;$/;"	v
-token	Injector/SafeObject.php	/^            $token = $new;$/;"	v
-token	Lexer/DirectLex.php	/^                        $token = new HTMLPurifier_Token_Empty($segment);$/;"	v
-token	Lexer/DirectLex.php	/^                        $token = new HTMLPurifier_Token_Start($segment);$/;"	v
-token	Lexer/DirectLex.php	/^                    $token = new HTMLPurifier_Token_Empty($type, $attr);$/;"	v
-token	Lexer/DirectLex.php	/^                    $token = new HTMLPurifier_Token_End($type);$/;"	v
-token	Lexer/DirectLex.php	/^                    $token = new HTMLPurifier_Token_Start($type, $attr);$/;"	v
-token	Lexer/DirectLex.php	/^                    $token = new HTMLPurifier_Token_Text('<');$/;"	v
-token	Lexer/DirectLex.php	/^                    $token = new$/;"	v
-token	Lexer/DirectLex.php	/^                $token = new$/;"	v
-token	Strategy/MakeWellFormed.php	/^                $token = new HTMLPurifier_Token_Empty($token->name, $token->attr);$/;"	v
-token	Strategy/MakeWellFormed.php	/^            $token = $tokens[$t];$/;"	v
-token	Strategy/MakeWellFormed.php	/^        $token      = false; \/\/ the current token$/;"	v
-token	Strategy/MakeWellFormed.php	/^        if ($token === false)  $token = array(1);$/;"	v
-token	Strategy/MakeWellFormed.php	/^        if (is_int($token))    $token = array($token);$/;"	v
-token	Strategy/MakeWellFormed.php	/^        if (is_object($token)) $token = array(1, $token);$/;"	v
-token	Strategy/RemoveForeignElements.php	/^                    $token = $definition->$/;"	v
-token	Strategy/RemoveForeignElements.php	/^                    $token = new HTMLPurifier_Token_Text($/;"	v
-token	Strategy/RemoveForeignElements.php	/^                    $token = new HTMLPurifier_Token_Text($data);$/;"	v
-token	Strategy/RemoveForeignElements.php	/^        $token = false;$/;"	v
-token	Strategy/ValidateAttributes.php	/^        $token = false;$/;"	v
-token	URIFilter/Munge.php	/^        $token = $context->get('CurrentToken', true);$/;"	v
-tokenizeDOM	Lexer/DOMLex.php	/^    protected function tokenizeDOM($node, &$tokens, $collect = false) {$/;"	f
-tokenizeHTML	Lexer.php	/^    public function tokenizeHTML($string, $config, $context) {$/;"	f
-tokenizeHTML	Lexer/DOMLex.php	/^    public function tokenizeHTML($html, $config, $context) {$/;"	f
-tokenizeHTML	Lexer/DirectLex.php	/^    public function tokenizeHTML($html, $config, $context) {$/;"	f
-tokenizeHTML	Lexer/PEARSax3.php	/^    public function tokenizeHTML($string, $config, $context) {$/;"	f
-tokenizeHTML	Lexer/PH5P.php	/^    public function tokenizeHTML($html, $config, $context) {$/;"	f
-tokens	AttrDef/HTML/Nmtokens.php	/^        $tokens = $this->filter($tokens, $config, $context);$/;"	v
-tokens	AttrDef/HTML/Nmtokens.php	/^        $tokens = $this->split($string, $config, $context);$/;"	v
-tokens	Lexer/DOMLex.php	/^        $tokens = array();$/;"	v
-tokens	Lexer/PEARSax3.php	/^    protected $tokens = array();$/;"	v
-tokens	Lexer/PH5P.php	/^        $tokens = array();$/;"	v
-tokens	Strategy/Composite.php	/^            $tokens = $strategy->execute($tokens, $config, $context);$/;"	v
-too	ElementDef.php	/^ *       Please update that class too.$/;"	c
-top_nesting	Strategy/MakeWellFormed.php	/^                $top_nesting = array_pop($this->stack);$/;"	v
-toplabel	AttrDef/URI/Host.php	/^        $toplabel      = "$a($and*$an)?";$/;"	v
-tr	HTMLModule/Legacy.php	/^        $tr = $this->addBlankElement('tr');$/;"	v
-tracksLineNumbers	Lexer.php	/^    public $tracksLineNumbers = false;$/;"	v
-tracksLineNumbers	Lexer/DirectLex.php	/^    public $tracksLineNumbers = true;$/;"	v
-trailingEndPhase	Lexer/PH5P.php	/^    private function trailingEndPhase($token) {$/;"	f
-transform	AttrTransform.php	/^    abstract public function transform($attr, $config, $context);$/;"	f
-transform	AttrTransform/Background.php	/^    public function transform($attr, $config, $context) {$/;"	f
-transform	AttrTransform/BdoDir.php	/^    public function transform($attr, $config, $context) {$/;"	f
-transform	AttrTransform/BgColor.php	/^    public function transform($attr, $config, $context) {$/;"	f
-transform	AttrTransform/BoolToCSS.php	/^    public function transform($attr, $config, $context) {$/;"	f
-transform	AttrTransform/Border.php	/^    public function transform($attr, $config, $context) {$/;"	f
-transform	AttrTransform/EnumToCSS.php	/^    public function transform($attr, $config, $context) {$/;"	f
-transform	AttrTransform/ImgRequired.php	/^    public function transform($attr, $config, $context) {$/;"	f
-transform	AttrTransform/ImgSpace.php	/^    public function transform($attr, $config, $context) {$/;"	f
-transform	AttrTransform/Input.php	/^    public function transform($attr, $config, $context) {$/;"	f
-transform	AttrTransform/Lang.php	/^    public function transform($attr, $config, $context) {$/;"	f
-transform	AttrTransform/Length.php	/^    public function transform($attr, $config, $context) {$/;"	f
-transform	AttrTransform/Name.php	/^    public function transform($attr, $config, $context) {$/;"	f
-transform	AttrTransform/NameSync.php	/^    public function transform($attr, $config, $context) {$/;"	f
-transform	AttrTransform/SafeEmbed.php	/^    public function transform($attr, $config, $context) {$/;"	f
-transform	AttrTransform/SafeObject.php	/^    function transform($attr, $config, $context) {$/;"	f
-transform	AttrTransform/SafeParam.php	/^    public function transform($attr, $config, $context) {$/;"	f
-transform	AttrTransform/ScriptRequired.php	/^    public function transform($attr, $config, $context) {$/;"	f
-transform	AttrTransform/Textarea.php	/^    public function transform($attr, $config, $context) {$/;"	f
-transform	TagTransform.php	/^    abstract public function transform($tag, $config, $context);$/;"	f
-transform	TagTransform/Font.php	/^    public function transform($tag, $config, $context) {$/;"	f
-transform	TagTransform/Simple.php	/^    public function transform($tag, $config, $context) {$/;"	f
-transformAttrToAssoc	Lexer/DOMLex.php	/^    protected function transformAttrToAssoc($node_map) {$/;"	f
-transform_to	TagTransform/Font.php	/^    public $transform_to = 'span';$/;"	v
-transitional	HTMLModuleManager.php	/^        $transitional = array('Legacy', 'Target');$/;"	v
-triad	AttrDef/CSS/Color.php	/^            $triad = substr($color, 4, $length - 4 - 1);$/;"	v
-triggerError	Config.php	/^    protected function triggerError($msg, $no) {$/;"	f
-trim	AttrDef/HTML/ID.php	/^            $trim = trim( \/\/ primitive style of regexps, I suppose$/;"	v
-trusted	HTMLModuleManager.php	/^        if ($trusted === null) $trusted = $this->trusted;$/;"	v
-trusted	HTMLModuleManager.php	/^    public $trusted = false;$/;"	v
-trusted	HTMLModuleManager.php	/^    public function getElement($name, $trusted = null) {$/;"	v
-trusted	Strategy/RemoveForeignElements.php	/^        $trusted = $config->get('HTML.Trusted');$/;"	v
-trusted_wh	CSSDefinition.php	/^        $trusted_wh = new HTMLPurifier_AttrDef_CSS_Composite(array($/;"	v
-tt	HTMLModule/Presentation.php	/^        $tt = $this->addElement('tt',     'Inline', 'Inline', 'Common');$/;"	v
-type	AttrDef/CSS/Color.php	/^                        $type = 'integer';$/;"	v
-type	AttrDef/CSS/Color.php	/^                        $type = 'percentage';$/;"	v
-type	AttrDef/CSS/Color.php	/^            $type = false; \/\/ to ensure that they're all the same type$/;"	v
-type	CSSDefinition.php	/^    public $type = 'CSS';$/;"	v
-type	ChildDef/Chameleon.php	/^    public $type = 'chameleon';$/;"	v
-type	ChildDef/Custom.php	/^    public $type = 'custom';$/;"	v
-type	ChildDef/Empty.php	/^    public $type = 'empty';$/;"	v
-type	ChildDef/Optional.php	/^    public $type = 'optional';$/;"	v
-type	ChildDef/Required.php	/^    public $type = 'required';$/;"	v
-type	ChildDef/StrictBlockquote.php	/^    public $type = 'strictblockquote';$/;"	v
-type	ChildDef/Table.php	/^    public $type = 'table';$/;"	v
-type	Config.php	/^            $type = $rtype;$/;"	v
-type	Config.php	/^            $type = -$rtype;$/;"	v
-type	ConfigSchema/InterchangeBuilder.php	/^            $type = explode('\/', $hash->offsetGet('TYPE'));$/;"	v
-type	ErrorCollector.php	/^            foreach ($current->children as $type => $array) {$/;"	v
-type	HTMLDefinition.php	/^    public $type = 'HTML';$/;"	v
-type	HTMLModule/Tidy.php	/^                        $type = "info_$type";$/;"	v
-type	HTMLModule/Tidy.php	/^            $type = 'attr_transform_' . $property;$/;"	v
-type	Lexer/DirectLex.php	/^                    $type = substr($segment, 1);$/;"	v
-type	Lexer/DirectLex.php	/^                $type = substr($segment, 0, $position_first_space);$/;"	v
-type	Printer/ConfigForm.php	/^                    $type = $def->type;$/;"	v
-type	Printer/ConfigForm.php	/^                    $type = abs($def);$/;"	v
-type	Printer/ConfigForm.php	/^                if (!isset($this->fields[$type])) $type = 0; \/\/ default$/;"	v
-type	Printer/ConfigForm.php	/^            $type = $def->type;$/;"	v
-type	Printer/ConfigForm.php	/^            $type = abs($def);$/;"	v
-type	Printer/ConfigForm.php	/^            $type === HTMLPurifier_VarParser::ALIST ||$/;"	v
-type	Printer/ConfigForm.php	/^            $type === HTMLPurifier_VarParser::HASH ||$/;"	v
-type	Printer/ConfigForm.php	/^            $type === HTMLPurifier_VarParser::ITEXT ||$/;"	v
-type	Printer/ConfigForm.php	/^            $type === HTMLPurifier_VarParser::LOOKUP$/;"	v
-type	Printer/ConfigForm.php	/^            $type === HTMLPurifier_VarParser::TEXT ||$/;"	v
-type	Strategy/MakeWellFormed.php	/^                $type = $definition->info[$token->name]->child->type;$/;"	v
-type	Strategy/MakeWellFormed.php	/^                $type = false; \/\/ Type is unknown, treat accordingly$/;"	v
-type	URIDefinition.php	/^    public $type = 'URI';$/;"	v
-type	URIScheme/ftp.php	/^            $type = substr($uri->path, $semicolon_pos + 1); \/\/ no semicolon$/;"	v
-type	VarParser.php	/^                $type = HTMLPurifier_VarParser::$types[$type];$/;"	v
-type	VarParser.php	/^                if ($type == self::ISTRING || $type == self::ITEXT) $var = strtolower($var);$/;"	v
-typeAllowsNull	ConfigSchema/Interchange/Directive.php	/^    public $typeAllowsNull = false;$/;"	v
-type_obj	Printer/ConfigForm.php	/^                    $type_obj = new HTMLPurifier_Printer_ConfigForm_NullDecorator($type_obj);$/;"	v
-type_obj	Printer/ConfigForm.php	/^                $type_obj = $this->fields[$type];$/;"	v
-type_ret	URIScheme/ftp.php	/^                    $type_ret = ";type=$typecode";$/;"	v
-type_ret	URIScheme/ftp.php	/^            $type_ret = '';$/;"	v
-typecode	URIScheme/ftp.php	/^                } elseif ($typecode === 'a' || $typecode === 'i' || $typecode === 'd') {$/;"	v
-types	VarParser.php	/^    static public $types = array($/;"	v
-u	HTMLModule/Legacy.php	/^        $u = $this->addElement('u', 'Inline', 'Inline', 'Common');$/;"	v
-u	Length.php	/^    public function __construct($n = '0', $u = false) {$/;"	v
-ul	HTMLModule/Legacy.php	/^        $ul = $this->addBlankElement('ul');$/;"	v
-ul_types	HTMLModule/Tidy/XHTMLAndHTML4.php	/^            $ul_types = array($/;"	v
-unichr	Encoder.php	/^    public static function unichr($code) {$/;"	f
-unit	Length.php	/^        $unit = substr($s, $n_length);$/;"	v
-unit	Length.php	/^        if ($unit === '') $unit = false;$/;"	v
-unit	UnitConverter.php	/^                $unit = $dest_unit;$/;"	v
-unit	UnitConverter.php	/^                $unit = $to_unit;$/;"	v
-unit	UnitConverter.php	/^            $unit = self::$units[$state][$dest_state][2];$/;"	v
-unit	UnitConverter.php	/^        $unit = $length->getUnit();$/;"	v
-unit	UnitConverter.php	/^        \/\/ Post-condition: $unit == $to_unit$/;"	v
-unit	UnitConverter.php	/^        if ($n === '0' || $unit === false) {$/;"	v
-units	UnitConverter.php	/^    protected static $units = array($/;"	v
-unpack	AttrDef/URI/Email.php	/^    function unpack($string) {$/;"	f
-uri	AttrDef/CSS/URI.php	/^            $uri = substr($uri, 1, $new_length - 1);$/;"	v
-uri	AttrDef/CSS/URI.php	/^        $uri = str_replace($values, $keys, $uri);$/;"	v
-uri	AttrDef/CSS/URI.php	/^        $uri = trim(substr($uri_string, 0, $new_length));$/;"	v
-uri	AttrDef/URI.php	/^        $uri = $this->parseCDATA($uri);$/;"	v
-uri	AttrDef/URI.php	/^        $uri = $this->parser->parse($uri);$/;"	v
-uri	URIFilter/MakeAbsolute.php	/^            $uri = clone $this->base;$/;"	v
-uri	URIFilter/Munge.php	/^        $uri = $new_uri; \/\/ overwrite$/;"	v
-uri	URIParser.php	/^        $uri = $this->percentEncoder->normalize($uri);$/;"	v
-uri_def	AttrDef/URI.php	/^            $uri_def = $config->getDefinition('URI');$/;"	v
-uri_or_none	CSSDefinition.php	/^        $uri_or_none = new HTMLPurifier_AttrDef_CSS_Composite($/;"	v
-uri_string	AttrDef/CSS/URI.php	/^        $uri_string = $this->parseCDATA($uri_string);$/;"	v
-uri_string	AttrDef/CSS/URI.php	/^        $uri_string = substr($uri_string, 4);$/;"	v
-url	Filter/YouTube.php	/^        $url = $this->armorUrl($matches[1]);$/;"	v
-url	Injector/DisplayLinkURI.php	/^            $url = $token->start->attr['href'];$/;"	v
-url	Printer/ConfigForm.php	/^                $url = str_replace('%s', urlencode("$ns.$directive"), $this->docURL);$/;"	v
-userModules	HTMLModuleManager.php	/^    public $userModules = array();$/;"	v
-userinfo	URIParser.php	/^            $userinfo   = !empty($matches[1]) ? $matches[2] : null;$/;"	v
-uses	AttrDef/Enum.php	/^ * @warning The case-insensitive compare of this function uses PHP's$/;"	f
-utf8	Encoder.php	/^                foreach ($ascii_fix as $utf8 => $native) $clear_fix[$utf8] = '';$/;"	v
-val	ConfigSchema/Validator.php	/^        foreach ($d->allowed as $val => $x) {$/;"	v
-val	Printer/ConfigForm.php	/^                    foreach ($array as $val => $b) {$/;"	v
-val	Printer/ConfigForm.php	/^            foreach ($def->allowed as $val => $b) {$/;"	v
-valid	AttrDef/URI/Host.php	/^            $valid = $this->ipv6->validate($ip, $config, $context);$/;"	v
-valid_values	AttrDef/Enum.php	/^        $valid_values = array(), $case_sensitive = false$/;"	v
-valid_values	AttrDef/Enum.php	/^    public $valid_values   = array();$/;"	v
-valid_values	AttrDef/HTML/FrameTarget.php	/^    public $valid_values = false; \/\/ uninitialized value$/;"	v
-validate	AttrDef.php	/^    abstract public function validate($string, $config, $context);$/;"	f
-validate	AttrDef/CSS.php	/^    public function validate($css, $config, $context) {$/;"	f
-validate	AttrDef/CSS/AlphaValue.php	/^    public function validate($number, $config, $context) {$/;"	f
-validate	AttrDef/CSS/Background.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/CSS/BackgroundPosition.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/CSS/Border.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/CSS/Color.php	/^    public function validate($color, $config, $context) {$/;"	f
-validate	AttrDef/CSS/Composite.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/CSS/DenyElementDecorator.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/CSS/Filter.php	/^    public function validate($value, $config, $context) {$/;"	f
-validate	AttrDef/CSS/Font.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/CSS/FontFamily.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/CSS/ImportantDecorator.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/CSS/Length.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/CSS/ListStyle.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/CSS/Multiple.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/CSS/Number.php	/^    public function validate($number, $config, $context) {$/;"	f
-validate	AttrDef/CSS/Percentage.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/CSS/TextDecoration.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/CSS/URI.php	/^    public function validate($uri_string, $config, $context) {$/;"	f
-validate	AttrDef/Enum.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/HTML/Bool.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/HTML/Color.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/HTML/FrameTarget.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/HTML/ID.php	/^    public function validate($id, $config, $context) {$/;"	f
-validate	AttrDef/HTML/Length.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/HTML/LinkTypes.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/HTML/MultiLength.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/HTML/Nmtokens.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/HTML/Pixels.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/Integer.php	/^    public function validate($integer, $config, $context) {$/;"	f
-validate	AttrDef/Lang.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/Switch.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/Text.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/URI.php	/^    public function validate($uri, $config, $context) {$/;"	f
-validate	AttrDef/URI/Email/SimpleCheck.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/URI/Host.php	/^    public function validate($string, $config, $context) {$/;"	f
-validate	AttrDef/URI/IPv4.php	/^    public function validate($aIP, $config, $context) {$/;"	f
-validate	AttrDef/URI/IPv6.php	/^    public function validate($aIP, $config, $context) {$/;"	f
-validate	ConfigSchema/Interchange.php	/^    public function validate() {$/;"	f
-validate	ConfigSchema/Validator.php	/^    public function validate($interchange) {$/;"	f
-validate	Length.php	/^    protected function validate() {$/;"	f
-validate	URI.php	/^    public function validate($config, $context) {$/;"	f
-validate	URIScheme.php	/^    public function validate(&$uri, $config, $context) {$/;"	f
-validate	URIScheme/ftp.php	/^    public function validate(&$uri, $config, $context) {$/;"	f
-validate	URIScheme/http.php	/^    public function validate(&$uri, $config, $context) {$/;"	f
-validate	URIScheme/mailto.php	/^    public function validate(&$uri, $config, $context) {$/;"	f
-validate	URIScheme/news.php	/^    public function validate(&$uri, $config, $context) {$/;"	f
-validate	URIScheme/nntp.php	/^    public function validate(&$uri, $config, $context) {$/;"	f
-validateChildren	ChildDef.php	/^    abstract public function validateChildren($tokens_of_children, $config, $context);$/;"	f
-validateChildren	ChildDef/Chameleon.php	/^    public function validateChildren($tokens_of_children, $config, $context) {$/;"	f
-validateChildren	ChildDef/Custom.php	/^    public function validateChildren($tokens_of_children, $config, $context) {$/;"	f
-validateChildren	ChildDef/Empty.php	/^    public function validateChildren($tokens_of_children, $config, $context) {$/;"	f
-validateChildren	ChildDef/Optional.php	/^    public function validateChildren($tokens_of_children, $config, $context) {$/;"	f
-validateChildren	ChildDef/Required.php	/^    public function validateChildren($tokens_of_children, $config, $context) {$/;"	f
-validateChildren	ChildDef/StrictBlockquote.php	/^    public function validateChildren($tokens_of_children, $config, $context) {$/;"	f
-validateChildren	ChildDef/Table.php	/^    public function validateChildren($tokens_of_children, $config, $context) {$/;"	f
-validateDirective	ConfigSchema/Validator.php	/^    public function validateDirective($d) {$/;"	f
-validateDirectiveAliases	ConfigSchema/Validator.php	/^    public function validateDirectiveAliases($d) {$/;"	f
-validateDirectiveAllowed	ConfigSchema/Validator.php	/^    public function validateDirectiveAllowed($d) {$/;"	f
-validateDirectiveValueAliases	ConfigSchema/Validator.php	/^    public function validateDirectiveValueAliases($d) {$/;"	f
-validateId	ConfigSchema/Validator.php	/^    public function validateId($id) {$/;"	f
-validateToken	AttrValidator.php	/^    public function validateToken(&$token, &$config, $context) {$/;"	f
-validator	ConfigSchema/Interchange.php	/^        $validator = new HTMLPurifier_ConfigSchema_Validator();$/;"	v
-validator	Strategy/ValidateAttributes.php	/^        $validator = new HTMLPurifier_AttrValidator();$/;"	v
-value	AttrDef/CSS.php	/^            $value    = trim($value);$/;"	v
-value	AttrDef/CSS/Filter.php	/^            $value = $this->intValidator->validate($value, $config, $context);$/;"	v
-value	AttrDef/CSS/Filter.php	/^            $value = trim($value);$/;"	v
-value	AttrDef/CSS/Filter.php	/^            if ($int < 0) $value = '0';$/;"	v
-value	AttrDef/CSS/Filter.php	/^            if ($int > 100) $value = '100';$/;"	v
-value	AttrDef/CSS/Filter.php	/^        $value = $this->parseCDATA($value);$/;"	v
-value	AttrTransform.php	/^        $value = $attr[$key];$/;"	v
-value	AttrTransform/EnumToCSS.php	/^        $value = trim($attr[$this->attr]);$/;"	v
-value	AttrTransform/EnumToCSS.php	/^        if (!$this->caseSensitive) $value = strtolower($value);$/;"	v
-value	Config.php	/^                $value = $def->aliases[$value];$/;"	v
-value	Config.php	/^            $value = $a;$/;"	v
-value	Config.php	/^            $value = $mq ? stripslashes($array[$skey]) : $array[$skey];$/;"	v
-value	Config.php	/^            $value = $this->parser->parse($value, $type, $allow_null);$/;"	v
-value	ConfigSchema/Builder/Xml.php	/^                    foreach ($directive->allowed as $value => $x) $this->writeElement('value', $value);$/;"	v
-value	ContentSets.php	/^        $value = $def->content_model;$/;"	v
-value	HTMLModule/Edit.php	/^        $value = explode('!', $def->content_model);$/;"	v
-value	Lexer/DirectLex.php	/^                    $value = $quoted_value;$/;"	v
-value	Lexer/DirectLex.php	/^                    $value = substr($quoted_value, 1);$/;"	v
-value	Lexer/DirectLex.php	/^                $value = substr($quoted_value, 1, strlen($quoted_value) - 2);$/;"	v
-value	Lexer/DirectLex.php	/^                $value = substr($string, $value_begin, $value_end - $value_begin);$/;"	v
-value	Lexer/DirectLex.php	/^                if ($value === false) $value = '';$/;"	v
-value	Lexer/DirectLex.php	/^            if ($value === false) $value = '';$/;"	v
-value	Printer.php	/^                foreach ($obj->valid_values as $value => $bool) {$/;"	v
-value	Printer.php	/^        if (is_bool($value)) $value = $value ? 'On' : 'Off';$/;"	v
-value	Printer/ConfigForm.php	/^                    $value = $nvalue;$/;"	v
-value	Printer/ConfigForm.php	/^                    $value = '';$/;"	v
-value	Printer/ConfigForm.php	/^                    $value = array();$/;"	v
-value	Printer/ConfigForm.php	/^                    $value = implode(PHP_EOL, $value);$/;"	v
-value	Printer/ConfigForm.php	/^            $value = serialize($value);$/;"	v
-value_begin	Lexer/DirectLex.php	/^                    $value_begin = $cursor;$/;"	v
-value_end	Lexer/DirectLex.php	/^                    $value_end = $cursor;$/;"	v
-values	AttrDef/CSS/URI.php	/^        $values = array('\\\\(', '\\\\)', '\\\\,', '\\\\ ', '\\\\"', "\\\\'");$/;"	v
-values	AttrDef/Enum.php	/^        $values = explode(',', $string);$/;"	v
-values	ContentSets.php	/^    protected $values = array();$/;"	v
-values	Printer.php	/^                $values = array();$/;"	v
-var	ChildDef/Table.php	/^                            $var = $collection[$tag_index]->name;$/;"	v
-var	Context.php	/^            $var = null; \/\/ so we can return by reference$/;"	v
-var	VarParser.php	/^        $var = $this->parseImplementation($var, $type, $allow_null);$/;"	v
-var	VarParser.php	/^        if ($allow_null && $var === null) return null;$/;"	v
-var	VarParser/Flexible.php	/^                        $var = $nvar;$/;"	v
-var	VarParser/Flexible.php	/^                        $var = explode(',',$var);$/;"	v
-var	VarParser/Flexible.php	/^                        $var = false;$/;"	v
-var	VarParser/Flexible.php	/^                        $var = preg_split('\/(,|[\\n\\r]+)\/', $var);$/;"	v
-var	VarParser/Flexible.php	/^                        $var = true;$/;"	v
-var	VarParser/Flexible.php	/^                    $var = (bool) $var;$/;"	v
-var	VarParser/Flexible.php	/^                    if ($var == 'on' || $var == 'true' || $var == '1') {$/;"	v
-var	VarParser/Flexible.php	/^                    } elseif ($var == 'off' || $var == 'false' || $var == '0') {$/;"	v
-var	VarParser/Flexible.php	/^                if ((is_string($var) && is_numeric($var)) || is_int($var)) $var = (float) $var;$/;"	v
-var	VarParser/Flexible.php	/^                if (is_int($var) && ($var === 0 || $var === 1)) {$/;"	v
-var	VarParser/Flexible.php	/^                if (is_string($var) && ctype_digit($var)) $var = (int) $var;$/;"	v
-var	VarParser/Flexible.php	/^        if ($allow_null && $var === null) return null;$/;"	v
-var	VarParser/Native.php	/^        $var = null;$/;"	v
-version	Config.php	/^    public $version = '3.3.0';$/;"	v
-vtype	VarParser.php	/^        $vtype = gettype($var);$/;"	v
-w	Encoder.php	/^                    $w = (($code >> 18) & 7)  | 240;$/;"	v
-was	AttrDef/Integer.php	/^ * @note While this class was modeled off the CSS definition, no currently$/;"	c
-was	Encoder.php	/^     *       a string would be somewhat expensive, so the function was modded to$/;"	f
-whitespace	ChildDef/Required.php	/^    protected $whitespace = false;$/;"	v
-width	AttrTransform/ImgSpace.php	/^        $width = $this->confiscateAttr($attr, $this->attr);$/;"	v
-will	HTMLModuleManager.php	/^     * @note This function will not call autoload, you must instantiate$/;"	f
-will	URISchemeRegistry.php	/^     *       the function will copy it and return it all further times.$/;"	f
-with	ConfigSchema/Validator.php	/^    protected function with($obj, $member) {$/;"	f
-working	Encoder.php	/^                $working = $bytevalue & 0x07;$/;"	v
-working	Encoder.php	/^                $working = $bytevalue & 0x0F;$/;"	v
-working	Encoder.php	/^                $working = $bytevalue & 0x1F;$/;"	v
-working	Encoder.php	/^                $working = $working << 6;$/;"	v
-working	Encoder.php	/^        $working = 0;$/;"	v
-would	ConfigSchema/Validator.php	/^ *       design decision in that class would prevent this validation from$/;"	c
-wrapHTML	Lexer/DOMLex.php	/^    protected function wrapHTML($html, $config, $context) {$/;"	f
-writeHTMLDiv	ConfigSchema/Builder/Xml.php	/^    protected function writeHTMLDiv($html) {$/;"	f
-x	Encoder.php	/^            $x = $code;$/;"	v
-x	Encoder.php	/^            $x = ($code & 63) | 128;$/;"	v
-x	Encoder.php	/^        $x = $y = $z = $w = 0;$/;"	v
-xml	Doctype.php	/^    public $xml = true;$/;"	v
-xml	Doctype.php	/^    public function __construct($name = null, $xml = true, $modules = array(),$/;"	v
-xml	DoctypeRegistry.php	/^    public function register($doctype, $xml = true, $modules = array(),$/;"	v
-xml	HTMLModuleManager.php	/^        $xml = array('XMLCommonAttributes');$/;"	v
-xml_lang	AttrTransform/Lang.php	/^        $xml_lang = isset($attr['xml:lang']) ? $attr['xml:lang'] : false;$/;"	v
-xml_lang	AttrTransform/Lang.php	/^        if ($lang !== false && $xml_lang === false) {$/;"	v
-y	Encoder.php	/^                $y = (($code & 2047) >> 6) | 192;$/;"	v
-y	Encoder.php	/^                $y = (($code & 4032) >> 6) | 128;$/;"	v
-z	Encoder.php	/^                    $z = (($code >> 12) & 15) | 224;$/;"	v
-z	Encoder.php	/^                    $z = (($code >> 12) & 63) | 128;$/;"	v
-zero	AttrDef/Integer.php	/^    protected $zero = true;$/;"	v
diff --git a/lib/php/UNL/Autoload.php b/lib/php/UNL/Autoload.php
deleted file mode 100644
index b1bd7a63b331e15246225c59c70fdb01e55b2d17..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Autoload.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-function UNL_Autoload($class)
-{
-    if (substr($class, 0, 4) !== 'UNL_') {
-        return false;
-    }
-    $fp = @fopen(str_replace('_', '/', $class) . '.php', 'r', true);
-    if ($fp) {
-        fclose($fp);
-        require str_replace('_', '/', $class) . '.php';
-        if (!class_exists($class, false) && !interface_exists($class, false)) {
-            die(new Exception('Class ' . $class . ' was not present in ' .
-                str_replace('_', '/', $class) . '.php (include_path="' . get_include_path() .
-                '") [UNL_Autoload version 1.0]'));
-        }
-        return true;
-    }
-    $e = new Exception('Class ' . $class . ' could not be loaded from ' .
-        str_replace('_', '/', $class) . '.php, file does not exist (include_path="' . get_include_path() .
-        '") [UNL_Autoload version 1.0]');
-    $trace = $e->getTrace();
-    if (isset($trace[2]) && isset($trace[2]['function']) &&
-          in_array($trace[2]['function'], array('class_exists', 'interface_exists'))) {
-        return false;
-    }
-    if (isset($trace[1]) && isset($trace[1]['function']) &&
-          in_array($trace[1]['function'], array('class_exists', 'interface_exists'))) {
-        return false;
-    }
-    die ((string) $e);
-}
-
-// set up __autoload
-if (function_exists('spl_autoload_register')) {
-    if (!($_____t = spl_autoload_functions()) || !in_array('UNL_Autoload', spl_autoload_functions())) {
-        spl_autoload_register('UNL_Autoload');
-        if (function_exists('__autoload') && ($_____t === false)) {
-            // __autoload() was being used, but now would be ignored, add
-            // it to the autoload stack
-            spl_autoload_register('__autoload');
-        }
-    }
-    unset($_____t);
-} elseif (!function_exists('__autoload')) {
-    function __autoload($class) { return UNL_Autoload($class); }
-}
-
-// set up include_path if it doesn't register our current location
-$____paths = explode(PATH_SEPARATOR, get_include_path());
-$____found = false;
-foreach ($____paths as $____path) {
-    if ($____path == dirname(dirname(__FILE__))) {
-        $____found = true;
-        break;
-    }
-}
-if (!$____found) {
-    set_include_path(get_include_path() . PATH_SEPARATOR . dirname(dirname(__FILE__)));
-}
-unset($____paths);
-unset($____path);
-unset($____found);
diff --git a/lib/php/UNL/Cache/Lite.php b/lib/php/UNL/Cache/Lite.php
deleted file mode 100644
index 4c3240a2aaab1e46955958d994902014e675c42e..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Cache/Lite.php
+++ /dev/null
@@ -1,844 +0,0 @@
-<?php
-
-/**
-* Fast, light and safe Cache Class
-*
-* UNL_Cache_Lite is a fast, light and safe cache system. It's optimized
-* for file containers. It is fast and safe (because it uses file
-* locking and/or anti-corruption tests).
-*
-* There are some examples in the 'docs/examples' file
-* Technical choices are described in the 'docs/technical' file
-*
-* Memory Caching is from an original idea of
-* Mike BENOIT <ipso@snappymail.ca>
-*
-* Nota : A chinese documentation (thanks to RainX <china_1982@163.com>) is
-* available at :
-* http://rainx.phpmore.com/manual/UNL_Cache_Lite.html
-*
-* @package UNL_Cache_Lite
-* @category Caching
-* @version $Id: Lite.php 283629 2009-07-07 05:34:37Z tacker $
-* @author Fabien MARTY <fab@php.net>
-*/
-
-define('UNL_CACHE_LITE_ERROR_RETURN', 1);
-define('UNL_CACHE_LITE_ERROR_DIE', 8); 
-
-class UNL_Cache_Lite
-{
-
-    // --- Private properties ---
-
-    /**
-    * Directory where to put the cache files
-    * (make sure to add a trailing slash)
-    *
-    * @var string $_cacheDir
-    */
-    protected $_cacheDir = '/tmp/';
-
-    /**
-    * Enable / disable caching
-    *
-    * (can be very usefull for the debug of cached scripts)
-    *
-    * @var boolean $_caching
-    */
-    protected $_caching = true;
-
-    /**
-    * Cache lifetime (in seconds)
-    *
-    * If null, the cache is valid forever.
-    *
-    * @var int $_lifeTime
-    */
-    protected $_lifeTime = 3600;
-
-    /**
-    * Enable / disable fileLocking
-    *
-    * (can avoid cache corruption under bad circumstances)
-    *
-    * @var boolean $_fileLocking
-    */
-    protected $_fileLocking = true;
-
-    /**
-    * Timestamp of the last valid cache
-    *
-    * @var int $_refreshTime
-    */
-    protected $_refreshTime;
-
-    /**
-    * File name (with path)
-    *
-    * @var string $_file
-    */
-    protected $_file;
-    
-    /**
-    * File name (without path)
-    *
-    * @var string $_fileName
-    */
-    protected $_fileName;
-
-    /**
-    * Enable / disable write control (the cache is read just after writing to detect corrupt entries)
-    *
-    * Enable write control will lightly slow the cache writing but not the cache reading
-    * Write control can detect some corrupt cache files but maybe it's not a perfect control
-    *
-    * @var boolean $_writeControl
-    */
-    protected $_writeControl = true;
-
-    /**
-    * Enable / disable read control
-    *
-    * If enabled, a control key is embeded in cache file and this key is compared with the one
-    * calculated after the reading.
-    *
-    * @var boolean $_writeControl
-    */
-    protected $_readControl = true;
-
-    /**
-    * Type of read control (only if read control is enabled)
-    *
-    * Available values are :
-    * 'md5' for a md5 hash control (best but slowest)
-    * 'crc32' for a crc32 hash control (lightly less safe but faster, better choice)
-    * 'strlen' for a length only test (fastest)
-    *
-    * @var boolean $_readControlType
-    */
-    protected $_readControlType = 'crc32';
-
-    /**
-    * Pear error mode (when raiseError is called)
-    *
-    * (see PEAR doc)
-    *
-    * @see setToDebug()
-    * @var int $_pearErrorMode
-    */
-    protected $_errorMode = UNL_CACHE_LITE_ERROR_RETURN;
-    
-    /**
-    * Current cache id
-    *
-    * @var string $_id
-    */
-    protected $_id;
-
-    /**
-    * Current cache group
-    *
-    * @var string $_group
-    */
-    protected $_group;
-
-    /**
-    * Enable / Disable "Memory Caching"
-    *
-    * NB : There is no lifetime for memory caching ! 
-    *
-    * @var boolean $_memoryCaching
-    */
-    protected $_memoryCaching = false;
-
-    /**
-    * Enable / Disable "Only Memory Caching"
-    * (be carefull, memory caching is "beta quality")
-    *
-    * @var boolean $_onlyMemoryCaching
-    */
-    protected $_onlyMemoryCaching = false;
-
-    /**
-    * Memory caching array
-    *
-    * @var array $_memoryCachingArray
-    */
-    protected $_memoryCachingArray = array();
-
-    /**
-    * Memory caching counter
-    *
-    * @var int $memoryCachingCounter
-    */
-    protected $_memoryCachingCounter = 0;
-
-    /**
-    * Memory caching limit
-    *
-    * @var int $memoryCachingLimit
-    */
-    protected $_memoryCachingLimit = 1000;
-    
-    /**
-    * File Name protection
-    *
-    * if set to true, you can use any cache id or group name
-    * if set to false, it can be faster but cache ids and group names
-    * will be used directly in cache file names so be carefull with
-    * special characters...
-    *
-    * @var boolean $fileNameProtection
-    */
-    protected $_fileNameProtection = true;
-    
-    /**
-    * Enable / disable automatic serialization
-    *
-    * it can be used to save directly datas which aren't strings
-    * (but it's slower)    
-    *
-    * @var boolean $_serialize
-    */
-    protected $_automaticSerialization = false;
-    
-    /**
-    * Disable / Tune the automatic cleaning process
-    *
-    * The automatic cleaning process destroy too old (for the given life time)
-    * cache files when a new cache file is written.
-    * 0               => no automatic cache cleaning
-    * 1               => systematic cache cleaning
-    * x (integer) > 1 => automatic cleaning randomly 1 times on x cache write
-    *
-    * @var int $_automaticCleaning
-    */
-    protected $_automaticCleaningFactor = 0;
-    
-    /**
-    * Nested directory level
-    *
-    * Set the hashed directory structure level. 0 means "no hashed directory 
-    * structure", 1 means "one level of directory", 2 means "two levels"... 
-    * This option can speed up UNL_Cache_Lite only when you have many thousands of 
-    * cache file. Only specific benchs can help you to choose the perfect value 
-    * for you. Maybe, 1 or 2 is a good start.
-    *
-    * @var int $_hashedDirectoryLevel
-    */
-    protected $_hashedDirectoryLevel = 0;
-    
-    /**
-    * Umask for hashed directory structure
-    *
-    * @var int $_hashedDirectoryUmask
-    */
-    protected $_hashedDirectoryUmask = 0700;
-    
-    /**
-     * API break for error handling in UNL_Cache_Lite_ERROR_RETURN mode
-     * 
-     * In UNL_Cache_Lite_ERROR_RETURN mode, error handling was not good because
-     * for example save() method always returned a boolean (a PEAR_Error object
-     * would be better in UNL_Cache_Lite_ERROR_RETURN mode). To correct this without
-     * breaking the API, this option (false by default) can change this handling.
-     * 
-     * @var boolean
-     */
-    protected $_errorHandlingAPIBreak = false;
-    
-    // --- Public methods ---
-
-    /**
-    * Constructor
-    *
-    * $options is an assoc. Available options are :
-    * $options = array(
-    *     'cacheDir' => directory where to put the cache files (string),
-    *     'caching' => enable / disable caching (boolean),
-    *     'lifeTime' => cache lifetime in seconds (int),
-    *     'fileLocking' => enable / disable fileLocking (boolean),
-    *     'writeControl' => enable / disable write control (boolean),
-    *     'readControl' => enable / disable read control (boolean),
-    *     'readControlType' => type of read control 'crc32', 'md5', 'strlen' (string),
-    *     'pearErrorMode' => pear error mode (when raiseError is called) (cf PEAR doc) (int),
-    *     'memoryCaching' => enable / disable memory caching (boolean),
-    *     'onlyMemoryCaching' => enable / disable only memory caching (boolean),
-    *     'memoryCachingLimit' => max nbr of records to store into memory caching (int),
-    *     'fileNameProtection' => enable / disable automatic file name protection (boolean),
-    *     'automaticSerialization' => enable / disable automatic serialization (boolean),
-    *     'automaticCleaningFactor' => distable / tune automatic cleaning process (int),
-    *     'hashedDirectoryLevel' => level of the hashed directory system (int),
-    *     'hashedDirectoryUmask' => umask for hashed directory structure (int),
-    *     'errorHandlingAPIBreak' => API break for better error handling ? (boolean)
-    * );
-    *
-    * @param array $options options
-    * @access public
-    */
-    function __construct($options = array(NULL))
-    {
-        $this->setOptions($options);
-    }
-    
-    /**
-     * Allows you to set an array of options.
-     * 
-     * @param array $options associative array of options
-     */
-    function setOptions($options = array(NULL))
-    {
-        foreach($options as $key => $value) {
-            $this->setOption($key, $value);
-        }
-    }
-    
-    /**
-    * Generic way to set a UNL_Cache_Lite option
-    *
-    * see UNL_Cache_Lite constructor for available options
-    *
-    * @var string $name name of the option
-    * @var mixed $value value of the option
-    * @access public
-    */
-    function setOption($name, $value) 
-    {
-        $availableOptions = array('errorHandlingAPIBreak', 'hashedDirectoryUmask', 'hashedDirectoryLevel', 'automaticCleaningFactor', 'automaticSerialization', 'fileNameProtection', 'memoryCaching', 'onlyMemoryCaching', 'memoryCachingLimit', 'cacheDir', 'caching', 'lifeTime', 'fileLocking', 'writeControl', 'readControl', 'readControlType', 'pearErrorMode');
-        if (in_array($name, $availableOptions)) {
-            $property = '_'.$name;
-            $this->$property = $value;
-        }
-    }
-    
-    /**
-    * Test if a cache is available and (if yes) return it
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
-    * @return string data of the cache (else : false)
-    * @access public
-    */
-    function get($id, $group = 'default', $doNotTestCacheValidity = false)
-    {
-        $this->_id = $id;
-        $this->_group = $group;
-        $data = false;
-        if ($this->_caching) {
-            $this->_setRefreshTime();
-            $this->_setFileName($id, $group);
-            clearstatcache();
-            if ($this->_memoryCaching) {
-                if (isset($this->_memoryCachingArray[$this->_file])) {
-                    if ($this->_automaticSerialization) {
-                        return unserialize($this->_memoryCachingArray[$this->_file]);
-                    }
-                    return $this->_memoryCachingArray[$this->_file];
-                }
-                if ($this->_onlyMemoryCaching) {
-                    return false;
-                }                
-            }
-            if (($doNotTestCacheValidity) || (is_null($this->_refreshTime))) {
-                if (file_exists($this->_file)) {
-                    $data = $this->_read();
-                }
-            } else {
-                if ((file_exists($this->_file)) && (@filemtime($this->_file) > $this->_refreshTime)) {
-                    $data = $this->_read();
-                }
-            }
-            if (($data) and ($this->_memoryCaching)) {
-                $this->_memoryCacheAdd($data);
-            }
-            if (($this->_automaticSerialization) and (is_string($data))) {
-                $data = unserialize($data);
-            }
-            return $data;
-        }
-        return false;
-    }
-    
-    /**
-    * Save some data in a cache file
-    *
-    * @param string $data data to put in cache (can be another type than strings if automaticSerialization is on)
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @return boolean true if no problem (else : false or a PEAR_Error object)
-    * @access public
-    */
-    function save($data, $id = NULL, $group = 'default')
-    {
-        if ($this->_caching) {
-            if ($this->_automaticSerialization) {
-                $data = serialize($data);
-            }
-            if (isset($id)) {
-                $this->_setFileName($id, $group);
-            }
-            if ($this->_memoryCaching) {
-                $this->_memoryCacheAdd($data);
-                if ($this->_onlyMemoryCaching) {
-                    return true;
-                }
-            }
-            if ($this->_automaticCleaningFactor>0 && ($this->_automaticCleaningFactor==1 || mt_rand(1, $this->_automaticCleaningFactor)==1)) {
-				$this->clean(false, 'old');			
-			}
-            if ($this->_writeControl) {
-                $res = $this->_writeAndControl($data);
-                if (is_bool($res)) {
-                    if ($res) {
-                        return true;  
-                    }
-                    // if $res if false, we need to invalidate the cache
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
-                    return false;
-                }            
-            } else {
-                $res = $this->_write($data);
-            }
-            if (is_object($res)) {
-                // $res is a PEAR_Error object 
-                if (!($this->_errorHandlingAPIBreak)) {   
-                    return false; // we return false (old API)
-                }
-            }
-            return $res;
-        }
-        return false;
-    }
-
-    /**
-    * Remove a cache file
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @param boolean $checkbeforeunlink check if file exists before removing it
-    * @return boolean true if no problem
-    * @access public
-    */
-    function remove($id, $group = 'default', $checkbeforeunlink = false)
-    {
-        $this->_setFileName($id, $group);
-        if ($this->_memoryCaching) {
-            if (isset($this->_memoryCachingArray[$this->_file])) {
-                unset($this->_memoryCachingArray[$this->_file]);
-                $this->_memoryCachingCounter = $this->_memoryCachingCounter - 1;
-            }
-            if ($this->_onlyMemoryCaching) {
-                return true;
-            }
-        }
-        if ( $checkbeforeunlink ) {
-            if (!file_exists($this->_file)) return true;
-        }
-        return $this->_unlink($this->_file);
-    }
-
-    /**
-    * Clean the cache
-    *
-    * if no group is specified all cache files will be destroyed
-    * else only cache files of the specified group will be destroyed
-    *
-    * @param string $group name of the cache group
-    * @param string $mode flush cache mode : 'old', 'ingroup', 'notingroup', 
-    *                                        'callback_myFunction'
-    * @return boolean true if no problem
-    * @access public
-    */
-    function clean($group = false, $mode = 'ingroup')
-    {
-        return $this->_cleanDir($this->_cacheDir, $group, $mode);
-    }
-       
-    /**
-    * Set to debug mode
-    *
-    * When an error is found, the script will stop and the message will be displayed
-    * (in debug mode only). 
-    *
-    * @access public
-    */
-    function setToDebug()
-    {
-        $this->setOption('pearErrorMode', UNL_CACHE_LITE_ERROR_DIE);
-    }
-
-    /**
-    * Set a new life time
-    *
-    * @param int $newLifeTime new life time (in seconds)
-    * @access public
-    */
-    function setLifeTime($newLifeTime)
-    {
-        $this->_lifeTime = $newLifeTime;
-        $this->_setRefreshTime();
-    }
-
-    /**
-    * Save the state of the caching memory array into a cache file cache
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @access public
-    */
-    function saveMemoryCachingState($id, $group = 'default')
-    {
-        if ($this->_caching) {
-            $array = array(
-                'counter' => $this->_memoryCachingCounter,
-                'array' => $this->_memoryCachingArray
-            );
-            $data = serialize($array);
-            $this->save($data, $id, $group);
-        }
-    }
-
-    /**
-    * Load the state of the caching memory array from a given cache file cache
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
-    * @access public
-    */
-    function getMemoryCachingState($id, $group = 'default', $doNotTestCacheValidity = false)
-    {
-        if ($this->_caching) {
-            if ($data = $this->get($id, $group, $doNotTestCacheValidity)) {
-                $array = unserialize($data);
-                $this->_memoryCachingCounter = $array['counter'];
-                $this->_memoryCachingArray = $array['array'];
-            }
-        }
-    }
-    
-    /**
-    * Return the cache last modification time
-    *
-    * BE CAREFUL : THIS METHOD IS FOR HACKING ONLY !
-    *
-    * @return int last modification time
-    */
-    function lastModified() 
-    {
-        return @filemtime($this->_file);
-    }
-    
-    /**
-    * Trigger a PEAR error
-    *
-    * To improve performances, the PEAR.php file is included dynamically.
-    * The file is so included only when an error is triggered. So, in most
-    * cases, the file isn't included and perfs are much better.
-    *
-    * @param string $msg error message
-    * @param int $code error code
-    * @access public
-    */
-    function raiseError($msg, $code)
-    {
-        throw new Exception($msg, $code);
-    }
-    
-    /**
-     * Extend the life of a valid cache file
-     * 
-     * see http://pear.php.net/bugs/bug.php?id=6681
-     * 
-     * @access public
-     */
-    function extendLife()
-    {
-        @touch($this->_file);
-    }
-    
-    // --- Private methods ---
-    
-    /**
-    * Compute & set the refresh time
-    *
-    * @access private
-    */
-    protected function _setRefreshTime() 
-    {
-        if (is_null($this->_lifeTime)) {
-            $this->_refreshTime = null;
-        } else {
-            $this->_refreshTime = time() - $this->_lifeTime;
-        }
-    }
-    
-    /**
-    * Remove a file
-    * 
-    * @param string $file complete file path and name
-    * @return boolean true if no problem
-    * @access private
-    */
-    protected function _unlink($file)
-    {
-        if (file_exists($file) && !@unlink($file)) {
-            return $this->raiseError('UNL_Cache_Lite : Unable to remove cache '.$file, -3);
-        }
-        return true;        
-    }
-
-    /**
-    * Recursive function for cleaning cache file in the given directory
-    *
-    * @param string $dir directory complete path (with a trailing slash)
-    * @param string $group name of the cache group
-    * @param string $mode flush cache mode : 'old', 'ingroup', 'notingroup',
-                                             'callback_myFunction'
-    * @return boolean true if no problem
-    * @access private
-    */
-    protected function _cleanDir($dir, $group = false, $mode = 'ingroup')     
-    {
-        if ($this->_fileNameProtection) {
-            $motif = ($group) ? 'unlcache_'.md5($group).'_' : 'unlcache_';
-        } else {
-            $motif = ($group) ? 'unlcache_'.$group.'_' : 'unlcache_';
-        }
-        if ($this->_memoryCaching) {
-	    foreach($this->_memoryCachingArray as $key => $v) {
-                if (strpos($key, $motif) !== false) {
-                    unset($this->_memoryCachingArray[$key]);
-                    $this->_memoryCachingCounter = $this->_memoryCachingCounter - 1;
-                }
-            }
-            if ($this->_onlyMemoryCaching) {
-                return true;
-            }
-        }
-        if (!($dh = opendir($dir))) {
-            return $this->raiseError('UNL_Cache_Lite : Unable to open cache directory !', -4);
-        }
-        $result = true;
-        while ($file = readdir($dh)) {
-            if (($file != '.') && ($file != '..')) {
-                if (substr($file, 0, 6)=='unlcache_') {
-                    $file2 = $dir . $file;
-                    if (is_file($file2)) {
-                        switch (substr($mode, 0, 9)) {
-                            case 'old':
-                                // files older than lifeTime get deleted from cache
-                                if (!is_null($this->_lifeTime)) {
-                                    if ((time() - @filemtime($file2)) > $this->_lifeTime) {
-                                        $result = ($result and ($this->_unlink($file2)));
-                                    }
-                                }
-                                break;
-                            case 'notingrou':
-                                if (strpos($file2, $motif) === false) {
-                                    $result = ($result and ($this->_unlink($file2)));
-                                }
-                                break;
-                            case 'callback_':
-                                $func = substr($mode, 9, strlen($mode) - 9);
-                                if ($func($file2, $group)) {
-                                    $result = ($result and ($this->_unlink($file2)));
-                                }
-                                break;
-                            case 'ingroup':
-                            default:
-                                if (strpos($file2, $motif) !== false) {
-                                    $result = ($result and ($this->_unlink($file2)));
-                                }
-                                break;
-                        }
-                    }
-                    if ((is_dir($file2)) and ($this->_hashedDirectoryLevel>0)) {
-                        $result = ($result and ($this->_cleanDir($file2 . '/', $group, $mode)));
-                    }
-                }
-            }
-        }
-        return $result;
-    }
-      
-    /**
-    * Add some date in the memory caching array
-    *
-    * @param string $data data to cache
-    * @access private
-    */
-    protected function _memoryCacheAdd($data)
-    {
-        $this->_memoryCachingArray[$this->_file] = $data;
-        if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
-            list($key, ) = each($this->_memoryCachingArray);
-            unset($this->_memoryCachingArray[$key]);
-        } else {
-            $this->_memoryCachingCounter = $this->_memoryCachingCounter + 1;
-        }
-    }
-
-    /**
-    * Make a file name (with path)
-    *
-    * @param string $id cache id
-    * @param string $group name of the group
-    * @access private
-    */
-    protected function _setFileName($id, $group)
-    {
-        
-        if ($this->_fileNameProtection) {
-            $suffix = 'unlcache_'.md5($group).'_'.md5($id);
-        } else {
-            $suffix = 'unlcache_'.$group.'_'.$id;
-        }
-        $root = $this->_cacheDir;
-        if ($this->_hashedDirectoryLevel>0) {
-            $hash = md5($suffix);
-            for ($i=0 ; $i<$this->_hashedDirectoryLevel ; $i++) {
-                $root = $root . 'unlcache_' . substr($hash, 0, $i + 1) . '/';
-            }   
-        }
-        $this->_fileName = $suffix;
-        $this->_file = $root.$suffix;
-    }
-    
-    /**
-    * Read the cache file and return the content
-    *
-    * @return string content of the cache file (else : false or a PEAR_Error object)
-    * @access private
-    */
-    protected function _read()
-    {
-        $fp = @fopen($this->_file, "rb");
-        if ($this->_fileLocking) @flock($fp, LOCK_SH);
-        if ($fp) {
-            clearstatcache();
-            $length = @filesize($this->_file);
-            $mqr = get_magic_quotes_runtime();
-            if ($mqr) {
-                set_magic_quotes_runtime(0);
-            }
-            if ($this->_readControl) {
-                $hashControl = @fread($fp, 32);
-                $length = $length - 32;
-            } 
-            if ($length) {
-                $data = @fread($fp, $length);
-            } else {
-                $data = '';
-            }
-            if ($mqr) {
-                set_magic_quotes_runtime($mqr);
-            }
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
-            @fclose($fp);
-            if ($this->_readControl) {
-                $hashData = $this->_hash($data, $this->_readControlType);
-                if ($hashData != $hashControl) {
-                    if (!(is_null($this->_lifeTime))) {
-                        @touch($this->_file, time() - 2*abs($this->_lifeTime)); 
-                    } else {
-                        @unlink($this->_file);
-                    }
-                    return false;
-                }
-            }
-            return $data;
-        }
-        return $this->raiseError('UNL_Cache_Lite : Unable to read cache !', -2); 
-    }
-    
-    /**
-    * Write the given data in the cache file
-    *
-    * @param string $data data to put in cache
-    * @return boolean true if ok (a PEAR_Error object else)
-    * @access private
-    */
-    protected function _write($data)
-    {
-        if ($this->_hashedDirectoryLevel > 0) {
-            $hash = md5($this->_fileName);
-            $root = $this->_cacheDir;
-            for ($i=0 ; $i<$this->_hashedDirectoryLevel ; $i++) {
-                $root = $root . 'unlcache_' . substr($hash, 0, $i + 1) . '/';
-                if (!(@is_dir($root))) {
-                    @mkdir($root, $this->_hashedDirectoryUmask);
-                }
-            }
-        }
-        $fp = @fopen($this->_file, "wb");
-        if ($fp) {
-            if ($this->_fileLocking) @flock($fp, LOCK_EX);
-            if ($this->_readControl) {
-                @fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
-            }
-            $mqr = get_magic_quotes_runtime();
-            if ($mqr) {
-                set_magic_quotes_runtime(0);
-            }
-            @fwrite($fp, $data);
-            if ($mqr) {
-                set_magic_quotes_runtime($mqr);
-            }
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
-            @fclose($fp);
-            return true;
-        }      
-        return $this->raiseError('UNL_Cache_Lite : Unable to write cache file : '.$this->_file, -1);
-    }
-       
-    /**
-    * Write the given data in the cache file and control it just after to avoir corrupted cache entries
-    *
-    * @param string $data data to put in cache
-    * @return boolean true if the test is ok (else : false or a PEAR_Error object)
-    * @access private
-    */
-    protected function _writeAndControl($data)
-    {
-        $result = $this->_write($data);
-        if (is_object($result)) {
-            return $result; # We return the PEAR_Error object
-        }
-        $dataRead = $this->_read();
-        if (is_object($dataRead)) {
-            return $dataRead; # We return the PEAR_Error object
-        }
-        if ((is_bool($dataRead)) && (!$dataRead)) {
-            return false; 
-        }
-        return ($dataRead==$data);
-    }
-    
-    /**
-    * Make a control key with the string containing datas
-    *
-    * @param string $data data
-    * @param string $controlType type of control 'md5', 'crc32' or 'strlen'
-    * @return string control key
-    * @access private
-    */
-    protected function _hash($data, $controlType)
-    {
-        switch ($controlType) {
-        case 'md5':
-            return md5($data);
-        case 'crc32':
-            return sprintf('% 32d', crc32($data));
-        case 'strlen':
-            return sprintf('% 32d', strlen($data));
-        default:
-            return $this->raiseError('Unknown controlType ! (available values are only \'md5\', \'crc32\', \'strlen\')', -5);
-        }
-    }
-    
-} 
-
-?>
diff --git a/lib/php/UNL/Cache/Lite/File.php b/lib/php/UNL/Cache/Lite/File.php
deleted file mode 100644
index 3cbdc19f50da9b2a5fe76e0d127d246583accbc6..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Cache/Lite/File.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/**
-* This class extends UNL_Cache_Lite and offers a cache system driven by a master file
-*
-* With this class, cache validity is only dependent of a given file. Cache files
-* are valid only if they are older than the master file. It's a perfect way for
-* caching templates results (if the template file is newer than the cache, cache
-* must be rebuild...) or for config classes...
-* There are some examples in the 'docs/examples' file
-* Technical choices are described in the 'docs/technical' file
-*
-* @package UNL_Cache_Lite
-* @version $Id: File.php 276823 2009-03-07 12:55:39Z tacker $
-* @author Fabien MARTY <fab@php.net>
-*/
-
-class UNL_Cache_Lite_File extends UNL_Cache_Lite
-{
-
-    // --- Private properties ---
-    
-    /**
-    * Complete path of the file used for controlling the cache lifetime
-    *
-    * @var string $_masterFile
-    */
-    protected $_masterFile = '';
-    
-    /**
-    * Masterfile mtime
-    *
-    * @var int $_masterFile_mtime
-    */
-    protected $_masterFile_mtime = 0;
-    
-    // --- Public methods ----
-    
-    /**
-    * Constructor
-    *
-    * $options is an assoc. To have a look at availables options,
-    * see the constructor of the UNL_Cache_Lite class in 'UNL_Cache_Lite.php'
-    *
-    * Comparing to UNL_Cache_Lite constructor, there is another option :
-    * $options = array(
-    *     (...) see UNL_Cache_Lite constructor
-    *     'masterFile' => complete path of the file used for controlling the cache lifetime(string)
-    * );
-    *
-    * @param array $options options
-    * @access public
-    */
-    function __construct($options = array(NULL))
-    {   
-        $options['lifetime'] = 0;
-        $this->setOptions($options);
-        if (isset($options['masterFile'])) {
-            $this->_masterFile = $options['masterFile'];
-        } else {
-            return $this->raiseError('UNL_Cache_Lite_File : masterFile option must be set !');
-        }
-        if (!($this->_masterFile_mtime = @filemtime($this->_masterFile))) {
-            return $this->raiseError('UNL_Cache_Lite_File : Unable to read masterFile : '.$this->_masterFile, -3);
-        }
-    }
-    
-    /**
-    * Test if a cache is available and (if yes) return it
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
-    * @return string data of the cache (else : false)
-    * @access public
-    */
-    function get($id, $group = 'default', $doNotTestCacheValidity = false)
-    {
-        if ($data = parent::get($id, $group, true)) {
-            if ($filemtime = $this->lastModified()) {
-                if ($filemtime > $this->_masterFile_mtime) {
-                    return $data;
-                }
-            }
-        }
-        return false;
-    }
-
-}
-
-?>
diff --git a/lib/php/UNL/Cache/Lite/Function.php b/lib/php/UNL/Cache/Lite/Function.php
deleted file mode 100644
index a8a268fa73a8986cd8d675ba07397ceefb7a9f67..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Cache/Lite/Function.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-/**
-* This class extends UNL_Cache_Lite and can be used to cache the result and output of functions/methods
-*
-* This class is completly inspired from Sebastian Bergmann's
-* PEAR/Cache_Function class. This is only an adaptation to
-* UNL_Cache_Lite
-*
-* There are some examples in the 'docs/examples' file
-* Technical choices are described in the 'docs/technical' file
-*
-* @package UNL_Cache_Lite
-* @version $Id: Function.php 225008 2006-12-14 12:59:43Z cweiske $
-* @author Sebastian BERGMANN <sb@sebastian-bergmann.de>
-* @author Fabien MARTY <fab@php.net>
-*/
-
-class UNL_Cache_Lite_Function extends UNL_Cache_Lite
-{
-
-    // --- Private properties ---
-
-    /**
-     * Default cache group for function caching
-     *
-     * @var string $_defaultGroup
-     */
-    protected $_defaultGroup = 'UNL_Cache_Lite_Function';
-
-    /**
-     * Don't cache the method call when its output contains the string "NOCACHE"
-     *
-     * if set to true, the output of the method will never be displayed (because the output is used
-     * to control the cache)
-     *
-     * @var boolean $_dontCacheWhenTheOutputContainsNOCACHE
-     */
-    protected $_dontCacheWhenTheOutputContainsNOCACHE = false;
-
-    /**
-     * Don't cache the method call when its result is false
-     *
-     * @var boolean $_dontCacheWhenTheResultIsFalse
-     */
-    protected $_dontCacheWhenTheResultIsFalse = false;
-
-    /**
-     * Don't cache the method call when its result is null
-     *
-     * @var boolean $_dontCacheWhenTheResultIsNull
-     */
-    protected $_dontCacheWhenTheResultIsNull = false;
-
-    /**
-     * Debug the UNL_Cache_Lite_Function caching process
-     *
-     * @var boolean $_debugCacheLiteFunction
-     */
-    protected $_debugCacheLiteFunction = false;
-
-    // --- Public methods ----
-
-    /**
-    * Constructor
-    *
-    * $options is an assoc. To have a look at availables options,
-    * see the constructor of the UNL_Cache_Lite class in 'UNL_Cache_Lite.php'
-    *
-    * Comparing to UNL_Cache_Lite constructor, there is another option :
-    * $options = array(
-    *     (...) see UNL_Cache_Lite constructor
-    *     'debugCacheLiteFunction' => (bool) debug the caching process,
-    *     'defaultGroup' => default cache group for function caching (string),
-    *     'dontCacheWhenTheOutputContainsNOCACHE' => (bool) don't cache when the function output contains "NOCACHE",
-    *     'dontCacheWhenTheResultIsFalse' => (bool) don't cache when the function result is false,
-    *     'dontCacheWhenTheResultIsNull' => (bool don't cache when the function result is null
-    * );
-    *
-    * @param array $options options
-    * @access public
-    */
-    function __construct($options = array(NULL))
-    {
-        $availableOptions = array('debugCacheLiteFunction', 'defaultGroup', 'dontCacheWhenTheOutputContainsNOCACHE', 'dontCacheWhenTheResultIsFalse', 'dontCacheWhenTheResultIsNull');
-        while (list($name, $value) = each($options)) {
-            if (in_array($name, $availableOptions)) {
-                $property = '_'.$name;
-                $this->$property = $value;
-            }
-        }
-        reset($options);
-        $this->setOptions($options);
-    }
-
-    /**
-    * Calls a cacheable function or method (or not if there is already a cache for it)
-    *
-    * Arguments of this method are read with func_get_args. So it doesn't appear
-    * in the function definition. Synopsis :
-    * call('functionName', $arg1, $arg2, ...)
-    * (arg1, arg2... are arguments of 'functionName')
-    *
-    * @return mixed result of the function/method
-    * @access public
-    */
-    function call()
-    {
-        $arguments = func_get_args();
-        $id = $this->_makeId($arguments);
-        $data = $this->get($id, $this->_defaultGroup);
-        if ($data !== false) {
-            if ($this->_debugCacheLiteFunction) {
-                echo "Cache hit !\n";
-            }
-            $array = unserialize($data);
-            $output = $array['output'];
-            $result = $array['result'];
-        } else {
-            if ($this->_debugCacheLiteFunction) {
-                echo "Cache missed !\n";
-            }
-            ob_start();
-            ob_implicit_flush(false);
-            $target = array_shift($arguments);
-            if (is_array($target)) {
-                // in this case, $target is for example array($obj, 'method')
-                $object = $target[0];
-                $method = $target[1];
-                $result = call_user_func_array(array(&$object, $method), $arguments);
-            } else {
-                if (strstr($target, '::')) { // classname::staticMethod
-                    list($class, $method) = explode('::', $target);
-                    $result = call_user_func_array(array($class, $method), $arguments);
-                } else if (strstr($target, '->')) { // object->method
-                    // use a stupid name ($objet_123456789 because) of problems where the object
-                    // name is the same as this var name
-                    list($object_123456789, $method) = explode('->', $target);
-                    global $$object_123456789;
-                    $result = call_user_func_array(array($$object_123456789, $method), $arguments);
-                } else { // function
-                    $result = call_user_func_array($target, $arguments);
-                }
-            }
-            $output = ob_get_contents();
-            ob_end_clean();
-            if ($this->_dontCacheWhenTheResultIsFalse) {
-                if ((is_bool($result)) && (!($result))) {
-                    echo($output);
-                    return $result;
-                }
-            }
-            if ($this->_dontCacheWhenTheResultIsNull) {
-                if (is_null($result)) {
-                    echo($output);
-                    return $result;
-                }
-            }
-            if ($this->_dontCacheWhenTheOutputContainsNOCACHE) {
-                if (strpos($output, 'NOCACHE') > -1) {
-                    return $result;
-                }
-            }
-            $array['output'] = $output;
-            $array['result'] = $result;
-            $this->save(serialize($array), $id, $this->_defaultGroup);
-        }
-        echo($output);
-        return $result;
-    }
-
-    /**
-    * Drop a cache file
-    *
-    * Arguments of this method are read with func_get_args. So it doesn't appear
-    * in the function definition. Synopsis :
-    * remove('functionName', $arg1, $arg2, ...)
-    * (arg1, arg2... are arguments of 'functionName')
-    *
-    * @return boolean true if no problem
-    * @access public
-    */
-    function drop()
-    {
-        $id = $this->_makeId(func_get_args());
-        return $this->remove($id, $this->_defaultGroup);
-    }
-
-    /**
-    * Make an id for the cache
-    *
-    * @var array result of func_get_args for the call() or the remove() method
-    * @return string id
-    * @access private
-    */
-    function _makeId($arguments)
-    {
-        $id = serialize($arguments); // Generate a cache id
-        if (!$this->_fileNameProtection) {
-            $id = md5($id);
-            // if fileNameProtection is set to false, then the id has to be hashed
-            // because it's a very bad file name in most cases
-        }
-        return $id;
-    }
-
-}
-
-?>
diff --git a/lib/php/UNL/Cache/Lite/NestedOutput.php b/lib/php/UNL/Cache/Lite/NestedOutput.php
deleted file mode 100644
index 06d10f5dc986e0b3677d27ccba26917672ddf3a0..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Cache/Lite/NestedOutput.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
-* This class extends UNL_Cache_Lite and uses output buffering to get the data to cache.
-* It supports nesting of caches
-*
-* @package UNL_Cache_Lite
-* @version $Id: NestedOutput.php 279664 2009-05-01 13:19:25Z tacker $
-* @author Markus Tacker <tacker@php.net>
-*/
-
-class UNL_Cache_Lite_NestedOutput extends UNL_Cache_Lite_Output
-{
-	private $nestedIds = array();
-	private $nestedGroups = array();
-
-    /**
-    * Start the cache
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
-    * @return boolean|string false if the cache is not hit else the data
-    * @access public
-    */
-    function start($id, $group = 'default', $doNotTestCacheValidity = false)
-    {
-    	$this->nestedIds[] = $id;
-    	$this->nestedGroups[] = $group;
-    	$data = $this->get($id, $group, $doNotTestCacheValidity);
-        if ($data !== false) {
-            return $data;
-        }
-        ob_start();
-        ob_implicit_flush(false);
-        return false;
-    }
-
-    /**
-    * Stop the cache
-    *
-    * @param boolen
-    * @return string return contents of cache
-    */
-    function end()
-    {
-        $data = ob_get_contents();
-        ob_end_clean();
-        $id = array_pop($this->nestedIds);
-        $group = array_pop($this->nestedGroups);
-        $this->save($data, $id, $group);
-		return $data;
-    }
-
-}
\ No newline at end of file
diff --git a/lib/php/UNL/Cache/Lite/Output.php b/lib/php/UNL/Cache/Lite/Output.php
deleted file mode 100644
index 9b9f45ffd3a6f0176fdbd77af7917b5cc1fb568c..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Cache/Lite/Output.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
-* This class extends UNL_Cache_Lite and uses output buffering to get the data to cache.
-*
-* There are some examples in the 'docs/examples' file
-* Technical choices are described in the 'docs/technical' file
-*
-* @package UNL_Cache_Lite
-* @version $Id: Output.php 206076 2006-01-29 00:22:07Z fab $
-* @author Fabien MARTY <fab@php.net>
-*/
-
-class UNL_Cache_Lite_Output extends UNL_Cache_Lite
-{
-
-    // --- Public methods ---
-
-    /**
-    * Constructor
-    *
-    * $options is an assoc. To have a look at availables options,
-    * see the constructor of the UNL_Cache_Lite class in 'UNL_Cache_Lite.php'
-    *
-    * @param array $options options
-    * @access public
-    */
-    function __construct($options = array(NULL))
-    {
-        $this->setOptions($options);
-    }
-
-    /**
-    * Start the cache
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
-    * @return boolean true if the cache is hit (false else)
-    * @access public
-    */
-    function start($id, $group = 'default', $doNotTestCacheValidity = false)
-    {
-        $data = $this->get($id, $group, $doNotTestCacheValidity);
-        if ($data !== false) {
-            echo($data);
-            return true;
-        }
-        ob_start();
-        ob_implicit_flush(false);
-        return false;
-    }
-
-    /**
-    * Stop the cache
-    *
-    * @access public
-    */
-    function end()
-    {
-        $data = ob_get_contents();
-        ob_end_clean();
-        $this->save($data, $this->_id, $this->_group);
-        echo($data);
-    }
-
-}
-
-
-?>
diff --git a/lib/php/UNL/DWT.php b/lib/php/UNL/DWT.php
deleted file mode 100644
index 696e79ad1244dde3c1bfcf2845b88575a22195c4..0000000000000000000000000000000000000000
--- a/lib/php/UNL/DWT.php
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-/**
- * This package is intended to create PHP Class files (Objects) from
- * Dreamweaver template (.dwt) files. It allows designers to create a
- * standalone Dreamweaver template for the website design, and developers
- * to use that design in php pages without interference.
- *
- * Similar to the way DB_DataObject works, the DWT package uses a
- * Generator to scan a .dwt file for editable regions and creates an
- * appropriately named class for that .dwt file with member variables for
- * each region.
- *
- * Once the objects have been generated, you can render a html page from
- * the template.
- *
- * $page = new UNL_DWT::factory('Template_style1');
- * $page->pagetitle = "Contact Information";
- * $page->maincontent = "Contact us by telephone at 111-222-3333.";
- * echo $page->toHtml();
- *
- * Parts of this package are modeled on (borrowed from) the PEAR package
- * DB_DataObject.
- *
- * PHP version 5
- *
- * @category  Templates
- * @package   UNL_DWT
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @created   01/18/2006
- * @copyright 2008 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/package/UNL_DWT
- */
-
-/**
- * Base class which understands Dreamweaver Templates.
- *
- * @category  Templates
- * @package   UNL_DWT
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @created   01/18/2006
- * @copyright 2008 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/package/UNL_DWT
- */
-class UNL_DWT
-{
-    const TEMPLATE_TOKEN = 'Template';
-    const INSTANCE_TOKEN = 'Instance';
-
-    const REGION_BEGIN_TOKEN = '<!-- %sBeginEditable name="%s" -->';
-    const REGION_END_TOKEN   = '<!-- %sEndEditable -->';
-
-    const PARAM_DEF_TOKEN         = '<!-- %sParam name="%s" type="%s" value="%s" -->';
-    const PARAM_REPLACE_TOKEN     = '@@(%s)@@';
-    const PARAM_REPLACE_TOKEN_ALT = '@@(_document[\'%s\'])@@';
-
-    public $__template;
-
-    /**
-     * Run-time configuration options
-     *
-     * @var array
-     * @see UNL_DWT::setOption()
-     */
-    static public $options = array(
-        'debug' => 0,
-    );
-
-    /**
-     * Returns a string that contains the template file.
-     *
-     * @return string
-     */
-    public function getTemplateFile()
-    {
-        if (!isset($this->__template) || empty(self::$options['tpl_location'])) {
-            return '';
-        }
-
-        return file_get_contents(self::$options['tpl_location'].$this->__template);
-    }
-
-    /**
-     * Returns the given DWT with all regions replaced with their assigned
-     * content.
-     *
-     * @return string
-     */
-    public function toHtml()
-    {
-        $p = $this->getTemplateFile();
-        $regions = get_object_vars($this);
-
-        unset($regions['__template']);
-
-        $params = array();
-        if (isset($regions['__params'])) {
-            $params = $regions['__params'];
-            unset($regions['__params']);
-        }
-
-        $p = $this->replaceRegions($p, $regions);
-        $p = $this->replaceParams($p, $params);
-
-        return $p;
-    }
-
-    public function getRegionBeginMarker($type, $region)
-    {
-        return sprintf(self::REGION_BEGIN_TOKEN, $type, $region);
-    }
-
-    public function getRegionEndMarker($type)
-    {
-        return sprintf(self::REGION_END_TOKEN, $type);
-    }
-
-    public function getParamDefMarker($type, $name, $paramType, $value)
-    {
-        return sprintf(self::PARAM_DEF_TOKEN, $type, $name, $paramType, $value);
-    }
-
-    public function getParamReplacePattern($name)
-    {
-        return '/' . sprintf(self::PARAM_DEF_TOKEN, '(' . self::TEMPLATE_TOKEN . '|' . self::INSTANCE_TOKEN . ')',
-            $name, '([^"]*)', '[^"]*') . '/';
-    }
-
-    public function getParamNeedle($name)
-    {
-        return array(
-            sprintf(self::PARAM_REPLACE_TOKEN, $name),
-            sprintf(self::PARAM_REPLACE_TOKEN_ALT, $name)
-        );
-    }
-
-    /**
-     * Replaces region tags within a template file wth their contents.
-     *
-     * @param string $p       Page with DW Region tags.
-     * @param array  $regions Associative array with content to replace.
-     *
-     * @return string page with replaced regions
-     */
-    function replaceRegions($p, $regions)
-    {
-        self::debug('Replacing regions.', 'replaceRegions', 5);
-
-        foreach ($regions as $region => $value) {
-            /* Replace the region with the replacement text */
-            $startMarker = $this->getRegionBeginMarker(self::TEMPLATE_TOKEN, $region);
-            $endMarker = $this->getRegionEndMarker(self::TEMPLATE_TOKEN);
-            $p = str_replace(
-                self::strBetween($startMarker, $endMarker, $p, true),
-                $startMarker . $value . $endMarker,
-                $p,
-                $count
-            );
-
-            if (!$count) {
-                $startMarker = $this->getRegionBeginMarker(self::INSTANCE_TOKEN, $region);
-                $endMarker = $this->getRegionEndMarker(self::INSTANCE_TOKEN);
-                $p = str_replace(
-                    self::strBetween($startMarker, $endMarker, $p, true),
-                    $startMarker . $value . $endMarker,
-                    $p,
-                    $count
-                );
-            }
-
-            if (!$count) {
-                self::debug("Counld not find region $region!", 'replaceRegions', 3);
-            } else {
-                self::debug("$region is replaced with $value.", 'replaceRegions', 5);
-            }
-        }
-        return $p;
-    }
-
-    function replaceParams($p, $params)
-    {
-        self::debug('Replacing params.', 'replaceRegions', 5);
-
-        foreach ($params as $name => $config) {
-            $value = isset($config['value']) ? $config['value'] : '';
-            $p = preg_replace($this->getParamReplacePattern($name), $this->getParamDefMarker('$1', $name, '$2', $value),
-                $p, 1, $count);
-
-            if ($count) {
-                $p = str_replace($this->getParamNeedle($name), $value, $p);
-            }
-        }
-
-        return $p;
-    }
-
-    /**
-     * Create a new UNL_DWT object for the specified layout type
-     *
-     * @param string $type     the template type (eg "fixed")
-     * @param array  $coptions an associative array of option names and values
-     *
-     * @return object  a new UNL_DWT.  A UNL_DWT_Error object on failure.
-     *
-     * @see UNL_DWT::setOption()
-     */
-    static function &factory($type)
-    {
-        include_once self::$options['class_location']."{$type}.php";
-
-        $classname = self::$options['class_prefix'].$type;
-
-        if (!class_exists($classname)) {
-            require_once 'UNL/DWT/Exception.php';
-            throw new UNL_DWT_Exception('Unable to include the ' . self::$options['class_location'] . $type . '.php file.');
-        }
-
-        @$obj = new $classname;
-
-        return $obj;
-    }
-
-    /**
-     * Sets options.
-     *
-     * @param string $option Option to set
-     * @param mixed  $value  Value to set for this option
-     *
-     * @return void
-     */
-    static function setOption($option, $value)
-    {
-        self::$options[$option] = $value;
-    }
-
-    /* ----------------------- Debugger ------------------ */
-
-    /**
-     * Debugger. - use this in your extended classes to output debugging
-     * information.
-     *
-     * Uses UNL_DWT::debugLevel(x) to turn it on
-     *
-     * @param string $message message to output
-     * @param string $logtype bold at start
-     * @param string $level   output level
-     *
-     * @return   none
-     */
-    static function debug($message, $logtype = 0, $level = 1)
-    {
-        if (empty(self::$options['debug'])  ||
-            (is_numeric(self::$options['debug']) &&  self::$options['debug'] < $level)) {
-            return;
-        }
-        // this is a bit flaky due to php's wonderfull class passing around crap..
-        // but it's about as good as it gets..
-        $class = (isset($this) && ($this instanceof UNL_DWT)) ? get_class($this) : 'UNL_DWT';
-
-        if (!is_string($message)) {
-            $message = print_r($message, true);
-        }
-        if (!is_numeric(self::$options['debug']) && is_callable(self::$options['debug'])) {
-            return call_user_func(self::$options['debug'], $class, $message, $logtype, $level);
-        }
-
-        if (!ini_get('html_errors')) {
-            echo "$class   : $logtype       : $message\n";
-            flush();
-            return;
-        }
-        if (!is_string($message)) {
-            $message = print_r($message, true);
-        }
-        $colorize = ($logtype == 'ERROR') ? '<font color="red">' : '<font>';
-        echo "<code>{$colorize}<strong>$class: $logtype:</strong> ". nl2br(htmlspecialchars($message)) . "</font></code><br />\n";
-        flush();
-    }
-
-    /**
-     * sets and returns debug level
-     * eg. UNL_DWT::debugLevel(4);
-     *
-     * @param int $v level
-     *
-     * @return void
-     */
-    static function debugLevel($v = null)
-    {
-        if ($v !== null) {
-            $r = isset(self::$options['debug']) ? self::$options['debug'] : 0;
-            self::$options['debug']  = $v;
-            return $r;
-        }
-        return isset(self::$options['debug']) ? self::$options['debug'] : 0;
-    }
-
-    /**
-     * Returns content between two strings
-     *
-     * @param string $start String which bounds the start
-     * @param string $end   end collecting content when you see this
-     * @param string $p     larger body of content to search
-     *
-     * @return string
-     */
-    static function strBetween($start, $end, $p, $inclusive = false)
-    {
-        if (!empty($start) && strpos($p, $start) !== false) {
-            $p = substr($p, strpos($p, $start)+($inclusive ? 0 : strlen($start)));
-        } else {
-            return '';
-        }
-
-        if (strpos($p, $end) !==false) {
-            $p = substr($p, 0, strpos($p, $end)+($inclusive ? strlen($end) : 0));
-        } else {
-            return '';
-        }
-        return $p;
-    }
-}
diff --git a/lib/php/UNL/DWT/Exception.php b/lib/php/UNL/DWT/Exception.php
deleted file mode 100644
index 8d20483598c40134eee71383ab6eff6375e70e2b..0000000000000000000000000000000000000000
--- a/lib/php/UNL/DWT/Exception.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Exception used by the UNL_DWT class.
- *
- * @category  Templates
- * @package   UNL_DWT
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @copyright 2008 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/package/UNL_DWT
- */
-class UNL_DWT_Exception extends Exception
-{
-
-}
diff --git a/lib/php/UNL/DWT/Generator.php b/lib/php/UNL/DWT/Generator.php
deleted file mode 100644
index 81f4f5bd8f732e84d5ff3c85d6bd26da12749f9a..0000000000000000000000000000000000000000
--- a/lib/php/UNL/DWT/Generator.php
+++ /dev/null
@@ -1,500 +0,0 @@
-<?php
-/**
- * The Generator is used to generate UNL_DWT classes and cached .tpl files from
- * Dreamweaver Template files.
- *
- * PHP version 5
- *
- * @category  Templates
- * @package   UNL_DWT
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @created   01/18/2006
- * @copyright 2008 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/package/UNL_DWT
- */
-
-require_once 'UNL/DWT.php';
-require_once 'UNL/DWT/Exception.php';
-require_once 'UNL/DWT/Region.php';
-
-/**
- * The generator parses actual .dwt Dreamweaver Template files to create object relationship
- * files which have member variables for editable regions within the dreamweaver templates.
- *
- * @category  Templates
- * @package   UNL_DWT
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @created   01/18/2006
- * @copyright 2008 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/package/UNL_DWT
- */
-class UNL_DWT_Generator extends UNL_DWT
-{
-
-    /**
-     * Array of template names.
-     */
-    var $templates;
-
-    /**
-     * Current template being output
-     */
-    var $template;
-
-    /**
-     * Assoc array of template region names.
-     * $_regions[$template] = array();
-     */
-    var $_regions;
-
-    /**
-     * Assoc array of template params
-     * $_params[$template] = array();
-     */
-    var $_params;
-
-    /**
-     * class being extended (can be overridden by
-     * [UNL_DWT_Generator] extends=xxxx
-     *
-     * @var    string
-     * @access private
-     */
-    var $_extends = 'UNL_DWT';
-
-    /**
-     * line to use for require_once 'UNL/DWT.php';
-     *
-     * @var    string
-     * @access private
-     */
-    var $_extendsFile = 'UNL/DWT.php';
-
-    /**
-     * begins generation of template files
-     *
-     * @return void
-     */
-    function start()
-    {
-        $this->debugLevel(3);
-        $this->createTemplateList();
-        $this->generateTemplates();
-        $this->generateClasses();
-    }
-
-    /**
-     * Generates .tpl files from .dwt
-     *
-     * @return void
-     */
-    function generateTemplates()
-    {
-        $dwt_location = UNL_DWT::$options['dwt_location'];
-        if (!file_exists(UNL_DWT::$options['dwt_location'])) {
-            include_once 'System.php';
-            System::mkdir(array('-p', UNL_DWT::$options['dwt_location']));
-        }
-        if (!file_exists(UNL_DWT::$options['tpl_location'])) {
-            include_once 'System.php';
-            System::mkdir(array('-p', UNL_DWT::$options['tpl_location']));
-        }
-        foreach ($this->templates as $this->template) {
-            $dwt = file_get_contents($dwt_location.$this->template);
-            $dwt = $this->scanRegions($dwt);
-
-            $sanitizedName = $this->sanitizeTemplateName($this->template);
-            //Write out the .tpl file?
-            if (strpos(UNL_DWT::$options['tpl_location'], '%s') !== false) {
-                $outfilename = sprintf(UNL_DWT::$options['tpl_location'], $sanitizedName);
-            } else {
-                $outfilename = UNL_DWT::$options['tpl_location']."/{$sanitizedName}.tpl";
-            }
-            $this->debug("Writing {$sanitizedName} to {$outfilename}",
-                         'generateTemplates');
-            $fh = fopen($outfilename, "w");
-            fputs($fh, $dwt);
-            fclose($fh);
-        }
-    }
-
-    /**
-     * Create a list of dwts
-     *
-     * @return void
-     */
-    function createTemplateList()
-    {
-        $this->templates = array();
-
-        $dwt_location = UNL_DWT::$options['dwt_location'];
-        if (is_dir($dwt_location)) {
-            $handle = opendir($dwt_location);
-            while (false !== ($file = readdir($handle))) {
-                if (isset(UNL_DWT::$options['generator_include_regex']) &&
-                !preg_match(UNL_DWT::$options['generator_include_regex'], $file)) {
-                    continue;
-                } else if (isset(UNL_DWT::$options['generator_exclude_regex']) &&
-                preg_match(UNL_DWT::$options['generator_exclude_regex'], $file)) {
-                    continue;
-                }
-                if (substr($file, strlen($file)-4) == '.dwt') {
-                    $this->debug("Adding {$file} to the list of templates.",
-                                'createTemplateList');
-                    $this->templates[] = $file;
-                }
-            }
-        } else {
-            throw new UNL_DWT_Exception("dwt_location is incorrect\n");
-        }
-    }
-
-    /**
-     * Generate the classes for templates in $this->templates
-     *
-     * @return void
-     */
-    function generateClasses()
-    {
-        if ($extends = @UNL_DWT::$options['extends']) {
-            $this->_extends     = $extends;
-            $this->_extendsFile = UNL_DWT::$options['extends_location'];
-        }
-
-        foreach ($this->templates as $this->template) {
-            $this->classname = $this->generateClassName($this->template);
-            if (strpos(UNL_DWT::$options['class_location'], '%s') !== false) {
-                $outfilename = sprintf(UNL_DWT::$options['class_location'],
-                                    sanitizeTemplateName($this->template));
-            } else {
-                $outfilename = UNL_DWT::$options['class_location']."/".$this->sanitizeTemplateName($this->template).".php";
-            }
-            $oldcontents = '';
-            if (file_exists($outfilename)) {
-                // file_get_contents???
-                $oldcontents = implode('', file($outfilename));
-            }
-            $out = $this->_generateClassTemplate($oldcontents);
-            $this->debug("Writing {$this->classname} to {$outfilename}",
-                        'generateClasses');
-            $fh = fopen($outfilename, "w");
-            fputs($fh, $out);
-            fclose($fh);
-        }
-    }
-
-    /**
-     * Generates the class name from a filename.
-     *
-     * @param string $filename The filename of the template.
-     *
-     * @return string Sanitized filename prefixed with the class_prefix
-     *                defined in the ini.
-     */
-    function generateClassName($filename)
-    {
-        if (!($class_prefix  = @UNL_DWT::$options['class_prefix'])) {
-            $class_prefix = '';
-        }
-        return $class_prefix.$this->sanitizeTemplateName($filename);;
-    }
-
-    /**
-     * Cleans the template filename.
-     *
-     * @param string $filename Filename of the template
-     *
-     * @return string Sanitized template name
-     */
-    function sanitizeTemplateName($filename)
-    {
-        return preg_replace('/[^A-Z0-9]/i', '_',
-                        ucfirst(str_replace('.dwt', '', $filename)));
-    }
-
-    /**
-     * Scans the .dwt for regions - all found are loaded into assoc array
-     * $this->_regions[$template].
-     *
-     * @param string $dwt Dreamweaver template file to scan.
-     *
-     * @return string derived template file.
-     */
-    function scanRegions($dwt)
-    {
-
-        $this->_regions[$this->template] = array();
-        $this->_params[$this->template] = array();
-
-        $dwt = str_replace("\r", "\n", $dwt);
-        $dwt = preg_replace("/(\<\!-- InstanceBeginEditable name=\"([A-Za-z0-9]*)\" -->)/i", "\n\\0\n", $dwt);
-        $dwt = preg_replace("/(\<\!-- TemplateBeginEditable name=\"([A-Za-z0-9]*)\" -->)/i", "\n\\0\n", $dwt);
-        $dwt = preg_replace("/\<\!-- InstanceEndEditable -->/", "\n\\0\n", $dwt);
-        $dwt = preg_replace("/\<\!-- TemplateEndEditable -->/", "\n\\0\n", $dwt);
-        $dwt = explode("\n", $dwt);
-
-        $newRegion = false;
-        $region    = new UNL_DWT_Region();
-        $this->debug("Checking {$this->template}", 'scanRegions', 0);
-        foreach ($dwt as $key=>$fileregion) {
-            $matches = array();
-            if (preg_match("/\<\!-- InstanceBeginEditable name=\"([A-Za-z0-9]*)\" -->/i", $fileregion, $matches)
-                || preg_match("/\<\!-- TemplateBeginEditable name=\"([A-Za-z0-9]*)\" -->/i", $fileregion, $matches)) {
-                if ($newRegion == true) {
-                    // Found a new nested region.
-                    // Remove the previous one.
-                    $dwt[$region->line] = str_replace(array("<!--"." InstanceBeginEditable name=\"{$region->name}\" -->"), '', $dwt[$region->line]);
-                }
-                $newRegion     = true;
-                $region        = new UNL_DWT_Region();
-                $region->name  = $matches[1];
-                $region->line  = $key;
-                $region->value = "";
-            } elseif ((preg_match("/\<\!-- InstanceEndEditable -->/i", $fileregion, $matches) || preg_match("/\<\!-- TemplateEndEditable -->/", $fileregion, $matches))) {
-                // Region is closing.
-                if ($newRegion===true) {
-                    $region->value = trim($region->value);
-                    if (strpos($region->value, "@@(\" \")@@") === false) {
-                        $this->_regions[$this->template][] = $region;
-                    } else {
-                        // Editable Region tags must be removed within .tpl
-                        unset($dwt[$region->line], $dwt[$key]);
-                    }
-                    $newRegion = false;
-                } else {
-                    // Remove the nested region closing tag.
-                    $dwt[$key] = str_replace("<!--"." InstanceEndEditable -->", '', $fileregion);
-                }
-            } else {
-                if ($newRegion===true) {
-                    // Add the value of this region.
-                    $region->value .= trim($fileregion)." ";
-                }
-            }
-        }
-        $dwt = implode("\n", $dwt);
-
-        preg_match_all("/<!-- (?:Instance|Template)Param name=\"([^\"]*)\" type=\"([^\"]*)\" value=\"([^\"]*)\" -->/", $dwt, $matches, PREG_SET_ORDER);
-        foreach ($matches as $match) {
-            if (!empty($match[1])) {
-                $this->_params[$this->template][$match[1]] = array(
-                    'name'  => $match[1],
-                    'type'  => $match[2],
-                    'value' => $match[3]
-                );
-            }
-        }
-        $dwt = str_replace(array(    "<!--"." TemplateBeginEditable ",
-                                    "<!--"." TemplateEndEditable -->",
-                                    "<!-- TemplateParam ",
-                                    "\n\n"),
-                            array(    "<!--"." InstanceBeginEditable ",
-                                    "<!--"." InstanceEndEditable -->",
-                                    "<!-- InstanceParam ",
-                                    "\n"), $dwt);
-        if (preg_match("<!--"." InstanceBegin template=\"([\/\w\d\.]+)\" codeOutsideHTMLIsLocked=\"([\w]+)\" -->", $dwt)) {
-            $dwt = preg_replace("/<!--"." InstanceBegin template=\"([\/\w\d\.]+)\" codeOutsideHTMLIsLocked=\"([\w]+)\" -->/", "<!--"." InstanceBegin template=\"/Templates/{$this->template}\" codeOutsideHTMLIsLocked=\"\\2\" -->", $dwt);
-        } else {
-            $pos = strpos($dwt, ">", strripos($dwt, "<html") + 5) + 1;
-            $dwt = substr($dwt, 0, $pos) .
-                "<!--"." InstanceBegin template=\"/Templates/{$this->template}\" codeOutsideHTMLIsLocked=\"false\" -->" .
-                substr($dwt, $pos);
-        }
-        $dwt = str_replace('@@(" ")@@', '', $dwt);
-        return $dwt;
-    }
-
-    /**
-     * The template class geneation part - single file.
-     *
-     * @param string $input file to generate a class for.
-     *
-     * @return  updated .php file
-     */
-    private function _generateClassTemplate($input = '')
-    {
-        // title = expand me!
-        $foot = "";
-        $head = "<?php\n/**\n * Template Definition for {$this->template}\n */\n";
-        // requires
-        $head .= "require_once '{$this->_extendsFile}';\n\n";
-        // add dummy class header in...
-        // class
-        $head .= "class {$this->classname} extends {$this->_extends} \n{";
-
-        $body  =  "\n    ###START_AUTOCODE\n";
-        $body .= "    /* the code below is auto generated do not remove the above tag */\n\n";
-        // table
-        $padding = (30 - strlen($this->template));
-        if ($padding < 2) {
-            $padding =2;
-        }
-        $p = str_repeat(' ', $padding);
-
-        $var   = (substr(phpversion(), 0, 1) > 4) ? 'public' : 'var';
-        $body .= "    {$var} \$__template = '".$this->sanitizeTemplateName($this->template).".tpl';  {$p}// template name\n";
-
-        $regions = $this->_regions[$this->template];
-
-        foreach ($regions as $t) {
-            if (!strlen(trim($t->name))) {
-                continue;
-            }
-            $padding = (30 - strlen($t->name));
-            if ($padding < 2) $padding =2;
-            $p = str_repeat(' ', $padding);
-
-            $body .="    {$var} \${$t->name} = \"".addslashes($t->value)."\"; {$p}// {$t->type}({$t->len})  {$t->flags}\n";
-        }
-
-        $body .= "\n";
-        $body .= "    {$var} \$__params = " . var_export($this->_params[$this->template], true) . ";\n";
-
-        // simple creation tools ! (static stuff!)
-        $body .= "\n";
-        $body .= "    /* Static get */\n";
-        $body .= "    function staticGet(\$k,\$v=NULL) { return UNL_DWT::staticGet('{$this->classname}',\$k,\$v); }\n";
-
-        // generate getter and setter methods
-        $body .= $this->_generateGetters($input);
-        $body .= $this->_generateSetters($input);
-
-        $body .= "\n    /* the code above is auto generated do not remove the tag below */";
-        $body .= "\n    ###END_AUTOCODE\n";
-
-        $foot .= "}\n";
-        $full  = $head . $body . $foot;
-
-        if (!$input) {
-            return $full;
-        }
-        if (!preg_match('/(\n|\r\n)\s*###START_AUTOCODE(\n|\r\n)/s', $input)) {
-            return $full;
-        }
-        if (!preg_match('/(\n|\r\n)\s*###END_AUTOCODE(\n|\r\n)/s', $input)) {
-            return $full;
-        }
-
-        $class_rewrite = 'UNL_DWT';
-        if (!($class_rewrite = @UNL_DWT::$options['generator_class_rewrite'])) {
-            $class_rewrite = 'UNL_DWT';
-        }
-        if ($class_rewrite == 'ANY') {
-            $class_rewrite = '[a-z_]+';
-        }
-        $input = preg_replace('/(\n|\r\n)class\s*[a-z0-9_]+\s*extends\s*' .$class_rewrite . '\s*\{(\n|\r\n)/si',
-                "\nclass {$this->classname} extends {$this->_extends} \n{\n",
-                $input);
-
-        return preg_replace('/(\n|\r\n)\s*###START_AUTOCODE(\n|\r\n).*(\n|\r\n)\s*###END_AUTOCODE(\n|\r\n)/s',
-                            $body, $input);
-
-    }
-
-    /**
-    * Generate getter methods for class definition
-    *
-    * @param string $input Existing class contents
-    *
-    * @return string
-    */
-    function _generateGetters($input)
-    {
-        $getters = '';
-
-        // only generate if option is set to true
-        if (empty(UNL_DWT::$options['generate_getters'])) {
-            return '';
-        }
-
-        /*
-         * remove auto-generated code from input to be able to check if
-         * the method exists outside of the auto-code
-         */
-        $input = preg_replace('/(\n|\r\n)\s*###START_AUTOCODE(\n|\r\n).*(\n|\r\n)\s*###END_AUTOCODE(\n|\r\n)/s', '', $input);
-
-        $getters .= "\n\n";
-        $regions  = $this->_regions[$this->table];
-
-        // loop through properties and create getter methods
-        foreach ($regions = $regions as $t) {
-
-            // build mehtod name
-            $methodName = 'get' . ucfirst($t->name);
-
-            if (!strlen(trim($t->name))
-                || preg_match("/function[\s]+[&]?$methodName\(/i", $input)) {
-                continue;
-            }
-
-            $getters .= "   /**\n";
-            $getters .= "    * Getter for \${$t->name}\n";
-            $getters .= "    *\n";
-            $getters .= (stristr($t->flags, 'multiple_key')) ? "    * @return   object\n"
-                                                             : "    * @return   {$t->type}\n";
-            $getters .= "    * @access   public\n";
-            $getters .= "    */\n";
-            $getters .= (substr(phpversion(), 0, 1) > 4) ? '    public '
-                                                       : '    ';
-            $getters .= "function $methodName() {\n";
-            $getters .= "        return \$this->{$t->name};\n";
-            $getters .= "    }\n\n";
-        }
-
-        return $getters;
-    }
-
-    /**
-     * Generate setter methods for class definition
-     *
-     * @param string $input Existing class contents
-     *
-     * @return string
-     */
-    function _generateSetters($input)
-    {
-        $setters = '';
-
-        // only generate if option is set to true
-        if (empty(UNL_DWT::$options['generate_setters'])) {
-            return '';
-        }
-
-        /*
-         * remove auto-generated code from input to be able to check if
-         * the method exists outside of the auto-code
-         */
-        $input = preg_replace('/(\n|\r\n)\s*###START_AUTOCODE(\n|\r\n).*(\n|\r\n)\s*###END_AUTOCODE(\n|\r\n)/s', '', $input);
-
-        $setters .= "\n";
-        $regions  = $this->_regions[$this->table];
-
-        // loop through properties and create setter methods
-        foreach ($regions = $regions as $t) {
-
-            // build mehtod name
-            $methodName = 'set' . ucfirst($t->name);
-
-            if (!strlen(trim($t->name))
-                || preg_match("/function[\s]+[&]?$methodName\(/i", $input)) {
-                continue;
-            }
-
-            $setters .= "   /**\n";
-            $setters .= "    * Setter for \${$t->name}\n";
-            $setters .= "    *\n";
-            $setters .= "    * @param    mixed   input value\n";
-            $setters .= "    * @access   public\n";
-            $setters .= "    */\n";
-            $setters .= (substr(phpversion(), 0, 1) > 4) ? '    public '
-                                                       : '    ';
-            $setters .= "function $methodName(\$value) {\n";
-            $setters .= "        \$this->{$t->name} = \$value;\n";
-            $setters .= "    }\n\n";
-        }
-
-        return $setters;
-    }
-}
diff --git a/lib/php/UNL/DWT/Region.php b/lib/php/UNL/DWT/Region.php
deleted file mode 100644
index e8376a073089d7ea636edb123f7d42990d2b46a8..0000000000000000000000000000000000000000
--- a/lib/php/UNL/DWT/Region.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Object representing a Dreamweaver template region
- *
- * @category  Templates
- * @package   UNL_DWT
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @created   01/18/2006
- * @copyright 2008 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/package/UNL_DWT
- */
-class UNL_DWT_Region
-{
-    var $name;
-    var $type = 'string';
-    var $len;
-    var $line;
-    var $flags;
-    var $value;
-}
diff --git a/lib/php/UNL/DWT/Scanner.php b/lib/php/UNL/DWT/Scanner.php
deleted file mode 100644
index e4a2a29bfa2816146e046a5e1a6861d7e0e8a722..0000000000000000000000000000000000000000
--- a/lib/php/UNL/DWT/Scanner.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/**
- * Handles scanning a dwt file for regions and rendering.
- *
- * PHP version 5
- *
- * @category  Templates
- * @package   UNL_DWT
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @created   01/18/2006
- * @copyright 2008 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/package/UNL_DWT
- */
-require_once 'UNL/DWT.php';
-require_once 'UNL/DWT/Region.php';
-
-/**
- * Will scan a dreamweaver templated file for regions and other relevant info.
- *
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @created   01/18/2006
- * @copyright 2008 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/package/UNL_DWT
- */
-class UNL_DWT_Scanner extends UNL_DWT
-{
-    protected $_regions;
-
-    /**
-     * The contents of the .dwt file you wish to scan.
-     *
-     * @param string $dwt Source of the .dwt file
-     */
-    function __construct($dwt)
-    {
-        $this->__template = $dwt;
-        $this->scanRegions($dwt);
-    }
-
-    /**
-     * Return the template markup
-     *
-     * @return string
-     */
-    function getTemplateFile()
-    {
-        return $this->__template;
-    }
-
-    function scanRegions($dwt)
-    {
-        $this->_regions[] = array();
-
-        $dwt = str_replace("\r", "\n", $dwt);
-        $dwt = preg_replace("/(\<\!-- InstanceBeginEditable name=\"([A-Za-z0-9]*)\" -->)/i", "\n\\0\n", $dwt);
-        $dwt = preg_replace("/(\<\!-- TemplateBeginEditable name=\"([A-Za-z0-9]*)\" -->)/i", "\n\\0\n", $dwt);
-        $dwt = preg_replace("/\<\!-- InstanceEndEditable -->/", "\n\\0\n", $dwt);
-        $dwt = preg_replace("/\<\!-- TemplateEndEditable -->/", "\n\\0\n", $dwt);
-        $dwt = explode("\n", $dwt);
-
-        $newRegion = false;
-        $region    = new UNL_DWT_Region();
-        foreach ($dwt as $key=>$fileregion) {
-            $matches = array();
-            if (preg_match("/\<\!-- InstanceBeginEditable name=\"([A-Za-z0-9]*)\" -->/i", $fileregion, $matches)
-                || preg_match("/\<\!-- TemplateBeginEditable name=\"([A-Za-z0-9]*)\" -->/i", $fileregion, $matches)) {
-                if ($newRegion == true) {
-                    // Found a new nested region.
-                    // Remove the previous one.
-                    $dwt[$region->line] = str_replace(array("<!--"." InstanceBeginEditable name=\"{$region->name}\" -->"), '', $dwt[$region->line]);
-                }
-                $newRegion     = true;
-                $region        = new UNL_DWT_Region();
-                $region->name  = $matches[1];
-                $region->line  = $key;
-                $region->value = "";
-            } elseif ((preg_match("/\<\!-- InstanceEndEditable -->/i", $fileregion, $matches) || preg_match("/\<\!-- TemplateEndEditable -->/", $fileregion, $matches))) {
-                // Region is closing.
-                if ($newRegion===true) {
-                    $region->value = trim($region->value);
-                    if (strpos($region->value, "@@(\" \")@@") === false) {
-                        $this->_regions[$region->name] = $region;
-                    } else {
-                        // Editable Region tags must be removed within .tpl
-                        unset($dwt[$region->line], $dwt[$key]);
-                    }
-                    $newRegion = false;
-                } else {
-                    // Remove the nested region closing tag.
-                    $dwt[$key] = str_replace("<!--"." InstanceEndEditable -->", '', $fileregion);
-                }
-            } else {
-                if ($newRegion===true) {
-                    // Add the value of this region.
-                    $region->value .= trim($fileregion).PHP_EOL;
-                }
-            }
-        }
-    }
-
-    /**
-     * returns the region object
-     *
-     * @param string $region
-     *
-     * @return UNL_DWT_Region
-     */
-    public function getRegion($region)
-    {
-        if (isset($this->_regions[$region])) {
-            return $this->_regions[$region];
-        }
-        return null;
-    }
-
-    /**
-     * returns array of all the regions found
-     *
-     * @return array(UNL_DWT_Region)
-     */
-    public function getRegions()
-    {
-        return $this->_regions;
-    }
-
-    public function __isset($region)
-    {
-        return isset($this->_regions[$region]);
-    }
-
-    public function __get($region)
-    {
-        if (isset($this->_regions[$region])) {
-            return $this->_regions[$region]->value;
-        }
-
-        $trace = debug_backtrace();
-        trigger_error(
-            'Undefined property: ' . $region .
-            ' in ' . $trace[0]['file'] .
-            ' on line ' . $trace[0]['line'],
-            E_USER_NOTICE);
-        return null;
-    }
-
-    /**
-     * Allow directly rendering
-     *
-     * @return string
-     */
-    function __toString()
-    {
-        return $this->toHtml();
-    }
-
-}
diff --git a/lib/php/UNL/DWT/createTemplates.php b/lib/php/UNL/DWT/createTemplates.php
deleted file mode 100644
index f501baf5ba587c80353a00f4260471475e1baf08..0000000000000000000000000000000000000000
--- a/lib/php/UNL/DWT/createTemplates.php
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/php -q
-<?php
-/**
- * Tool to generate objects for dreamweaver template files.
- *
- * PHP version 5
- *
- * @package   UNL_DWT
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @created   01/18/2006
- * @copyright 2008 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/package/UNL_DWT
- */
-
-// since this version doesnt use overload,
-// and I assume anyone using custom generators should add this..
-define('UNL_DWT_NO_OVERLOAD',1);
-ini_set('display_errors',true);
-
-set_include_path(dirname(__DIR__).'/../../src');
-require_once 'UNL/DWT/Generator.php';
-
-if (!ini_get('register_argc_argv')) {
-    throw new Exception("\nERROR: You must turn register_argc_argv On in your php.ini file for this to work\neg.\n\nregister_argc_argv = On\n\n");
-}
-
-if (!@$_SERVER['argv'][1]) {
-    throw new Exception("\nERROR: createTemplates.php usage: 'php phpdwtparser/src/UNL/DWT/createTemplates.php example.ini'\n\n");
-}
-
-$config = parse_ini_file($_SERVER['argv'][1], true);
-foreach($config as $class=>$values) {
-    if ($class == 'UNL_DWT') {
-        UNL_DWT::$options = $values;
-    }
-}
-
-if (empty(UNL_DWT::$options)) {
-    throw new Exception("\nERROR: could not read ini file\n\n");
-}
-set_time_limit(0);
-//UNL_DWT::debugLevel(1);
-$generator = new UNL_DWT_Generator;
-$generator->start();
diff --git a/lib/php/UNL/Templates.php b/lib/php/UNL/Templates.php
deleted file mode 100644
index 63917217378a3d98938ab74867fdf9d60edb59dc..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates.php
+++ /dev/null
@@ -1,365 +0,0 @@
-<?php
-/**
- * Object oriented interface to create UNL Template based HTML pages.
- *
- * PHP version 5
- *
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-
-/**
- * Utilizes the UNL_DWT Dreamweaver template class.
- */
-require_once 'UNL/DWT.php';
-
-/**
- * Allows you to create UNL Template based HTML pages through an object
- * oriented interface.
- *
- * Install on your PHP server with:
- * pear channel-discover pear.unl.edu
- * pear install unl/UNL_Templates
- *
- * <code>
- * <?php
- * require_once 'UNL/Templates.php';
- * $page                  = UNL_Templates::factory('Fixed');
- * $page->titlegraphic    = '<h1>UNL Templates</h1>';
- * $page->maincontentarea = 'Hello world!';
- * $page->loadSharedcodeFiles();
- * echo $page;
- * </code>
- *
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-class UNL_Templates extends UNL_DWT
-{
-    const VERSION2 = 2;
-    const VERSION3 = 3;
-    const VERSION3x1 = '3.1';
-
-    /**
-     * Cache object for output caching
-     *
-     * @var UNL_Templates_CachingService
-     */
-    static protected $cache;
-
-    static public $options = array(
-        'debug'                  => 0,
-        'sharedcodepath'         => 'sharedcode',
-        'templatedependentspath' => '',
-        'cache'                  => array(),
-        'version'                => self::VERSION3,
-        'timeout'                => 5
-    );
-
-    /**
-     * The version of the templates we're using.
-     *
-     * @var UNL_Templates_Version
-     */
-    static public $template_version;
-
-    /**
-     * Construct a UNL_Templates object
-     */
-    public function __construct()
-    {
-        date_default_timezone_set(date_default_timezone_get());
-        if (empty(self::$options['templatedependentspath'])) {
-            self::$options['templatedependentspath'] = $_SERVER['DOCUMENT_ROOT'];
-        }
-    }
-
-    /**
-     * Initialize the configuration for the UNL_DWT class
-     *
-     * @return void
-     */
-    public static function loadDefaultConfig()
-    {
-        $version = str_replace('.', 'x', self::$options['version']);
-        include_once 'UNL/Templates/Version'.$version.'.php';
-        $class = 'UNL_Templates_Version'.$version;
-        self::$template_version = new $class();
-        UNL_DWT::$options = array_merge(UNL_DWT::$options, self::$template_version->getConfig());
-    }
-
-    /**
-     * The factory returns a template object for any UNL Template style requested:
-     *  * Fixed
-     *  * Liquid
-     *  * Popup
-     *  * Document
-     *  * Secure
-     *  * Unlaffiliate
-     *
-     * <code>
-     * $page = UNL_Templates::factory('Fixed');
-     * </code>
-     *
-     * @param string $type     Type of template to get, Fixed, Liquid, Doc, Popup
-     *
-     * @return UNL_Templates
-     */
-    static function &factory($type)
-    {
-        UNL_Templates::loadDefaultConfig();
-        return parent::factory($type);
-    }
-
-    public function getTemplateFile()
-    {
-        return $this->getCache();
-    }
-
-    /**
-     * Attempts to connect to the template server and grabs the latest cache of the
-     * template (.tpl) file. Set options for Cache_Lite in self::$options['cache']
-     *
-     * @return string
-     */
-    function getCache()
-    {
-        $cache = self::getCachingService();
-        $cache_key = self::$options['version'].self::$options['templatedependentspath'].$this->__template;
-        // Test if there is a valid cache for this template
-        if ($data = $cache->get($cache_key)) {
-            // Content is in $data
-            self::debug('Using cached version from '.
-                         date('Y-m-d H:i:s', $cache->lastModified()), 'getCache', 3);
-        } else { // No valid cache found
-            if ($data = self::$template_version->getTemplate($this->__template)) {
-                self::debug('Updating cache.', 'getCache', 3);
-                $data = $this->makeIncludeReplacements($data);
-                $cache->save($data, $cache_key);
-            } else {
-                // Error getting updated version of the templates.
-                self::debug('Could not connect to template server. ' . PHP_EOL .
-                             'Extending life of template cache.', 'getCache', 3);
-                $cache->extendLife();
-                $data = $cache->get($this->__template);
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Loads standard customized content (sharedcode) files from the filesystem.
-     *
-     * @return void
-     */
-    function loadSharedcodeFiles()
-    {
-        $includes = array(
-                            'footercontent'         => 'footer.html',
-                            'contactinfo'           => 'footerContactInfo.html',
-                            'navlinks'              => 'navigation.html',
-                            'leftcollinks'          => 'relatedLinks.html',
-                            'optionalfooter'        => 'optionalFooter.html',
-                            'collegenavigationlist' => 'unitNavigation.html',
-                            );
-        foreach ($includes as $element=>$filename) {
-            if (file_exists(self::$options['sharedcodepath'].'/'.$filename)) {
-                $this->{$element} = file_get_contents(self::$options['sharedcodepath'].'/'.$filename);
-            }
-        }
-    }
-
-
-    /**
-     * Add a link within the head of the page.
-     *
-     * @param string $href       URI to the resource
-     * @param string $relation   Relation of this link element (alternate)
-     * @param string $relType    The type of relation (rel)
-     * @param array  $attributes Any additional attribute=>value combinations
-     *
-     * @return void
-     */
-    function addHeadLink($href, $relation, $relType = 'rel', array $attributes = array())
-    {
-        $attributeString = '';
-        foreach ($attributes as $name=>$value) {
-            $attributeString .= $name.'="'.$value.'" ';
-        }
-
-        $this->head .= '<link '.$relType.'="'.$relation.'" href="'.$href.'" '.$attributeString.' />'.PHP_EOL;
-
-    }
-
-    /**
-     * Add a (java)script to the page.
-     *
-     * @param string $url  URL to the script
-     * @param string $type Type of script text/javascript
-     *
-     * @return void
-     */
-    function addScript($url, $type = 'text/javascript')
-    {
-        $this->head .= '<script type="'.$type.'" src="'.$url.'"></script>'.PHP_EOL;
-    }
-
-    /**
-     * Adds a script declaration to the page.
-     *
-     * @param string $content The javascript you wish to add.
-     * @param string $type    Type of script tag.
-     *
-     * @return void
-     */
-    function addScriptDeclaration($content, $type = 'text/javascript')
-    {
-        $this->head .= '<script type="'.$type.'">//<![CDATA['.PHP_EOL.$content.PHP_EOL.'//]]></script>'.PHP_EOL;
-    }
-
-    /**
-     * Add a style declaration to the head of the document.
-     * <code>
-     * $page->addStyleDeclaration('.course {font-size:1.5em}');
-     * </code>
-     *
-     * @param string $content CSS content to add
-     * @param string $type    type attribute for the style element
-     *
-     * @return void
-     */
-    function addStyleDeclaration($content, $type = 'text/css')
-    {
-        $this->head .= '<style type="'.$type.'">'.$content.'</style>'.PHP_EOL;
-    }
-
-    /**
-     * Add a link to a stylesheet.
-     *
-     * @param string $url   Address of the stylesheet, absolute or relative
-     * @param string $media Media target (screen/print/projector etc)
-     *
-     * @return void
-     */
-    function addStyleSheet($url, $media = 'all')
-    {
-        $this->addHeadLink($url, 'stylesheet', 'rel', array('media'=>$media, 'type'=>'text/css'));
-    }
-
-    /**
-     * returns this template as a string.
-     *
-     * @return string
-     */
-    function __toString()
-    {
-        return $this->toHtml();
-    }
-
-
-    /**
-     * Populates templatedependents files
-     *
-     * Replaces the template dependent include statements with the corresponding
-     * files from the /ucomm/templatedependents/ directory. To specify the location
-     * of your templatedependents directory, use something like
-     * $page->options['templatedependentspath'] = '/var/www/';
-     * and set the path to the directory containing /ucomm/templatedependents/
-     *
-     * @param string $p Page to make replacements in
-     *
-     * @return string
-     */
-    function makeIncludeReplacements($p)
-    {
-        return self::$template_version->makeIncludeReplacements($p);
-    }
-
-    /**
-     * Debug handler for messages.
-     *
-     * @param string $message Message to send to debug output
-     * @param int    $logtype Which log to send this to
-     * @param int    $level   The threshold to send this message or not.
-     *
-     * @return void
-     */
-    static function debug($message, $logtype = 0, $level = 1)
-    {
-        UNL_DWT::$options['debug'] = self::$options['debug'];
-        parent::debug($message, $logtype, $level);
-    }
-
-    /**
-     * Cleans the cache.
-     *
-     * @param mixed $o Pass a cached object to clean it's cache, or a string id.
-     *
-     * @return bool true if cache was successfully cleared.
-     */
-    public function cleanCache($object = null)
-    {
-        return self::getCachingService()->clean($object);
-    }
-
-    static public function setCachingService(UNL_Templates_CachingService $cache)
-    {
-        self::$cache = $cache;
-    }
-
-    static public function getCachingService()
-    {
-        if (!isset(self::$cache)) {
-            $file  = 'UNL/Templates/CachingService/Null.php';
-            $class = 'UNL_Templates_CachingService_Null';
-
-            $fp = @fopen('UNL/Cache/Lite.php', 'r', true);
-            if ($fp) {
-                fclose($fp);
-                $file  = 'UNL/Templates/CachingService/UNLCacheLite.php';
-                $class = 'UNL_Templates_CachingService_UNLCacheLite';
-            } else {
-                $fp = @fopen('Cache/Lite.php', 'r', true);
-                if ($fp) {
-                    fclose($fp);
-                    $file  = 'UNL/Templates/CachingService/CacheLite.php';
-                    $class = 'UNL_Templates_CachingService_CacheLite';
-                }
-            }
-
-            include_once $file;
-            self::$cache = new $class(self::$options['cache']);
-        }
-        return self::$cache;
-    }
-
-    static public function getDataDir()
-    {
-        if (file_exists(dirname(__FILE__).'/../../data/pear.unl.edu/UNL_Templates')) {
-            // new pear2 package & pyrus installation layout
-            return dirname(__FILE__).'/../../data/pear.unl.edu/UNL_Templates';
-        }
-
-        if (file_exists(dirname(__FILE__).'/../../data/tpl_cache')) {
-            // svn checkout
-            return realpath(dirname(__FILE__).'/../../data');
-        }
-
-        if ('@DATA_DIR@' != '@DATA_DIR'.'@') {
-            // pear/pyrus installation
-            return '@DATA_DIR@/UNL_Templates/data/';
-        }
-
-        throw new Exception('Cannot determine data directory!');
-    }
-}
diff --git a/lib/php/UNL/Templates/CachingService.php b/lib/php/UNL/Templates/CachingService.php
deleted file mode 100644
index 3dc28c46dc8c581b1ed3ca664d2d611210ab91e8..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/CachingService.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * An interface for a caching service.
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-interface UNL_Templates_CachingService
-{
-    public function get($key);
-    public function save($data, $key);
-    public function clean($object = null);
-}
\ No newline at end of file
diff --git a/lib/php/UNL/Templates/CachingService/CacheLite.php b/lib/php/UNL/Templates/CachingService/CacheLite.php
deleted file mode 100644
index 98853e323b73e70f902782126c13cec954a81ced..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/CachingService/CacheLite.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * A Cache Service using Cache_Lite
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates/CachingService.php';
-class UNL_Templates_CachingService_CacheLite implements UNL_Templates_CachingService
-{
-    protected $cache;
-    
-    function __construct($options = array())
-    {
-        include_once 'Cache/Lite.php';
-        $options = array_merge(array('lifeTime'=>3600), $options);
-        $this->cache = new Cache_Lite($options);
-    }
-    
-    function get($key)
-    {
-        return $this->cache->get($key, 'UNL_Templates');
-    }
-    
-    function save($data, $key)
-    {
-        return $this->cache->save($data, $key, 'UNL_Templates');
-    }
-    
-    function clean($object = null)
-    {
-        if (isset($object)) {
-            if (is_object($object)
-                && $object instanceof UNL_UCBCN_Cacheable) {
-                $key = $object->getCacheKey();
-                if ($key === false) {
-                    // This is a non-cacheable object.
-                    return true;
-                }
-            } else {
-                $key = (string) $object;
-            }
-            if ($this->cache->get($key) !== false) {
-                // Remove the cache for this individual object.
-                return $this->cache->remove($key, 'UNL_Templates');
-            }
-        } else {
-            return $this->cache->clean('UNL_Templates');
-        }
-        return false;
-    }
-    function __call($method, $params)
-    {
-        return $this->cache->$method($params);
-    }
-
-}
diff --git a/lib/php/UNL/Templates/CachingService/Null.php b/lib/php/UNL/Templates/CachingService/Null.php
deleted file mode 100644
index 6a2f16f1f528d1deee52f1f4194058012a34764b..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/CachingService/Null.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * A Null cache service that can be used for testing
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates/CachingService.php';
-class UNL_Templates_CachingService_Null implements UNL_Templates_CachingService
-{
-    
-    function clean($object = null)
-    {
-        return true;
-    }
-    
-    function save($data, $key)
-    {
-        return true;
-    }
-    
-    function get($key)
-    {
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/lib/php/UNL/Templates/CachingService/UNLCacheLite.php b/lib/php/UNL/Templates/CachingService/UNLCacheLite.php
deleted file mode 100644
index 1226c665ba63daaed4ee07e940e9e12e3880f60e..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/CachingService/UNLCacheLite.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * A Cache Service using UNL_Cache_Lite
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates/CachingService/CacheLite.php';
-class UNL_Templates_CachingService_UNLCacheLite extends UNL_Templates_CachingService_CacheLite
-{
-
-    function __construct($options = array())
-    {
-        include_once 'UNL/Cache/Lite.php';
-        $options = array_merge(array('lifeTime'=>3600), $options);
-        $this->cache = new UNL_Cache_Lite($options);
-    }
-
-}
diff --git a/lib/php/UNL/Templates/Scanner.php b/lib/php/UNL/Templates/Scanner.php
deleted file mode 100644
index c8fdf51bfb346d2c8aafff1a3e5693f0bacb3b32..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Scanner.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * This class will scan a template file for the regions, which you can use to 
- * analyze and use a rendered template file.
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/DWT/Scanner.php';
-
-
-class UNL_Templates_Scanner extends UNL_DWT_Scanner
-{
-    /**
-     * Construct a remote file.
-     *
-     * @param string $html Contents of the page
-     */
-    function __construct($html)
-    {
-        parent::__construct($html);
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/lib/php/UNL/Templates/Version.php b/lib/php/UNL/Templates/Version.php
deleted file mode 100644
index 074d6af725d699c12e340562c0c0e3318aedbc15..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Interface for a version of the template files.
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-interface UNL_Templates_Version
-{ 
-    function getConfig();
-    function getTemplate($template);
-    function makeIncludeReplacements($html);
-}
-?>
\ No newline at end of file
diff --git a/lib/php/UNL/Templates/Version2.php b/lib/php/UNL/Templates/Version2.php
deleted file mode 100644
index e4aad342d3bdeffb3fa4eabec12c53ad8d35848a..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version2.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Base class for version 2 (2006) of the template files.
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates/Version.php';
-
-class UNL_Templates_Version2 implements UNL_Templates_Version
-{ 
-    function getConfig()
-    {
-        return array('class_location' => 'UNL/Templates/Version2/',
-                     'class_prefix'   => 'UNL_Templates_Version2_');
-    }
-    
-    function getTemplate($template)
-    {
-        // Set a timeout for the HTTP download of the template file
-        $http_context = stream_context_create(array('http' => array('timeout' => UNL_Templates::$options['timeout'])));
-
-        // Always try and retrieve the latest
-        if (!(UNL_Templates::getCachingService() instanceof UNL_Templates_CachingService_Null)
-            && $tpl = file_get_contents('http://pear.unl.edu/UNL/Templates/server.php?version=2&template='.$template, false, $http_context)) {
-            return $tpl;
-        }
-
-        if (file_exists(UNL_Templates::getDataDir().'/tpl_cache/Version2/'.$template)) {
-            return file_get_contents(UNL_Templates::getDataDir().'/tpl_cache/Version2/'.$template);
-        }
-
-        throw new Exception('Could not get the template file!');
-    }
-    
-    function makeIncludeReplacements($html)
-    {
-        UNL_Templates::debug('Now making template include replacements.',
-                     'makeIncludeReplacements', 3);
-        $includes = array();
-        preg_match_all('<!--#include virtual="(/ucomm/templatedependents/[A-Za-z0-9\.\/]+)" -->',
-                        $html, $includes);
-        UNL_Templates::debug(print_r($includes, true), 'makeIncludeReplacements', 3);
-        foreach ($includes[1] as $include) {
-            UNL_Templates::debug('Replacing '.$include, 'makeIncludeReplacements', 3);
-            $file = UNL_Templates::$options['templatedependentspath'].$include;
-            if (!file_exists($file)) {
-                UNL_Templates::debug('File does not exist:'.$file,
-                             'makeIncludeReplacements', 3);
-                $file = 'http://www.unl.edu'.$include;
-            }
-            $html = str_replace('<!--#include virtual="'.$include.'" -->',
-                                 file_get_contents($file), $html);
-        }
-        return $html;
-    }
-}
diff --git a/lib/php/UNL/Templates/Version2/Document.php b/lib/php/UNL/Templates/Version2/Document.php
deleted file mode 100644
index 62e6d3bc6f643adf9b015d9b1222382d6cf0ec5e..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version2/Document.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Template Definition for document.dwt
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates.php';
-
-/**
- * Document template object.
- *
- * @package UNL_Templates
- */
-class UNL_Templates_Version2_Document extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Document.tpl';                    // template name
-    public $doctitle = "<title>UNL | Document Template</title>";                       // string()  
-    public $head = "<script type=\"text/javascript\"> var navl2Links = 0; //Default navline2 links to display (zero based counting) </script>";                           // string()  
-    public $breadcrumbs = "";                    // string()  
-    public $collegenavigationlist = "";          // string()  
-    public $titlegraphic = "<h1>Department</h1> <h2>Taglines - We Do The Heavy Lifting</h2>";                   // string()  
-    public $maincontentarea = "<p style=\"margin:20px; border:3px solid #CC0000;padding:10px; text-align:center\"> <strong>Delete this box and place your content here.</strong><br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://www.unl.edu/webdevnet/\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Click here to check Validation</a> </p>";                // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version2_Document',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version2/Fixed.php b/lib/php/UNL/Templates/Version2/Fixed.php
deleted file mode 100644
index fa02b80041bc2bba5cfbce61073a932fd85d12a4..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version2/Fixed.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Template Definition for fixed.dwt
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- * 
- */
-require_once 'UNL/Templates.php';
-
-/**
- * Fixed width template object.
- * 
- * @package UNL_Templates
- *
- */
-class UNL_Templates_Version2_Fixed extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Fixed.tpl';                       // template name
-    public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
-    public $head = "<script type=\"text/javascript\"> var navl2Links = 0; //Default navline2 links to display (zero based counting) </script>";                           // string()  
-    public $breadcrumbs = "<!-- WDN: see glossary item \'breadcrumbs\' --> <ul> <li class=\"first\"><a href=\"http://www.unl.edu/\">UNL</a></li> <li><a href=\"http://www.unl.edu/\">Department</a></li> <li>New Page</li> </ul>";                    // string()  
-    public $collegenavigationlist = "";          // string()  
-    public $titlegraphic = "<h1>Department</h1> <h2>Taglines - We Do The Heavy Lifting</h2>";                   // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $leftRandomPromo = "<div class=\"image_small_short\" id=\"leftRandomPromo\"> <a href=\"#\" id=\"leftRandomPromoAnchor\"><img id=\"leftRandomPromoImage\" alt=\"\" src=\"/ucomm/templatedependents/templatecss/images/transpixel.gif\" /></a> <script type=\"text/javascript\" src=\"../sharedcode/leftRandomPromo.js\"></script> </div>";                // string()  
-    public $leftcollinks = "<!-- WDN: see glossary item \'sidebar links\' --> <!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $maincontentarea = "<p style=\"margin:20px; border:3px solid #CC0000;padding:10px; text-align:center\"> <strong>Delete this box and place your content here.</strong><br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://www.unl.edu/webdevnet/\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Click here to check Validation</a> </p>";                // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version2_Fixed',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version2/Liquid.php b/lib/php/UNL/Templates/Version2/Liquid.php
deleted file mode 100644
index 673bc993a3fb16dd085ba6c2190f10e3164b28e9..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version2/Liquid.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Template Definition for liquid.dwt
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- * 
- */
-require_once 'UNL/Templates.php';
-
-/**
- * Liquid width template object
- * 
- * @package UNL_Templates
- *
- */
-class UNL_Templates_Version2_Liquid extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Liquid.tpl';                      // template name
-    public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
-    public $head = "<script type=\"text/javascript\"> var navl2Links = 0; //Default navline2 links to display (zero based counting) </script>";                           // string()  
-    public $breadcrumbs = "<!-- WDN: see glossary item \'breadcrumbs\' --> <ul> <li class=\"first\"><a href=\"http://www.unl.edu/\">UNL</a></li> <li><a href=\"http://www.unl.edu/\">Department</a></li> <li>New Page</li> </ul>";                    // string()  
-    public $collegenavigationlist = "";          // string()  
-    public $titlegraphic = "<h1>Department</h1> <h2>Taglines - We Do The Heavy Lifting</h2>";                   // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $leftRandomPromo = "<div class=\"image_small_short\" id=\"leftRandomPromo\"> <a href=\"#\" id=\"leftRandomPromoAnchor\"><img id=\"leftRandomPromoImage\" alt=\"\" src=\"/ucomm/templatedependents/templatecss/images/transpixel.gif\" /></a> <script type=\"text/javascript\" src=\"../sharedcode/leftRandomPromo.js\"></script> </div>";                // string()  
-    public $leftcollinks = "<!-- WDN: see glossary item \'sidebar links\' --> <!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $maincontentarea = "<p style=\"margin:20px; border:3px solid #CC0000;padding:10px; text-align:center\"> <strong>Delete this box and place your content here.</strong><br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://www.unl.edu/webdevnet/\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Click here to check Validation</a> </p>";                // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version2_Liquid',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version2/Popup.php b/lib/php/UNL/Templates/Version2/Popup.php
deleted file mode 100644
index 44e5f823fede57c1cb45811096e00dbc4f7da3e3..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version2/Popup.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Template Definition for popup.dwt
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates.php';
-
-/**
- * popup template object
- * 
- * @package UNL_Templates
- *
- */
-class UNL_Templates_Version2_Popup extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Popup.tpl';                       // template name
-    public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
-    public $head = "<script type=\"text/javascript\"> var navl2Links = 0; //Default navline2 links to display (zero based counting) </script>";                           // string()  
-    public $collegenavigationlist = "";          // string()  
-    public $titlegraphic = "<h1>Department</h1> <h2>Taglines - We Do The Heavy Lifting</h2>";                   // string()  
-    public $maincontentarea = "<p style=\"margin:20px; border:3px solid #CC0000;padding:10px; text-align:center\"> <strong>Delete this box and place your content here.</strong><br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://www.unl.edu/webdevnet/\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Click here to check Validation</a> </p>";                // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version2_Popup',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version2/Secure.php b/lib/php/UNL/Templates/Version2/Secure.php
deleted file mode 100644
index 90ac4755bf745f192267c538f597446d92c2d138..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version2/Secure.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Template Definition for secure.dwt
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates.php';
-
-/**
- * Secure template object
- * 
- * @package UNL_Templates
- *
- */
-class UNL_Templates_Version2_Secure extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Secure.tpl';                      // template name
-    public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
-    public $head = "<script type=\"text/javascript\"> var navl2Links = 0; //Default navline2 links to display (zero based counting) </script>";                           // string()  
-    public $breadcrumbs = "<!-- WDN: see glossary item \'breadcrumbs\' --> <ul> <li class=\"first\"><a href=\"http://www.unl.edu/\">UNL</a></li> <li><a href=\"http://www.unl.edu/\">Department</a></li> <li>New Page</li> </ul> <!--#include virtual=\"/ucomm/templatedependents/templatesharedcode/includes/badges/secure.html\" -->";                    // string()  
-    public $collegenavigationlist = "";          // string()  
-    public $titlegraphic = "<h1>Department</h1> <h2>Taglines - We Do The Heavy Lifting</h2>";                   // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $leftcollinks = "<!-- WDN: see glossary item \'sidebar links\' --> <!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $maincontentarea = "<p style=\"margin:20px; border:3px solid #CC0000;padding:10px; text-align:center\"> <strong>Delete this box and place your content here.</strong><br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://www.unl.edu/webdevnet/\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Click here to check Validation</a> </p>";                // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version2_Secure',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version2/Unlaffiliate.php b/lib/php/UNL/Templates/Version2/Unlaffiliate.php
deleted file mode 100644
index 194231ae963ba67fd8a9d8cdb1068b17bec38a8c..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version2/Unlaffiliate.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Template Definition for unlaffiliate.dwt
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates.php';
-
-class UNL_Templates_Version2_Unlaffiliate extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Unlaffiliate.tpl';                // template name
-    public $doctitle = "<title>UNL Redesign</title>";                       // string()  
-    public $head = "<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"/ucomm/templatedependents/templatecss/layouts/affiliate.css\" />";                           // string()  
-    public $siteheader = "<!--#include virtual=\"/ucomm/templatedependents/templatesharedcode/includes/siteheader/affiliate.shtml\" -->";                     // string()  
-    public $breadcrumbs = "<!-- WDN: see glossary item \'breadcrumbs\' --> <ul> <li class=\"first\"><a href=\"http://www.unl.edu/\">UNL</a></li> <li>UNL Framework</li> </ul>";                    // string()  
-    public $shelf = "";                          // string()  
-    public $titlegraphic = "<h1>Affiliate</h1> <h2>Taglines - We Do The Heavy Lifting</h2>";                   // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $leftRandomPromo = "<div class=\"image_small_short\" id=\"leftRandomPromo\"> <a href=\"#\" id=\"leftRandomPromoAnchor\"><img id=\"leftRandomPromoImage\" alt=\"\" src=\"/ucomm/templatedependents/templatecss/images/transpixel.gif\" /></a> <script type=\"text/javascript\" src=\"../sharedcode/leftRandomPromo.js\"></script> </div>";                // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $maincontentarea = "<h2 class=\"sec_main\">This template is only for affiliates of UNL, or units that have been granted a marketing exemption from the university. Confirm your use of this template before using it!</h2> <p style=\"margin:20px; border:3px solid #CC0000;padding:10px; text-align:center\"> <strong>Delete this box and place your content here.</strong><br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://www.unl.edu/webdevnet/\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Click here to check Validation</a> </p> <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->";                // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version2_Unlaffiliate',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version2/Unlframework.php b/lib/php/UNL/Templates/Version2/Unlframework.php
deleted file mode 100644
index 47b4261693c11c4d01a3192e73646796390f2d6d..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version2/Unlframework.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Template Definition for unlframework.dwt
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates.php';
-
-/**
- * Unlframework template object
- * 
- * @package UNL_Templates
- *
- */
-class UNL_Templates_Version2_Unlframework extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Unlframework.tpl';                // template name
-    public $doctitle = "<title>UNL Redesign</title>";                       // string()  
-    public $head = "<!--#include virtual=\"/ucomm/templatedependents/templatesharedcode/includes/browsersniffers/ie.html\" --> <!--#include virtual=\"/ucomm/templatedependents/templatesharedcode/includes/comments/developersnote.html\" --> <!--#include virtual=\"/ucomm/templatedependents/templatesharedcode/includes/metanfavico/metanfavico.html\" -->";                           // string()  
-    public $siteheader = "<!--#include virtual=\"/ucomm/templatedependents/templatesharedcode/includes/siteheader/siteheader.shtml\" -->";                     // string()  
-    public $breadcrumbs = "<!-- WDN: see glossary item \'breadcrumbs\' --> <ul> <li class=\"first\"><a href=\"http://www.unl.edu/\">UNL</a></li> <li>UNL Framework</li> </ul>";                    // string()  
-    public $shelf = "<!--#include virtual=\"/ucomm/templatedependents/templatesharedcode/includes/shelf/shelf.shtml\" -->";                          // string()  
-    public $collegenavigationlist = "";          // string()  
-    public $titlegraphic = "<h1>Department</h1> <h2>Taglines - We Do The Heavy Lifting</h2>";                   // string()  
-    public $leftcolcontent = "<div id=\"navigation\"> <h4 id=\"sec_nav\">Navigation</h4> <div id=\"navlinks\"> <!--#include virtual=\"../sharedcode/navigation.html\" --> </div> <div id=\"nav_end\"></div> <div class=\"image_small_short\" id=\"leftRandomPromo\"> <a href=\"#\" id=\"leftRandomPromoAnchor\"><img id=\"leftRandomPromoImage\" alt=\"\" src=\"/ucomm/templatedependents/templatecss/images/transpixel.gif\" /></a> <script type=\"text/javascript\" src=\"../sharedcode/leftRandomPromo.js\"></script> </div> <!-- WDN: see glossary item \'sidebar links\' --> <div id=\"leftcollinks\"> <!--#include virtual=\"../sharedcode/relatedLinks.html\" --> </div> </div> <!-- close navigation -->";                 // string()  
-    public $maincolcontent = "<!-- optional main big content image --> <div id=\"maincontent\"> <p style=\"margin:20px; border:3px solid #CC0000;padding:10px; text-align:center\"> <strong>Delete this box and place your content here.</strong><br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://www.unl.edu/webdevnet/\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Click here to check Validation</a> </p> </div> <!-- close right-area -->";                 // string()  
-    public $bigfooter = "<div id=\"footer\"> <div id=\"footer_floater\"> <div id=\"copyright\"> <!--#include virtual=\"../sharedcode/footer.html\" --> <span><a href=\"http://jigsaw.w3.org/css-validator/check/referer\">CSS</a> <a href=\"http://validator.unl.edu/check/referer\">W3C</a> <a href=\"http://www1.unl.edu/feeds/\">RSS</a> </span><a href=\"http://www.unl.edu/\" title=\"UNL Home\"><img src=\"/ucomm/templatedependents/templatecss/images/wordmark.png\" alt=\"UNL\'s wordmark\" id=\"wordmark\" /></a></div> </div> </div>";                      // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version2_Unlframework',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version2/Unlstandardtemplate.php b/lib/php/UNL/Templates/Version2/Unlstandardtemplate.php
deleted file mode 100644
index 5aff6955702cb8efadde4d09afbe9f35a7e61bb2..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version2/Unlstandardtemplate.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Template Definition for unlstandardtemplate.dwt
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates.php';
-
-/**
- * Unlstandardtemplate object
- * 
- * @package UNL_Templates
- *
- */
-class UNL_Templates_Version2_Unlstandardtemplate extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Unlstandardtemplate.tpl';         // template name
-    public $doctitle = "<title>UNL Redesign</title>";                       // string()  
-    public $head = "";                           // string()  
-    public $siteheader = "<!--#include virtual=\"/ucomm/templatedependents/templatesharedcode/includes/siteheader/siteheader.shtml\" -->";                     // string()  
-    public $breadcrumbs = "<ul> <li class=\"first\"><a href=\"http://www.unl.edu/\">UNL</a></li> <li>UNL Standard Template</li> </ul>";                    // string()  
-    public $shelf = "<!--#include virtual=\"/ucomm/templatedependents/templatesharedcode/includes/shelf/shelf.shtml\" -->";                          // string()  
-    public $collegenavigationlist = "";          // string()  
-    public $titlegraphic = "<h1>Department</h1> <h2>Taglines - We Do The Heavy Lifting</h2>";                   // string()  
-    public $navcontent = "<div id=\"navlinks\"> <!--#include virtual=\"../sharedcode/navigation.html\" --> </div>";                     // string()  
-    public $leftRandomPromo = "<div class=\"image_small_short\" id=\"leftRandomPromo\"> <a href=\"#\" id=\"leftRandomPromoAnchor\"><img id=\"leftRandomPromoImage\" alt=\"\" src=\"/ucomm/templatedependents/templatecss/images/transpixel.gif\" /></a> <script type=\"text/javascript\" src=\"../sharedcode/leftRandomPromo.js\"></script> </div>";                // string()  
-    public $leftcollinks = "<h3>Related Links</h3> <!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $maincontent = "<p style=\"margin:20px; border:3px solid #CC0000;padding:10px; text-align:center\"> <strong>Delete this box and place your content here.</strong><br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://www.unl.edu/webdevnet/\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Click here to check Validation</a> </p>";                    // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version2_Unlstandardtemplate',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version3.php b/lib/php/UNL/Templates/Version3.php
deleted file mode 100644
index 81931203eaefdca6ad8c937d1db46751e3029b60..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Base class for Version 3 (2009) template files.
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates/Version.php';
-
-/**
- * Base class for Version 3 (2009) template files.
- * 
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-class UNL_Templates_Version3 implements UNL_Templates_Version
-{ 
-    function getConfig()
-    {
-        return array('class_location' => 'UNL/Templates/Version3/',
-                     'class_prefix'   => 'UNL_Templates_Version3_');
-    }
-    
-    function getTemplate($template)
-    {
-        if (!file_exists(UNL_Templates::$options['templatedependentspath'].'/wdn/templates_3.0')) {
-            UNL_Templates::debug('ERROR You should have a local copy of wdn/templates_3.0!'
-                                 . ' Overriding your specified template to use absolute references' ,
-                                 'getTemplate', 1);
-            $template = 'Absolute.tpl';
-        }
-
-        // Set a timeout for the HTTP download of the template file
-        $http_context = stream_context_create(array('http' => array('timeout' => UNL_Templates::$options['timeout'])));
-
-        // Always try and retrieve the latest
-        if (!(UNL_Templates::getCachingService() instanceof UNL_Templates_CachingService_Null)
-            && $tpl = file_get_contents('http://pear.unl.edu/UNL/Templates/server.php?version=3&template='.$template, false, $http_context)) {
-            return $tpl;
-        }
-
-        if (file_exists(UNL_Templates::getDataDir().'/tpl_cache/Version3/'.$template)) {
-            return file_get_contents(UNL_Templates::getDataDir().'/tpl_cache/Version3/'.$template);
-        }
-
-        throw new Exception('Could not get the template file!');
-    }
-    
-    function makeIncludeReplacements($html)
-    {
-        UNL_Templates::debug('Now making template include replacements.',
-                     'makeIncludeReplacements', 3);
-        $includes = array();
-        preg_match_all('<!--#include virtual="(/wdn/templates_3.0/[A-Za-z0-9\.\/_]+)" -->',
-                        $html, $includes);
-        UNL_Templates::debug(print_r($includes, true), 'makeIncludeReplacements', 3);
-        foreach ($includes[1] as $include) {
-            UNL_Templates::debug('Replacing '.$include, 'makeIncludeReplacements', 3);
-            $file = UNL_Templates::$options['templatedependentspath'].$include;
-            if (!file_exists($file)) {
-                UNL_Templates::debug('File does not exist:'.$file,
-                             'makeIncludeReplacements', 3);
-                $file = 'http://www.unl.edu'.$include;
-            }
-            $html = str_replace('<!--#include virtual="'.$include.'" -->',
-                                 file_get_contents($file), $html);
-        }
-        return $html;
-    }
-}
diff --git a/lib/php/UNL/Templates/Version3/Absolute.php b/lib/php/UNL/Templates/Version3/Absolute.php
deleted file mode 100644
index 3a7f120bf874ce4097e8a8e06a5602f32917d3a2..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3/Absolute.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Template Definition for absolute.dwt
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates.php';
-
-/**
- * Template Definition for absolute.dwt
- * 
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-class UNL_Templates_Version3_Absolute extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Absolute.tpl';                    // template name
-    public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li>Department</li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $titlegraphic = "<h1>Department</h1>";                   // string()  
-    public $pagetitle = "";                      // string()  
-    public $maincontentarea = "<p>Place your content here.<br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://wdn.unl.edu//\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Check this page</a> </p>";                // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3_Absolute',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version3/Debug.php b/lib/php/UNL/Templates/Version3/Debug.php
deleted file mode 100644
index 2a8e34e5fc5cc1cb04f80b35fc8567f7be41937c..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3/Debug.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Template Definition for debug.dwt
- */
-require_once 'UNL/Templates.php';
-
-class UNL_Templates_Version3_Debug extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Debug.tpl';                       // template name
-    public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li>Department</li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $titlegraphic = "<h1>Department</h1>";                   // string()  
-    public $pagetitle = "";                      // string()  
-    public $maincontentarea = "<p>Place your content here.<br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://wdn.unl.edu//\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Check this page</a> </p>";                // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3_Debug',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version3/Document.php b/lib/php/UNL/Templates/Version3/Document.php
deleted file mode 100644
index efc4581930ed56de0d311bd540605a7b33f2c57b..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3/Document.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Template Definition for document.dwt
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates.php';
-
-/**
- * Template Definition for document.dwt
- * 
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-class UNL_Templates_Version3_Document extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Document.tpl';                    // template name
-    public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li>Department</li> </ul>";                    // string()  
-    public $titlegraphic = "<h1>Department</h1>";                   // string()  
-    public $pagetitle = "";                      // string()  
-    public $maincontentarea = "<p>Place your content here.<br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://wdn.unl.edu//\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Check this page</a> </p>";                // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3_Document',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version3/Fixed.php b/lib/php/UNL/Templates/Version3/Fixed.php
deleted file mode 100644
index 5f7a566d3233a80865ccb0a6557467a7d49e2076..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3/Fixed.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Template Definition for fixed.dwt
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates.php';
-
-/**
- * Template Definition for fixed.dwt
- * 
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-class UNL_Templates_Version3_Fixed extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Fixed.tpl';                       // template name
-    public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li>Department</li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $titlegraphic = "<h1>Department</h1>";                   // string()  
-    public $pagetitle = "";                      // string()  
-    public $maincontentarea = "<p>Place your content here.<br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://wdn.unl.edu//\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Check this page</a> </p>";                // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3_Fixed',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version3/Fixed_html5.php b/lib/php/UNL/Templates/Version3/Fixed_html5.php
deleted file mode 100644
index 7e359fa6f5688543dd632245b82de3939860c462..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3/Fixed_html5.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Template Definition for fixed_html5.dwt
- */
-require_once 'UNL/Templates.php';
-
-class UNL_Templates_Version3_Fixed_html5 extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Fixed_html5.tpl';                 // template name
-    public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li>Department</li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $titlegraphic = "<h1>Department</h1>";                   // string()  
-    public $pagetitle = "";                      // string()  
-    public $maincontentarea = "<p>Place your content here.<br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://wdn.unl.edu//\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Check this page</a> </p>";                // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3_Fixed_html5',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version3/Liquid.php b/lib/php/UNL/Templates/Version3/Liquid.php
deleted file mode 100644
index 065d3fc61a53447e0a3f070d649c02501b4393a8..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3/Liquid.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Template Definition for liquid.dwt
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates.php';
-
-/**
- * Template Definition for liquid.dwt
- * 
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-class UNL_Templates_Version3_Liquid extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Liquid.tpl';                      // template name
-    public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li>Department</li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $titlegraphic = "<h1>Department</h1>";                   // string()  
-    public $pagetitle = "";                      // string()  
-    public $maincontentarea = "<p>Place your content here.<br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://wdn.unl.edu//\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Check this page</a> </p>";                // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3_Liquid',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version3/Mobile.php b/lib/php/UNL/Templates/Version3/Mobile.php
deleted file mode 100644
index ce3a0f1e72978c1d12dd099f138ec5b9d7c59009..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3/Mobile.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Template Definition for mobile.dwt
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Kyle Powers <kylepowers@gmail.com>
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates.php';
-
-class UNL_Templates_Version3_Mobile extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Mobile.tpl';                      // template name
-    public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li>Department</li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $titlegraphic = "<h1>Department</h1>";                   // string()  
-    public $pagetitle = "";                      // string()  
-    public $maincontentarea = "<p>Place your content here.<br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://wdn.unl.edu//\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Check this page</a> </p>";                // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3_Mobile',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version3/Popup.php b/lib/php/UNL/Templates/Version3/Popup.php
deleted file mode 100644
index f8a9cb83992e3ceaea7ae59654db7e5400944ccc..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3/Popup.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Template Definition for popup.dwt
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates.php';
-
-/**
- * Template Definition for popup.dwt
- * 
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-class UNL_Templates_Version3_Popup extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Popup.tpl';                       // template name
-    public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $titlegraphic = "<h1>Department</h1>";                   // string()  
-    public $pagetitle = "";                      // string()  
-    public $maincontentarea = "<p>Place your content here.<br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://wdn.unl.edu//\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Check this page</a> </p>";                // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3_Popup',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version3/Secure.php b/lib/php/UNL/Templates/Version3/Secure.php
deleted file mode 100644
index 03d4f90baa59eca9fe9ee265ff2b2e82e8f79f03..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3/Secure.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Template Definition for secure.dwt
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates.php';
-
-/**
- * Template Definition for secure.dwt
- * 
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-class UNL_Templates_Version3_Secure extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Secure.tpl';                      // template name
-    public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li>Department</li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $titlegraphic = "<h1>Department</h1>";                   // string()  
-    public $pagetitle = "";                      // string()  
-    public $maincontentarea = "<p>Place your content here.<br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://wdn.unl.edu//\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Check this page</a> </p>";                // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3_Secure',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version3/Shared_column_left.php b/lib/php/UNL/Templates/Version3/Shared_column_left.php
deleted file mode 100644
index af770692bf5ba9437526c509758d6a044a3769db..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3/Shared_column_left.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Template Definition for shared_column_left.dwt
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates.php';
-
-/**
- * Template definition for shared_column_left.dwt
- * 
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-class UNL_Templates_Version3_Shared_column_left extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Shared_column_left.tpl';          // template name
-    public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li>Department</li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $titlegraphic = "<h1>Department</h1>";                   // string()  
-    public $pagetitle = "";                      // string()  
-    public $sharedcolumn = "<div class=\"col left\"> <!--#include virtual=\"../sharedcode/sharedColumn.html\" --> </div>";                   // string()  
-    public $maincontentarea = "<p>Place your content here.<br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://wdn.unl.edu//\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Check this page</a> </p>";                // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3_Shared_column_left',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version3/Shared_column_right.php b/lib/php/UNL/Templates/Version3/Shared_column_right.php
deleted file mode 100644
index 00247c20de1569557549fcca068d371f13d04b34..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3/Shared_column_right.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Template Definition for shared_column_right.dwt
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates.php';
-
-/**
- * Template Definition for shared_column_right.dwt
- * 
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-class UNL_Templates_Version3_Shared_column_right extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Shared_column_right.tpl';         // template name
-    public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li>Department</li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $titlegraphic = "<h1>Department</h1>";                   // string()  
-    public $pagetitle = "";                      // string()  
-    public $maincontentarea = "<p>Place your content here.<br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://wdn.unl.edu//\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Check this page</a> </p>";                // string()  
-    public $sharedcolumn = "<div class=\"col right\"> <!--#include virtual=\"../sharedcode/sharedColumn.html\" --> </div>";                   // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3_Shared_column_right',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version3/Unlaffiliate.php b/lib/php/UNL/Templates/Version3/Unlaffiliate.php
deleted file mode 100644
index c36dfc3516eedf64131da4c6da0aca5f9d97a610..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3/Unlaffiliate.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Template Definition for unlaffiliate.dwt
- */
-require_once 'UNL/Templates.php';
-
-class UNL_Templates_Version3_Unlaffiliate extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Unlaffiliate.tpl';                // template name
-    public $doctitle = "<title>UNL | Department | New Page</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $sitebranding = "<div id=\"affiliate_note\"><a href=\"http://www.unl.edu\" title=\"University of Nebraska&ndash;Lincoln\">An affiliate of the University of Nebraska&ndash;Lincoln</a></div> <a href=\"/\" title=\"Through the Eyes of the Child Initiative\"><img src=\"../sharedcode/affiliate_imgs/affiliate_logo.png\" alt=\"Through the Eyes of the Child Initiative\" id=\"logo\" /></a> <h1>Through the Eyes of the Child Initiative</h1> <div id=\'tag_line\'>A Nebraska Supreme Court Initiative</div>";                   // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li>Department</li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $titlegraphic = "<h1>Department</h1>";                   // string()  
-    public $pagetitle = "";                      // string()  
-    public $maincontentarea = "<p>Place your content here.<br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://wdn.unl.edu//\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Check this page</a> </p>";                // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3_Unlaffiliate',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version3x1.php b/lib/php/UNL/Templates/Version3x1.php
deleted file mode 100644
index 3aacf6bc7f81e04f51be33ffdcd58a9ac165c46c..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3x1.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Base class for Version 3 (2009) template files.
- * 
- * PHP version 5
- *  
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates/Version.php';
-
-/**
- * Base class for Version 3 (2009) template files.
- * 
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-class UNL_Templates_Version3x1 implements UNL_Templates_Version
-{ 
-    function getConfig()
-    {
-        return array('class_location' => 'UNL/Templates/Version3x1/',
-                     'class_prefix'   => 'UNL_Templates_Version3x1_');
-    }
-    
-    function getTemplate($template)
-    {
-        if (!file_exists(UNL_Templates::$options['templatedependentspath'].'/wdn/templates_3.1')) {
-            UNL_Templates::debug('ERROR You should have a local copy of wdn/templates_3.1!'
-                                 . ' Overriding your specified template to use absolute references' ,
-                                 'getTemplate', 1);
-            $template = 'Local.tpl';
-        }
-
-        // Always try and retrieve the latest
-        if (!(UNL_Templates::getCachingService() instanceof UNL_Templates_CachingService_Null)
-            && $tpl = file_get_contents('http://pear.unl.edu/UNL/Templates/server.php?version=3x1&template='.$template)) {
-            return $tpl;
-        }
-
-        if (file_exists(UNL_Templates::getDataDir().'/tpl_cache/Version3x1/'.$template)) {
-            return file_get_contents(UNL_Templates::getDataDir().'/tpl_cache/Version3x1/'.$template);
-        }
-
-        throw new Exception('Could not get the template file!');
-    }
-
-    function makeIncludeReplacements($html)
-    {
-        UNL_Templates::debug('Now making template include replacements.',
-                     'makeIncludeReplacements', 3);
-        $includes = array();
-        preg_match_all('<!--#include virtual="(/wdn/templates_3.1/[A-Za-z0-9\.\/_]+)" -->',
-                        $html, $includes);
-        UNL_Templates::debug(print_r($includes, true), 'makeIncludeReplacements', 3);
-        foreach ($includes[1] as $include) {
-            UNL_Templates::debug('Replacing '.$include, 'makeIncludeReplacements', 3);
-            $file = UNL_Templates::$options['templatedependentspath'].$include;
-            if (!file_exists($file)) {
-                UNL_Templates::debug('File does not exist:'.$file,
-                             'makeIncludeReplacements', 3);
-                $file = 'http://www.unl.edu'.$include;
-            }
-            $html = str_replace('<!--#include virtual="'.$include.'" -->',
-                                 file_get_contents($file), $html);
-        }
-        return $html;
-    }
-}
diff --git a/lib/php/UNL/Templates/Version3x1/Debug.php b/lib/php/UNL/Templates/Version3x1/Debug.php
deleted file mode 100644
index 03474443b3165ffee3ca8bb8e96e0891bbeea1a3..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3x1/Debug.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Template Definition for debug.dwt
- */
-require_once 'UNL/Templates.php';
-
-class UNL_Templates_Version3x1_Debug extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Debug.tpl';                       // template name
-    public $doctitle = "<title>Use a descriptive page title | Optional Site Title (use for context) | University of Nebraska&ndash;Lincoln</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $titlegraphic = "The Title of My Site";                   // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li class=\"selected\"><a href=\"#\" title=\"Site Title\">Site Title</a></li> <li>Page Title</li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $pagetitle = "<h1>This is your page title. It\'s now an &lt;h1&gt;, baby!</h1>";                      // string()  
-    public $maincontentarea = "<h2>This is a blank page</h2> <p>Impress your audience with awesome content!</p>";                // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    public $__params = array (
-  'class' => 
-  array (
-    'name' => 'class',
-    'type' => 'text',
-    'value' => 'fixed debug',
-  ),
-);
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3x1_Debug',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version3x1/Fixed.php b/lib/php/UNL/Templates/Version3x1/Fixed.php
deleted file mode 100644
index 792cb987e9155c93b2cfbe11f483e869314bc44e..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3x1/Fixed.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Template Definition for fixed.dwt
- */
-require_once 'UNL/Templates.php';
-
-class UNL_Templates_Version3x1_Fixed extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Fixed.tpl';                       // template name
-    public $doctitle = "<title>Use a descriptive page title | Optional Site Title (use for context) | University of Nebraska&ndash;Lincoln</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $titlegraphic = "The Title of My Site";                   // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li class=\"selected\"><a href=\"#\" title=\"Site Title\">Site Title</a></li> <li>Page Title</li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $pagetitle = "<h1>This is your page title. It\'s now an &lt;h1&gt;, baby!</h1>";                      // string()  
-    public $maincontentarea = "<h2>This is a blank page</h2> <p>Impress your audience with awesome content!</p>";                // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    public $__params = array (
-  'class' => 
-  array (
-    'name' => 'class',
-    'type' => 'text',
-    'value' => 'fixed',
-  ),
-);
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3x1_Fixed',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version3x1/Local.php b/lib/php/UNL/Templates/Version3x1/Local.php
deleted file mode 100644
index 77fed187638d0cf187efb1aa98cd9323926001f0..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3x1/Local.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Template Definition for local.dwt
- */
-require_once 'UNL/Templates.php';
-
-class UNL_Templates_Version3x1_Local extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Local.tpl';                       // template name
-    public $doctitle = "<title>Use a descriptive page title | Optional Site Title (use for context) | University of Nebraska&ndash;Lincoln</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $titlegraphic = "The Title of My Site";                   // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\">UNL</a></li> <li class=\"selected\"><a href=\"#\" title=\"Site Title\">Site Title</a></li> <li>Page Title</li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $pagetitle = "<h1>This is your page title. It\'s now an &lt;h1&gt;, baby!</h1>";                      // string()  
-    public $maincontentarea = "<h2>This is a blank page</h2> <p>Impress your audience with awesome content!</p>";                // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    public $__params = array (
-  'class' => 
-  array (
-    'name' => 'class',
-    'type' => 'text',
-    'value' => 'fixed',
-  ),
-);
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3x1_Local',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version3x1/Unlaffiliate.php b/lib/php/UNL/Templates/Version3x1/Unlaffiliate.php
deleted file mode 100644
index 5eb78990d65075dcb5253a34d0796c51ed2a34a2..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3x1/Unlaffiliate.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Template Definition for unlaffiliate.dwt
- */
-require_once 'UNL/Templates.php';
-
-class UNL_Templates_Version3x1_Unlaffiliate extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Unlaffiliate.tpl';                // template name
-    public $doctitle = "<title>Use a descriptive page title | Optional Site Title (use for context) | UNL Affiliate</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here --> <link rel=\"stylesheet\" type=\"text/css\" media=\"screen\" href=\"../sharedcode/affiliate.css\" /> <link href=\"../sharedcode/affiliate_imgs/favicon.ico\" rel=\"shortcut icon\" />";                           // string()  
-    public $titlegraphic = "Throught the Eyes of a Child Initiative<span>A Nebraska Supreme Court Initiative</span>";                   // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.throughtheeyes.org/\" title=\"Through the Eyes of the Child Initiative\">Home</a></li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $pagetitle = "<h1>This is your page title. It\'s now an &lt;h1&gt;, baby!</h1>";                      // string()  
-    public $maincontentarea = "<h2>This is a blank page</h2> <p>Impress your audience with awesome content!</p>";                // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    public $__params = array (
-  'class' => 
-  array (
-    'name' => 'class',
-    'type' => 'text',
-    'value' => 'fixed',
-  ),
-);
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3x1_Unlaffiliate',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version3x1/Unlaffiliate_debug.php b/lib/php/UNL/Templates/Version3x1/Unlaffiliate_debug.php
deleted file mode 100644
index 1804ad91082a962072655a46da0684571168ee3b..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3x1/Unlaffiliate_debug.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Template Definition for unlaffiliate_debug.dwt
- */
-require_once 'UNL/Templates.php';
-
-class UNL_Templates_Version3x1_Unlaffiliate_debug extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Unlaffiliate_debug.tpl';          // template name
-    public $doctitle = "<title>Use a descriptive page title | Optional Site Title (use for context) | UNL Affiliate</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here --> <link rel=\"stylesheet\" type=\"text/css\" media=\"screen\" href=\"../sharedcode/affiliate.css\" /> <link href=\"../sharedcode/affiliate_imgs/favicon.ico\" rel=\"shortcut icon\" />";                           // string()  
-    public $titlegraphic = "Throught the Eyes of a Child Initiative<span>A Nebraska Supreme Court Initiative</span>";                   // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.throughtheeyes.org/\" title=\"Through the Eyes of the Child Initiative\">Home</a></li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $pagetitle = "<h1>This is your page title. It\'s now an &lt;h1&gt;, baby!</h1>";                      // string()  
-    public $maincontentarea = "<h2>This is a blank page</h2> <p>Impress your audience with awesome content!</p>";                // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    public $__params = array (
-  'class' => 
-  array (
-    'name' => 'class',
-    'type' => 'text',
-    'value' => 'fixed debug',
-  ),
-);
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3x1_Unlaffiliate_debug',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version3x1/Unlaffiliate_local.php b/lib/php/UNL/Templates/Version3x1/Unlaffiliate_local.php
deleted file mode 100644
index 20511b9b85b7ade733efa8819731fb5767703fba..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version3x1/Unlaffiliate_local.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Template Definition for unlaffiliate_local.dwt
- */
-require_once 'UNL/Templates.php';
-
-class UNL_Templates_Version3x1_Unlaffiliate_local extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Unlaffiliate_local.tpl';          // template name
-    public $doctitle = "<title>Use a descriptive page title | Optional Site Title (use for context) | UNL Affiliate</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here --> <link rel=\"stylesheet\" type=\"text/css\" media=\"screen\" href=\"../sharedcode/affiliate.css\" /> <link href=\"../sharedcode/affiliate_imgs/favicon.ico\" rel=\"shortcut icon\" />";                           // string()  
-    public $titlegraphic = "Throught the Eyes of a Child Initiative<span>A Nebraska Supreme Court Initiative</span>";                   // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.throughtheeyes.org/\" title=\"Through the Eyes of the Child Initiative\">Home</a></li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $pagetitle = "<h1>This is your page title. It\'s now an &lt;h1&gt;, baby!</h1>";                      // string()  
-    public $maincontentarea = "<h2>This is a blank page</h2> <p>Impress your audience with awesome content!</p>";                // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $optionalfooter = "";                 // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    public $__params = array (
-  'class' => 
-  array (
-    'name' => 'class',
-    'type' => 'text',
-    'value' => 'fixed',
-  ),
-);
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3x1_Unlaffiliate_local',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version4.php b/lib/php/UNL/Templates/Version4.php
deleted file mode 100644
index a786fb22cb8053da6e2404fbc5b80df8fff670c5..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version4.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Base class for Version 4 (2013) template files.
- *
- * PHP version 5
- *
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @author    Ned Hummel <nhummel2@unl.edu>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-require_once 'UNL/Templates/Version.php';
-
-/**
- * Base class for Version 4 (2013) template files.
- *
- * @category  Templates
- * @package   UNL_Templates
- * @author    Brett Bieber <brett.bieber@gmail.com>
- * @copyright 2009 Regents of the University of Nebraska
- * @license   http://www1.unl.edu/wdn/wiki/Software_License BSD License
- * @link      http://pear.unl.edu/
- */
-class UNL_Templates_Version4 implements UNL_Templates_Version
-{
-    function getConfig()
-    {
-        return array('class_location' => 'UNL/Templates/Version4/',
-                     'class_prefix'   => 'UNL_Templates_Version4_');
-    }
-
-    function getTemplate($template)
-    {
-
-        // Set a timeout for the HTTP download of the template file
-        $http_context = stream_context_create(array('http' => array('timeout' => UNL_Templates::$options['timeout'])));
-
-        // Always try and retrieve the latest
-        if (!(UNL_Templates::getCachingService() instanceof UNL_Templates_CachingService_Null)
-            && $tpl = file_get_contents('https://raw.github.com/unl/wdntemplates/master/Templates/'.$template, false, $http_context)) {
-
-            // Grab the HTML version number for this file
-            $version = file_get_contents('https://raw.github.com/unl/wdntemplates/master/Templates/VERSION_HTML');
-            $tpl = str_replace('$HTML_VERSION$', $version, $tpl);
-
-            return $tpl;
-        }
-
-        if (file_exists(UNL_Templates::getDataDir().'/tpl_cache/Version4/'.$template)) {
-            return file_get_contents(UNL_Templates::getDataDir().'/tpl_cache/Version4/'.$template);
-        }
-
-
-        throw new Exception('Could not get the template file!');
-    }
-
-    function makeIncludeReplacements($html)
-    {
-        UNL_Templates::debug('Now making template include replacements.',
-                     'makeIncludeReplacements', 3);
-        $includes = array();
-        preg_match_all('<!--#include virtual="(/wdn/templates_4.0/[A-Za-z0-9\.\/_]+)" -->',
-                        $html, $includes);
-        UNL_Templates::debug(print_r($includes, true), 'makeIncludeReplacements', 3);
-
-        // Normally the templates will not need to have the dependency version replaced
-        static $dep_version = '';
-
-        foreach ($includes[1] as $include) {
-            UNL_Templates::debug('Replacing '.$include, 'makeIncludeReplacements', 3);
-            $file = UNL_Templates::$options['templatedependentspath'].$include;
-            if (!file_exists($file)) {
-
-                UNL_Templates::debug('File does not exist:'.$file, 'makeIncludeReplacements', 3);
-                // We'll grab the latest copy of the file from Github
-
-                if ($dep_version == '') {
-                    // Grab the dependency version from github
-                    $dep_version = file_get_contents('https://raw.github.com/unl/wdntemplates/master/VERSION_DEP');
-                }
-
-                $file = 'https://raw.github.com/unl/wdntemplates/master'.$include;
-            }
-            $html = str_replace(
-                        array('<!--#include virtual="'.$include.'" -->', '$DEP_VERSION$'),
-                        array(file_get_contents($file),                  $dep_version),
-                        $html
-                    );
-        }
-        return $html;
-    }
-}
diff --git a/lib/php/UNL/Templates/Version4/Debug.php b/lib/php/UNL/Templates/Version4/Debug.php
deleted file mode 100644
index 13954092d9072806cfcaa6d3aac7ab1ef115827b..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version4/Debug.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Template Definition for fixed.dwt
- */
-require_once 'UNL/Templates.php';
-
-class UNL_Templates_Version4_Debug extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Debug.tpl';                       // template name
-    public $doctitle = "<title>Use a descriptive page title | Optional Site Title (use for context) | University of Nebraska&ndash;Lincoln</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $titlegraphic = "The Title of My Site";                   // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\" class=\"wdn-icon-home\">UNL</a></li> <li><a href=\"#\" title=\"Site Title\">Site Title</a></li> <li>Home</li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $pagetitle = "<h1>Please Title Your Page Here</h1>";                      // string()  
-    public $maincontentarea = "<div class=\"wdn-band\"> <div class=\"wdn-inner-wrapper\"> <p>Impress your audience with awesome content!</p> </div> </div>";                // string()  
-    public $optionalfooter = "";                 // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    public $__params = array (
-  'class' => 
-  array (
-    'name' => 'class',
-    'type' => 'text',
-    'value' => 'debug',
-  ),
-);
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version4_Debug',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version4/Fixed.php b/lib/php/UNL/Templates/Version4/Fixed.php
deleted file mode 100644
index 2d3af49030248875397b5f35871712620da7080b..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version4/Fixed.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Template Definition for fixed.dwt
- */
-require_once 'UNL/Templates.php';
-
-class UNL_Templates_Version4_Fixed extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Fixed.tpl';                       // template name
-    public $doctitle = "<title>Use a descriptive page title | Optional Site Title (use for context) | University of Nebraska&ndash;Lincoln</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $titlegraphic = "The Title of My Site";                   // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\" class=\"wdn-icon-home\">UNL</a></li> <li><a href=\"#\" title=\"Site Title\">Site Title</a></li> <li>Home</li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $pagetitle = "<h1>Please Title Your Page Here</h1>";                      // string()  
-    public $maincontentarea = "<div class=\"wdn-band\"> <div class=\"wdn-inner-wrapper\"> <p>Impress your audience with awesome content!</p> </div> </div>";                // string()  
-    public $optionalfooter = "";                 // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    public $__params = array (
-  'class' => 
-  array (
-    'name' => 'class',
-    'type' => 'text',
-    'value' => '',
-  ),
-);
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version4_Fixed',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version4/Local.php b/lib/php/UNL/Templates/Version4/Local.php
deleted file mode 100644
index a40359852c8095b0e7a4a3220076b02fee96a89a..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version4/Local.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Template Definition for local.dwt
- */
-require_once 'UNL/Templates.php';
-
-class UNL_Templates_Version4_Local extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Local.tpl';                       // template name
-    public $doctitle = "<title>Use a descriptive page title | Optional Site Title (use for context) | University of Nebraska&ndash;Lincoln</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here -->";                           // string()  
-    public $titlegraphic = "The Title of My Site";                   // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska&ndash;Lincoln\" class=\"wdn-icon-home\">UNL</a></li> <li><a href=\"#\" title=\"Site Title\">Site Title</a></li> <li>Home</li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $pagetitle = "<h1>Please Title Your Page Here</h1>";                      // string()  
-    public $maincontentarea = "<div class=\"wdn-band\"> <div class=\"wdn-inner-wrapper\"> <p>Impress your audience with awesome content!</p> </div> </div>";                // string()  
-    public $optionalfooter = "";                 // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    public $__params = array (
-  'class' => 
-  array (
-    'name' => 'class',
-    'type' => 'text',
-    'value' => '',
-  ),
-);
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version4_Local',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version4/Unlaffiliate.php b/lib/php/UNL/Templates/Version4/Unlaffiliate.php
deleted file mode 100644
index 7bf68c0325ffac40ca002edb9dcd12bbd0093688..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version4/Unlaffiliate.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Template Definition for unlaffiliate.dwt
- */
-require_once 'UNL/Templates.php';
-
-class UNL_Templates_Version4_Unlaffiliate extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Unlaffiliate.tpl';                // template name
-    public $doctitle = "<title>Use a descriptive page title | Optional Site Title (use for context) | UNL Affiliate</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here --> <link rel=\"stylesheet\" type=\"text/css\" media=\"screen\" href=\"../sharedcode/affiliate.css\" /> <link href=\"../sharedcode/affiliate_imgs/favicon.ico\" rel=\"shortcut icon\" />";                           // string()  
-    public $titlegraphic = "The Title of My Site";                   // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.throughtheeyes.org/\" title=\"Through the Eyes of the Child Initiative\">Home</a></li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $pagetitle = "<h1>Please Title Your Page Here</h1>";                      // string()  
-    public $maincontentarea = "<div class=\"wdn-band\"> <div class=\"wdn-inner-wrapper\"> <p>Impress your audience with awesome content!</p> </div> </div>";                // string()  
-    public $optionalfooter = "";                 // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    public $__params = array (
-  'class' => 
-  array (
-    'name' => 'class',
-    'type' => 'text',
-    'value' => '',
-  ),
-);
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version4_Unlaffiliate',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version4/Unlaffiliate_debug.php b/lib/php/UNL/Templates/Version4/Unlaffiliate_debug.php
deleted file mode 100644
index 9905d431c90a7434ec0a5c65b3ca0c6b50854d86..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version4/Unlaffiliate_debug.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Template Definition for unlaffiliate_debug.dwt
- */
-require_once 'UNL/Templates.php';
-
-class UNL_Templates_Version4_Unlaffiliate_debug extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Unlaffiliate_debug.tpl';          // template name
-    public $doctitle = "<title>Use a descriptive page title | Optional Site Title (use for context) | UNL Affiliate</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here --> <link rel=\"stylesheet\" type=\"text/css\" media=\"screen\" href=\"../sharedcode/affiliate.css\" /> <link href=\"../sharedcode/affiliate_imgs/favicon.ico\" rel=\"shortcut icon\" />";                           // string()  
-    public $titlegraphic = "The Title of My Site";                   // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.throughtheeyes.org/\" title=\"Through the Eyes of the Child Initiative\">Home</a></li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $pagetitle = "<h1>Please Title Your Page Here</h1>";                      // string()  
-    public $maincontentarea = "<div class=\"wdn-band\"> <div class=\"wdn-inner-wrapper\"> <p>Impress your audience with awesome content!</p> </div> </div>";                // string()  
-    public $optionalfooter = "";                 // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    public $__params = array (
-  'class' => 
-  array (
-    'name' => 'class',
-    'type' => 'text',
-    'value' => 'debug',
-  ),
-);
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version4_Unlaffiliate_debug',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/php/UNL/Templates/Version4/Unlaffiliate_local.php b/lib/php/UNL/Templates/Version4/Unlaffiliate_local.php
deleted file mode 100644
index 13681f492778e8db79f604babd39f5270f5e37c0..0000000000000000000000000000000000000000
--- a/lib/php/UNL/Templates/Version4/Unlaffiliate_local.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Template Definition for unlaffiliate_local.dwt
- */
-require_once 'UNL/Templates.php';
-
-class UNL_Templates_Version4_Unlaffiliate_local extends UNL_Templates 
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__template = 'Unlaffiliate_local.tpl';          // template name
-    public $doctitle = "<title>Use a descriptive page title | Optional Site Title (use for context) | UNL Affiliate</title>";                       // string()  
-    public $head = "<!-- Place optional header elements here --> <link rel=\"stylesheet\" type=\"text/css\" media=\"screen\" href=\"../sharedcode/affiliate.css\" /> <link href=\"../sharedcode/affiliate_imgs/favicon.ico\" rel=\"shortcut icon\" />";                           // string()  
-    public $titlegraphic = "The Title of My Site";                   // string()  
-    public $breadcrumbs = "<ul> <li><a href=\"http://www.throughtheeyes.org/\" title=\"Through the Eyes of the Child Initiative\">Home</a></li> </ul>";                    // string()  
-    public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->";                       // string()  
-    public $pagetitle = "<h1>Please Title Your Page Here</h1>";                      // string()  
-    public $maincontentarea = "<div class=\"wdn-band\"> <div class=\"wdn-inner-wrapper\"> <p>Impress your audience with awesome content!</p> </div> </div>";                // string()  
-    public $optionalfooter = "";                 // string()  
-    public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->";                   // string()  
-    public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->";                    // string()  
-    public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->";                  // string()  
-
-    public $__params = array (
-  'class' => 
-  array (
-    'name' => 'class',
-    'type' => 'text',
-    'value' => '',
-  ),
-);
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version4_Unlaffiliate_local',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-}
diff --git a/lib/tests/pear.unl.edu/UNL_Templates/UNL_TemplatesTest.php b/lib/tests/pear.unl.edu/UNL_Templates/UNL_TemplatesTest.php
deleted file mode 100644
index d8a4164144824dfaa4e36cbb86885cd54a99c6b5..0000000000000000000000000000000000000000
--- a/lib/tests/pear.unl.edu/UNL_Templates/UNL_TemplatesTest.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-// Call UNL_TemplatesTest::main() if this source file is executed directly.
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'UNL_TemplatesTest::main');
-}
-
-require_once 'PHPUnit/Framework.php';
-
-require_once 'UNL/Templates.php';
-
-/**
- * Test class for UNL_Templates.
- * Generated by PHPUnit on 2007-11-29 at 16:07:45.
- */
-class UNL_TemplatesTest extends PHPUnit_Framework_TestCase {
-    /**
-     * Runs the test methods of this class.
-     *
-     * @access public
-     * @static
-     */
-    public static function main() {
-        require_once 'PHPUnit/TextUI/TestRunner.php';
-
-        $suite  = new PHPUnit_Framework_TestSuite('UNL_TemplatesTest');
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
-    }
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     */
-    protected function setUp() {
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     */
-    protected function tearDown() {
-    }
-
-    /**
-     * @todo Implement test__constructor().
-     */
-    public function test__constructor() {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testLoadDefaultConfig().
-     */
-    public function testLoadDefaultConfig() {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testFactory().
-     */
-    public function testFactory() {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testGetCache().
-     */
-    public function testGetCache() {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testLoadSharedcodeFiles().
-     */
-    public function testLoadSharedcodeFiles() {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testAddHeadLink().
-     */
-    public function testAddHeadLink() {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testAddScript().
-     */
-    public function testAddScript() {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testAddScriptDeclaration().
-     */
-    public function testAddScriptDeclaration() {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testAddStyleDeclaration().
-     */
-    public function testAddStyleDeclaration() {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testAddStyleSheet().
-     */
-    public function testAddStyleSheet() {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testToHtml().
-     */
-    public function testToHtml() {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @todo Implement testMakeIncludeReplacements().
-     */
-    public function testMakeIncludeReplacements() {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-}
-
-// Call UNL_TemplatesTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == 'UNL_TemplatesTest::main') {
-    UNL_TemplatesTest::main();
-}
-?>
diff --git a/package.json b/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..5bf0e0c9f164e043998f449e22be5f6e152fd8ac
--- /dev/null
+++ b/package.json
@@ -0,0 +1,30 @@
+{
+  "name": "unl-search",
+  "version": "1.0.0",
+  "description": "A web application for searching UNL websites via Google Custom Search.",
+  "dependencies": {},
+  "devDependencies": {
+    "grunt": "^0.4.5",
+    "grunt-contrib-clean": "^0.6.0",
+    "grunt-contrib-less": "^1.0.1",
+    "grunt-contrib-requirejs": "^0.4.4",
+    "grunt-contrib-uglify": "^0.9.2",
+    "grunt-contrib-watch": "^0.6.1",
+    "grunt-curl": "^2.2.0",
+    "less-plugin-autoprefix": "^1.4.2",
+    "less-plugin-clean-css": "^1.5.1",
+    "load-grunt-tasks": "^3.2.0",
+    "lodash": "^3.10.1"
+  },
+  "scripts": {},
+  "repository": {
+    "type": "git",
+    "url": "git@git.unl.edu:iim/UNL_Search.git"
+  },
+  "keywords": [
+    "UNL",
+    "Search"
+  ],
+  "author": "UNL Web Developer Network <wdn@unl.edu> (http://wdn.unl.edu/)",
+  "license": "BSD-3-Clause"
+}
diff --git a/src/UNL/Search.php b/src/UNL/Search.php
index 1f718e6c1ce6da30afb6cbc6038e9286927fe421..be5d1f28cfa4aa18f277c44909cbd15e631021dd 100644
--- a/src/UNL/Search.php
+++ b/src/UNL/Search.php
@@ -74,7 +74,7 @@ class UNL_Search
             return false;
         }
         
-        return new UNL_Templates_Scanner($scanned);
+        return new \UNL\Templates\Scanner($scanned);
     }
 
     /**
@@ -96,4 +96,9 @@ class UNL_Search
     {
         return self::$linkedCSEServer . '?u=' . urlencode($referrer);
     }
+    
+    public static function getProjectRoot()
+    {
+        return dirname(dirname(__DIR__));
+    }
 }
diff --git a/www/index.php b/www/index.php
index 76ef3c7126fbcb09602c13e1f2ac67fa38408629..a5b27aa876b4b690d5a37df8d239f4305159c320 100644
--- a/www/index.php
+++ b/www/index.php
@@ -7,78 +7,78 @@ if (file_exists(__DIR__ . '/../config.inc.php')) {
 
 require_once $config_file;
 
+use UNL\Templates\Templates;
+
 function renderTemplate($file, $params = array())
 {
+    ob_start();
     extract($params);
     include $file;
+    return ob_get_clean();
 }
 
 function loadDefaultSections($page)
 {
     $page->titlegraphic = 'UNL Search';
-    $page->breadcrumbs   = str_replace('Department', 'Search', $page->breadcrumbs);
-    $page->navlinks      = file_get_contents('http://www.unl.edu/ucomm/sharedcode/navigation.html');
-    $page->leftcollinks  = file_get_contents('http://www.unl.edu/ucomm/sharedcode/relatedLinks.html');
-    $page->contactinfo   = preg_replace('#<h3>.*</h3>#', '', file_get_contents('http://www.unl.edu/ucomm/sharedcode/footerContactInfo.html'));
-    $page->footercontent = file_get_contents('http://www.unl.edu/ucomm/sharedcode/footer.html');
+    $page->breadcrumbs = str_replace('Department', 'Search', $page->breadcrumbs);
+    $page->navlinks = file_get_contents('http://www.unl.edu/ucomm/sharedcode/navigation.html');
+    $page->contactinfo = renderTemplate('templates/local-footer.tpl.php');
+    $page->affiliation = '';
 }
 
 $isEmbed = isset($_GET['embed']) && $_GET['embed'];
 
-UNL_Templates::setCachingService(new UNL_Templates_CachingService_Null());
-UNL_Templates::$options['version'] = 4.0;
-
+$localScriptUrl = './js/search.min.js';
+$pageTemplate = 'Fixed';
 
 if (UNL_Search::$mode === 'debug') {
-    $page = UNL_Templates::factory('Local');
-    $page->addScript('js/search.js');
-} else {
-    $page = UNL_Templates::factory('Fixed');
-    $page->addScript('js/search.min.js');
+    $pageTemplate = 'Local';
+    $localScriptUrl = './js/search.js';
 }
 
+$page = Templates::factory($pageTemplate, Templates::VERSION_4_1);
+
 if (!$isEmbed) {
+    if (file_exists(__DIR__ . '/wdn/templates_4.1')) {
+        $page->setLocalIncludePath(__DIR__);
+    }
+
     $page->doctitle = '<title>Search | University of Nebraska&ndash;Lincoln</title>';
+    $page->head = '<link rel="home" href="./" />';
     $page->pagetitle = '';
-    ob_start();
-    renderTemplate('templates/breadcrumbs.tpl.php');
-    $page->breadcrumbs = ob_get_clean();
+    $page->breadcrumbs = renderTemplate('templates/breadcrumbs.tpl.php');
 }
 
-$local_results = '';
-$inlineJS = '';
-$apiKey = UNL_Search::getJSAPIKey();
-$params = array(
-    'autoload' => json_encode(array('modules' => array(
-        array(
-            'name' => 'search',
-            'version' => '1.0',
-            'callback' => 'searchInit',
-            'style' => '//www.google.com/cse/style/look/v2/default.css'
-        ),
-    ))),
-);
-if (!empty($apiKey)) {
-    $params['key'] = $apiKey;
-}
-$page->addScript(htmlspecialchars('//www.google.com/jsapi?' . http_build_query($params)));
+$localResults = '';
+$context = '';
+
 $page->addStyleSheet('css/search.css');
 
 //u is referring site
-if (isset($_GET['u']) && $scanned = UNL_Search::getScannedPage($_GET['u'])) { 
+if (isset($_GET['u']) && $scanned = UNL_Search::getScannedPage($_GET['u'])) {
     // Add local site search results
     // we're scrapping the navigation and other content from the originatting site.
     if (!$isEmbed) {
-        if (isset($scanned->titlegraphic)) { 
-            require_once 'HTMLPurifier.auto.php';
+        if (isset($scanned->titlegraphic)) {
+            //require_once 'HTMLPurifier.auto.php';
             $config = HTMLPurifier_Config::createDefault();
             $config->set('Cache.SerializerPath', '/tmp');
+            
+            //Trick the purifier into accepting HTML5 elements/attributes
+            $config->set('HTML.DefinitionID', 'html5-definitions'); // unqiue id
+            $config->set('HTML.DefinitionRev', 1);
+            if ($def = $config->maybeGetRawHTMLDefinition()) {
+                //Allow everything to have a role
+                $def->addAttribute('*', 'role', 'Text');
+            }
+            
             $purifier = new HTMLPurifier($config);
-    
+
             $page->head        .= '<link rel="home" href="'.htmlentities($_GET['u'], ENT_QUOTES).'" />';
             $page->titlegraphic = $purifier->purify(str_replace(array('<h1>', '</h1>'), '', $scanned->titlegraphic));
-            
-            foreach (array('breadcrumbs', 'navlinks', 'leftcollinks', 'contactinfo', 'footercontent') as $region) {
+            $page->affiliation = '';
+
+            foreach (array('breadcrumbs', 'navlinks', 'leftcollinks', 'contactinfo', 'affiliation') as $region) {
                 if (isset($scanned->{$region}) && !empty($scanned->{$region})) {
                     $scannedContent = $scanned->{$region};
                     switch ($region) {
@@ -90,7 +90,7 @@ if (isset($_GET['u']) && $scanned = UNL_Search::getScannedPage($_GET['u'])) {
                             $scannedContent = preg_replace('#<h3>.*</h3>#', '', $scannedContent);
                             break;
                     }
-                    
+
                     $page->{$region} = $purifier->purify($scannedContent);
                 }
             }
@@ -106,51 +106,66 @@ if (isset($_GET['u']) && $scanned = UNL_Search::getScannedPage($_GET['u'])) {
         // Auto-build a custom search engine
         $context = array('crefUrl' => UNL_Search::getLinkedCSEUrl($_GET['u']));
     }
-    $context = json_encode($context);
-    $inlineJS .= "var LOCAL_SEARCH_CONTEXT = {$context};\n";
-    
-    ob_start();
-    renderTemplate('templates/google-results.tpl.php', array(
+
+    $localResults = renderTemplate('templates/google-results.tpl.php', array(
         'title' => $page->titlegraphic,
         'id' => 'local_results',
     ));
-    $local_results = ob_get_clean();
 } elseif (!$isEmbed) {
     // Default search for no referring site.
     loadDefaultSections($page);
 }
 
-if (isset($_GET['q'])) {
-    $q = json_encode($_GET['q']);
-    $inlineJS .= "var INITIAL_QUERY = {$q};\n";
-}
-
-$page->addScriptDeclaration($inlineJS);
-
-ob_start();
 
+$maincontent = '';
 if (!$isEmbed) {
-    renderTemplate('templates/search-form.tpl.php', array('local_results' => $local_results));
+    $maincontent .= renderTemplate('templates/search-form.tpl.php', array('local_results' => $localResults));
 }
 
-renderTemplate('templates/search-results.tpl.php', array(
+$maincontent .= renderTemplate('templates/search-results.tpl.php', array(
     'isEmbed' => $isEmbed,
-    'local_results' => $local_results
+    'local_results' => $localResults
 ));
 
-$maincontent = ob_get_clean();
+$initialQuery = json_encode(isset($_GET['q']) ? $_GET['q'] : '');
+$context = json_encode($context);
+
+$apiKey = UNL_Search::getJSAPIKey();
+$params = array(
+    'autoload' => json_encode(array('modules' => array(
+        array(
+            'name' => 'search',
+            'version' => '1.0',
+            'callback' => 'searchInit',
+            'style' => '//www.google.com/cse/style/look/v2/default.css'
+        ),
+    ))),
+);
+
+if (!empty($apiKey)) {
+    $params['key'] = $apiKey;
+}
+
+$maincontent .= renderTemplate('templates/end-scripts.tpl.php', array(
+    'localScriptUrl' => $localScriptUrl,
+    'googleLoaderUrl' => 'https://www.google.com/jsapi?' . http_build_query($params),
+    'initialQuery' => $initialQuery,
+    'localContext' => $context,
+));
 
 if (!$isEmbed) {
     $page->maincontentarea = $maincontent;
     echo $page;
-} else {
-    if (UNL_Search::$mode === 'debug') {
-        $template = 'templates/embed-debug.tpl.php';
-    } else {
-        $template = 'templates/embed.tpl.php';
-    }
-    renderTemplate($template, array(
-        'head' => $page->head,
-        'maincontent' => $maincontent
-    ));
+    exit;
 }
+
+$template = 'templates/embed.tpl.php';
+
+if (UNL_Search::$mode === 'debug') {
+    $template = 'templates/embed-debug.tpl.php';
+}
+
+echo renderTemplate($template, array(
+    'head' => $page->head,
+    'maincontent' => $maincontent
+));
diff --git a/www/js/.gitignore b/www/js/.gitignore
index 723285d21cb7c83217487c4e91e17e3241aa0146..b358685fc6476c39497b7b5ef85a63616c28ad5f 100644
--- a/www/js/.gitignore
+++ b/www/js/.gitignore
@@ -1,2 +1,3 @@
-/search.js.map
+/*.map
 /search.min.js
+/embed
diff --git a/www/js/embed-src/analytics.js b/www/js/embed-src/analytics.js
new file mode 100644
index 0000000000000000000000000000000000000000..c323d26b3f8d699f9d627e6df8159c5dfdd2def5
--- /dev/null
+++ b/www/js/embed-src/analytics.js
@@ -0,0 +1,135 @@
+/* global define: false */
+define(['jquery'], function($) {
+	"use strict";
+	var wdnProp = 'UA-3203435-1';
+	var unlDomain = '.unl.edu';
+	var Plugin;
+	var thisURL = String(window.location);
+
+	var gaWdnName = 'wdn';
+	var gaWdn = gaWdnName + '.';
+
+	// ga.js method for getting default tracker (with set account)
+	var getDefaultGATracker = function() {
+		var tracker = _gat._getTrackerByName();
+		if (tracker._getAccount() !== 'UA-XXXXX-X') {
+			return tracker;
+		}
+
+		return undefined;
+	};
+
+	// analytics.js method for getting default tracker
+	var getDefaultAnalyticsTracker = function() {
+		return ga.getByName('t0');
+	};
+
+	Plugin = {
+		initialize : function() {
+			ga('create', wdnProp, {
+				name: gaWdnName,
+				cookieDomain: unlDomain,
+				allowLinker: true
+			});
+			Plugin.callTrackPageview();
+		},
+
+		callTrackPageview: function(thePage, trackInWDNAccount){
+			var action = 'pageview', method = 'send', legacyMethod = '_trackPageview';
+
+			if (!thePage) {
+				ga(gaWdn+method, action);
+				return;
+			}
+
+			if (trackInWDNAccount !== false) {
+				trackInWDNAccount = true;
+			}
+
+			// First, track in the wdn analytics
+			if (trackInWDNAccount) {
+				ga(gaWdn+method, action, thePage);
+			}
+
+			// Second, track in local site analytics
+			try {
+				_gaq.push(function() {
+					var tracker = getDefaultGATracker();
+					if (tracker) {
+						tracker[legacyMethod](thePage);
+					}
+				});
+
+				ga(function() {
+					var tracker = getDefaultAnalyticsTracker();
+					if (tracker) {
+						tracker[method](action, thePage);
+					}
+				});
+			} catch(e) {}
+		},
+
+		callTrackEvent: function(category, evtaction, label, value, noninteraction) {
+			var action = 'event', method = 'send', legacyMethod = '_trackEvent', evtOpt;
+
+			if (noninteraction !== true) {
+				noninteraction = false;
+			}
+
+			evtOpt = {
+				eventCategory: category,
+				eventAction: evtaction,
+				eventLabel: label,
+				eventValue: value,
+				nonInteraction: noninteraction
+			};
+
+			ga(gaWdn+method, action, evtOpt);
+
+			try {
+				_gaq.push(function() {
+					var tracker = getDefaultGATracker(), legacyValue = value;
+					if (tracker) {
+						if (typeof value !== "undefined") {
+							legacyValue = Math.floor(value);
+						}
+
+						tracker[legacyMethod](category, evtaction, label, legacyValue, noninteraction);
+					}
+				});
+
+				ga(function() {
+					var tracker = getDefaultAnalyticsTracker();
+					if (tracker) {
+						tracker[method](action, evtOpt);
+					}
+				});
+			} catch(e) {}
+		},
+
+		callTrackTiming: function(category, variable, value, label, sampleRate) {
+			var action = 'timing', method = 'send', legacyMethod = '_trackTiming';
+
+			ga(gaWdn+method, action, category, variable, value, label);
+
+			try {
+				_gaq.push(function() {
+					var tracker = getDefaultGATracker();
+					if (tracker) {
+						tracker[legacyMethod](category, variable, value, label, sampleRate);
+					}
+				});
+
+				ga(function() {
+					var tracker = getDefaultAnalyticsTracker();
+					if (tracker) {
+						tracker[method](action, category, variable, value, label);
+					}
+				});
+
+			} catch (e) {}
+		}
+	};
+
+	return Plugin;
+});
diff --git a/www/js/embed-src/ga.js b/www/js/embed-src/ga.js
new file mode 100644
index 0000000000000000000000000000000000000000..534a9df1fcf8373c68f173fcf3e086452fa9e7ad
--- /dev/null
+++ b/www/js/embed-src/ga.js
@@ -0,0 +1,14 @@
+// Google Analytics (ga.js) - legacy support
+var _gaq = _gaq || [];
+(function() {
+  var ga = document.createElement('script'); ga.async = true;
+  ga.src = 'https://ssl.google-analytics.com/ga.js';
+  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+})();
+
+// Google Analytics (analytics.js)
+(function(b,o,i,l,e,r){b.GoogleAnalyticsObject=l;b[l]||(b[l]=
+function(){(b[l].q=b[l].q||[]).push(arguments)});b[l].l=+new Date;
+e=o.createElement(i);r=o.getElementsByTagName(i)[0];
+e.src='https://www.google-analytics.com/analytics.js';
+r.parentNode.insertBefore(e,r)}(window,document,'script','ga'));
diff --git a/www/js/embed-src/jquery.js b/www/js/embed-src/jquery.js
new file mode 100644
index 0000000000000000000000000000000000000000..eed17778c688271208406367c0c1681d81feca6f
--- /dev/null
+++ b/www/js/embed-src/jquery.js
@@ -0,0 +1,9210 @@
+/*!
+ * jQuery JavaScript Library v2.1.4
+ * http://jquery.com/
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ *
+ * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2015-04-28T16:01Z
+ */
+
+(function( global, factory ) {
+
+	if ( typeof module === "object" && typeof module.exports === "object" ) {
+		// For CommonJS and CommonJS-like environments where a proper `window`
+		// is present, execute the factory and get jQuery.
+		// For environments that do not have a `window` with a `document`
+		// (such as Node.js), expose a factory as module.exports.
+		// This accentuates the need for the creation of a real `window`.
+		// e.g. var jQuery = require("jquery")(window);
+		// See ticket #14549 for more info.
+		module.exports = global.document ?
+			factory( global, true ) :
+			function( w ) {
+				if ( !w.document ) {
+					throw new Error( "jQuery requires a window with a document" );
+				}
+				return factory( w );
+			};
+	} else {
+		factory( global );
+	}
+
+// Pass this if window is not defined yet
+}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
+
+// Support: Firefox 18+
+// Can't be in strict mode, several libs including ASP.NET trace
+// the stack via arguments.caller.callee and Firefox dies if
+// you try to trace through "use strict" call chains. (#13335)
+//
+
+var arr = [];
+
+var slice = arr.slice;
+
+var concat = arr.concat;
+
+var push = arr.push;
+
+var indexOf = arr.indexOf;
+
+var class2type = {};
+
+var toString = class2type.toString;
+
+var hasOwn = class2type.hasOwnProperty;
+
+var support = {};
+
+
+
+var
+	// Use the correct document accordingly with window argument (sandbox)
+	document = window.document,
+
+	version = "2.1.4",
+
+	// Define a local copy of jQuery
+	jQuery = function( selector, context ) {
+		// The jQuery object is actually just the init constructor 'enhanced'
+		// Need init if jQuery is called (just allow error to be thrown if not included)
+		return new jQuery.fn.init( selector, context );
+	},
+
+	// Support: Android<4.1
+	// Make sure we trim BOM and NBSP
+	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
+
+	// Matches dashed string for camelizing
+	rmsPrefix = /^-ms-/,
+	rdashAlpha = /-([\da-z])/gi,
+
+	// Used by jQuery.camelCase as callback to replace()
+	fcamelCase = function( all, letter ) {
+		return letter.toUpperCase();
+	};
+
+jQuery.fn = jQuery.prototype = {
+	// The current version of jQuery being used
+	jquery: version,
+
+	constructor: jQuery,
+
+	// Start with an empty selector
+	selector: "",
+
+	// The default length of a jQuery object is 0
+	length: 0,
+
+	toArray: function() {
+		return slice.call( this );
+	},
+
+	// Get the Nth element in the matched element set OR
+	// Get the whole matched element set as a clean array
+	get: function( num ) {
+		return num != null ?
+
+			// Return just the one element from the set
+			( num < 0 ? this[ num + this.length ] : this[ num ] ) :
+
+			// Return all the elements in a clean array
+			slice.call( this );
+	},
+
+	// Take an array of elements and push it onto the stack
+	// (returning the new matched element set)
+	pushStack: function( elems ) {
+
+		// Build a new jQuery matched element set
+		var ret = jQuery.merge( this.constructor(), elems );
+
+		// Add the old object onto the stack (as a reference)
+		ret.prevObject = this;
+		ret.context = this.context;
+
+		// Return the newly-formed element set
+		return ret;
+	},
+
+	// Execute a callback for every element in the matched set.
+	// (You can seed the arguments with an array of args, but this is
+	// only used internally.)
+	each: function( callback, args ) {
+		return jQuery.each( this, callback, args );
+	},
+
+	map: function( callback ) {
+		return this.pushStack( jQuery.map(this, function( elem, i ) {
+			return callback.call( elem, i, elem );
+		}));
+	},
+
+	slice: function() {
+		return this.pushStack( slice.apply( this, arguments ) );
+	},
+
+	first: function() {
+		return this.eq( 0 );
+	},
+
+	last: function() {
+		return this.eq( -1 );
+	},
+
+	eq: function( i ) {
+		var len = this.length,
+			j = +i + ( i < 0 ? len : 0 );
+		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
+	},
+
+	end: function() {
+		return this.prevObject || this.constructor(null);
+	},
+
+	// For internal use only.
+	// Behaves like an Array's method, not like a jQuery method.
+	push: push,
+	sort: arr.sort,
+	splice: arr.splice
+};
+
+jQuery.extend = jQuery.fn.extend = function() {
+	var options, name, src, copy, copyIsArray, clone,
+		target = arguments[0] || {},
+		i = 1,
+		length = arguments.length,
+		deep = false;
+
+	// Handle a deep copy situation
+	if ( typeof target === "boolean" ) {
+		deep = target;
+
+		// Skip the boolean and the target
+		target = arguments[ i ] || {};
+		i++;
+	}
+
+	// Handle case when target is a string or something (possible in deep copy)
+	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+		target = {};
+	}
+
+	// Extend jQuery itself if only one argument is passed
+	if ( i === length ) {
+		target = this;
+		i--;
+	}
+
+	for ( ; i < length; i++ ) {
+		// Only deal with non-null/undefined values
+		if ( (options = arguments[ i ]) != null ) {
+			// Extend the base object
+			for ( name in options ) {
+				src = target[ name ];
+				copy = options[ name ];
+
+				// Prevent never-ending loop
+				if ( target === copy ) {
+					continue;
+				}
+
+				// Recurse if we're merging plain objects or arrays
+				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+					if ( copyIsArray ) {
+						copyIsArray = false;
+						clone = src && jQuery.isArray(src) ? src : [];
+
+					} else {
+						clone = src && jQuery.isPlainObject(src) ? src : {};
+					}
+
+					// Never move original objects, clone them
+					target[ name ] = jQuery.extend( deep, clone, copy );
+
+				// Don't bring in undefined values
+				} else if ( copy !== undefined ) {
+					target[ name ] = copy;
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
+
+jQuery.extend({
+	// Unique for each copy of jQuery on the page
+	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
+
+	// Assume jQuery is ready without the ready module
+	isReady: true,
+
+	error: function( msg ) {
+		throw new Error( msg );
+	},
+
+	noop: function() {},
+
+	isFunction: function( obj ) {
+		return jQuery.type(obj) === "function";
+	},
+
+	isArray: Array.isArray,
+
+	isWindow: function( obj ) {
+		return obj != null && obj === obj.window;
+	},
+
+	isNumeric: function( obj ) {
+		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
+		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
+		// subtraction forces infinities to NaN
+		// adding 1 corrects loss of precision from parseFloat (#15100)
+		return !jQuery.isArray( obj ) && (obj - parseFloat( obj ) + 1) >= 0;
+	},
+
+	isPlainObject: function( obj ) {
+		// Not plain objects:
+		// - Any object or value whose internal [[Class]] property is not "[object Object]"
+		// - DOM nodes
+		// - window
+		if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+			return false;
+		}
+
+		if ( obj.constructor &&
+				!hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) {
+			return false;
+		}
+
+		// If the function hasn't returned already, we're confident that
+		// |obj| is a plain object, created by {} or constructed with new Object
+		return true;
+	},
+
+	isEmptyObject: function( obj ) {
+		var name;
+		for ( name in obj ) {
+			return false;
+		}
+		return true;
+	},
+
+	type: function( obj ) {
+		if ( obj == null ) {
+			return obj + "";
+		}
+		// Support: Android<4.0, iOS<6 (functionish RegExp)
+		return typeof obj === "object" || typeof obj === "function" ?
+			class2type[ toString.call(obj) ] || "object" :
+			typeof obj;
+	},
+
+	// Evaluates a script in a global context
+	globalEval: function( code ) {
+		var script,
+			indirect = eval;
+
+		code = jQuery.trim( code );
+
+		if ( code ) {
+			// If the code includes a valid, prologue position
+			// strict mode pragma, execute code by injecting a
+			// script tag into the document.
+			if ( code.indexOf("use strict") === 1 ) {
+				script = document.createElement("script");
+				script.text = code;
+				document.head.appendChild( script ).parentNode.removeChild( script );
+			} else {
+			// Otherwise, avoid the DOM node creation, insertion
+			// and removal by using an indirect global eval
+				indirect( code );
+			}
+		}
+	},
+
+	// Convert dashed to camelCase; used by the css and data modules
+	// Support: IE9-11+
+	// Microsoft forgot to hump their vendor prefix (#9572)
+	camelCase: function( string ) {
+		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+	},
+
+	nodeName: function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+	},
+
+	// args is for internal usage only
+	each: function( obj, callback, args ) {
+		var value,
+			i = 0,
+			length = obj.length,
+			isArray = isArraylike( obj );
+
+		if ( args ) {
+			if ( isArray ) {
+				for ( ; i < length; i++ ) {
+					value = callback.apply( obj[ i ], args );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( i in obj ) {
+					value = callback.apply( obj[ i ], args );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			}
+
+		// A special, fast, case for the most common use of each
+		} else {
+			if ( isArray ) {
+				for ( ; i < length; i++ ) {
+					value = callback.call( obj[ i ], i, obj[ i ] );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( i in obj ) {
+					value = callback.call( obj[ i ], i, obj[ i ] );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			}
+		}
+
+		return obj;
+	},
+
+	// Support: Android<4.1
+	trim: function( text ) {
+		return text == null ?
+			"" :
+			( text + "" ).replace( rtrim, "" );
+	},
+
+	// results is for internal usage only
+	makeArray: function( arr, results ) {
+		var ret = results || [];
+
+		if ( arr != null ) {
+			if ( isArraylike( Object(arr) ) ) {
+				jQuery.merge( ret,
+					typeof arr === "string" ?
+					[ arr ] : arr
+				);
+			} else {
+				push.call( ret, arr );
+			}
+		}
+
+		return ret;
+	},
+
+	inArray: function( elem, arr, i ) {
+		return arr == null ? -1 : indexOf.call( arr, elem, i );
+	},
+
+	merge: function( first, second ) {
+		var len = +second.length,
+			j = 0,
+			i = first.length;
+
+		for ( ; j < len; j++ ) {
+			first[ i++ ] = second[ j ];
+		}
+
+		first.length = i;
+
+		return first;
+	},
+
+	grep: function( elems, callback, invert ) {
+		var callbackInverse,
+			matches = [],
+			i = 0,
+			length = elems.length,
+			callbackExpect = !invert;
+
+		// Go through the array, only saving the items
+		// that pass the validator function
+		for ( ; i < length; i++ ) {
+			callbackInverse = !callback( elems[ i ], i );
+			if ( callbackInverse !== callbackExpect ) {
+				matches.push( elems[ i ] );
+			}
+		}
+
+		return matches;
+	},
+
+	// arg is for internal usage only
+	map: function( elems, callback, arg ) {
+		var value,
+			i = 0,
+			length = elems.length,
+			isArray = isArraylike( elems ),
+			ret = [];
+
+		// Go through the array, translating each of the items to their new values
+		if ( isArray ) {
+			for ( ; i < length; i++ ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret.push( value );
+				}
+			}
+
+		// Go through every key on the object,
+		} else {
+			for ( i in elems ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret.push( value );
+				}
+			}
+		}
+
+		// Flatten any nested arrays
+		return concat.apply( [], ret );
+	},
+
+	// A global GUID counter for objects
+	guid: 1,
+
+	// Bind a function to a context, optionally partially applying any
+	// arguments.
+	proxy: function( fn, context ) {
+		var tmp, args, proxy;
+
+		if ( typeof context === "string" ) {
+			tmp = fn[ context ];
+			context = fn;
+			fn = tmp;
+		}
+
+		// Quick check to determine if target is callable, in the spec
+		// this throws a TypeError, but we will just return undefined.
+		if ( !jQuery.isFunction( fn ) ) {
+			return undefined;
+		}
+
+		// Simulated bind
+		args = slice.call( arguments, 2 );
+		proxy = function() {
+			return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
+		};
+
+		// Set the guid of unique handler to the same of original handler, so it can be removed
+		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
+
+		return proxy;
+	},
+
+	now: Date.now,
+
+	// jQuery.support is not used in Core but other projects attach their
+	// properties to it so it needs to exist.
+	support: support
+});
+
+// Populate the class2type map
+jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
+	class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
+function isArraylike( obj ) {
+
+	// Support: iOS 8.2 (not reproducible in simulator)
+	// `in` check used to prevent JIT error (gh-2145)
+	// hasOwn isn't used here due to false negatives
+	// regarding Nodelist length in IE
+	var length = "length" in obj && obj.length,
+		type = jQuery.type( obj );
+
+	if ( type === "function" || jQuery.isWindow( obj ) ) {
+		return false;
+	}
+
+	if ( obj.nodeType === 1 && length ) {
+		return true;
+	}
+
+	return type === "array" || length === 0 ||
+		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
+}
+var Sizzle =
+/*!
+ * Sizzle CSS Selector Engine v2.2.0-pre
+ * http://sizzlejs.com/
+ *
+ * Copyright 2008, 2014 jQuery Foundation, Inc. and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2014-12-16
+ */
+(function( window ) {
+
+var i,
+	support,
+	Expr,
+	getText,
+	isXML,
+	tokenize,
+	compile,
+	select,
+	outermostContext,
+	sortInput,
+	hasDuplicate,
+
+	// Local document vars
+	setDocument,
+	document,
+	docElem,
+	documentIsHTML,
+	rbuggyQSA,
+	rbuggyMatches,
+	matches,
+	contains,
+
+	// Instance-specific data
+	expando = "sizzle" + 1 * new Date(),
+	preferredDoc = window.document,
+	dirruns = 0,
+	done = 0,
+	classCache = createCache(),
+	tokenCache = createCache(),
+	compilerCache = createCache(),
+	sortOrder = function( a, b ) {
+		if ( a === b ) {
+			hasDuplicate = true;
+		}
+		return 0;
+	},
+
+	// General-purpose constants
+	MAX_NEGATIVE = 1 << 31,
+
+	// Instance methods
+	hasOwn = ({}).hasOwnProperty,
+	arr = [],
+	pop = arr.pop,
+	push_native = arr.push,
+	push = arr.push,
+	slice = arr.slice,
+	// Use a stripped-down indexOf as it's faster than native
+	// http://jsperf.com/thor-indexof-vs-for/5
+	indexOf = function( list, elem ) {
+		var i = 0,
+			len = list.length;
+		for ( ; i < len; i++ ) {
+			if ( list[i] === elem ) {
+				return i;
+			}
+		}
+		return -1;
+	},
+
+	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
+
+	// Regular expressions
+
+	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
+	whitespace = "[\\x20\\t\\r\\n\\f]",
+	// http://www.w3.org/TR/css3-syntax/#characters
+	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
+
+	// Loosely modeled on CSS identifier characters
+	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
+	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
+	identifier = characterEncoding.replace( "w", "w#" ),
+
+	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
+	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")(?:" + whitespace +
+		// Operator (capture 2)
+		"*([*^$|!~]?=)" + whitespace +
+		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
+		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
+		"*\\]",
+
+	pseudos = ":(" + characterEncoding + ")(?:\\((" +
+		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
+		// 1. quoted (capture 3; capture 4 or capture 5)
+		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
+		// 2. simple (capture 6)
+		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
+		// 3. anything else (capture 2)
+		".*" +
+		")\\)|)",
+
+	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
+	rwhitespace = new RegExp( whitespace + "+", "g" ),
+	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
+
+	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
+	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
+
+	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
+
+	rpseudo = new RegExp( pseudos ),
+	ridentifier = new RegExp( "^" + identifier + "$" ),
+
+	matchExpr = {
+		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
+		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
+		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
+		"ATTR": new RegExp( "^" + attributes ),
+		"PSEUDO": new RegExp( "^" + pseudos ),
+		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
+			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
+			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
+		// For use in libraries implementing .is()
+		// We use this for POS matching in `select`
+		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
+			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
+	},
+
+	rinputs = /^(?:input|select|textarea|button)$/i,
+	rheader = /^h\d$/i,
+
+	rnative = /^[^{]+\{\s*\[native \w/,
+
+	// Easily-parseable/retrievable ID or TAG or CLASS selectors
+	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
+
+	rsibling = /[+~]/,
+	rescape = /'|\\/g,
+
+	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
+	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
+	funescape = function( _, escaped, escapedWhitespace ) {
+		var high = "0x" + escaped - 0x10000;
+		// NaN means non-codepoint
+		// Support: Firefox<24
+		// Workaround erroneous numeric interpretation of +"0x"
+		return high !== high || escapedWhitespace ?
+			escaped :
+			high < 0 ?
+				// BMP codepoint
+				String.fromCharCode( high + 0x10000 ) :
+				// Supplemental Plane codepoint (surrogate pair)
+				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
+	},
+
+	// Used for iframes
+	// See setDocument()
+	// Removing the function wrapper causes a "Permission Denied"
+	// error in IE
+	unloadHandler = function() {
+		setDocument();
+	};
+
+// Optimize for push.apply( _, NodeList )
+try {
+	push.apply(
+		(arr = slice.call( preferredDoc.childNodes )),
+		preferredDoc.childNodes
+	);
+	// Support: Android<4.0
+	// Detect silently failing push.apply
+	arr[ preferredDoc.childNodes.length ].nodeType;
+} catch ( e ) {
+	push = { apply: arr.length ?
+
+		// Leverage slice if possible
+		function( target, els ) {
+			push_native.apply( target, slice.call(els) );
+		} :
+
+		// Support: IE<9
+		// Otherwise append directly
+		function( target, els ) {
+			var j = target.length,
+				i = 0;
+			// Can't trust NodeList.length
+			while ( (target[j++] = els[i++]) ) {}
+			target.length = j - 1;
+		}
+	};
+}
+
+function Sizzle( selector, context, results, seed ) {
+	var match, elem, m, nodeType,
+		// QSA vars
+		i, groups, old, nid, newContext, newSelector;
+
+	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
+		setDocument( context );
+	}
+
+	context = context || document;
+	results = results || [];
+	nodeType = context.nodeType;
+
+	if ( typeof selector !== "string" || !selector ||
+		nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
+
+		return results;
+	}
+
+	if ( !seed && documentIsHTML ) {
+
+		// Try to shortcut find operations when possible (e.g., not under DocumentFragment)
+		if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
+			// Speed-up: Sizzle("#ID")
+			if ( (m = match[1]) ) {
+				if ( nodeType === 9 ) {
+					elem = context.getElementById( m );
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document (jQuery #6963)
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE, Opera, and Webkit return items
+						// by name instead of ID
+						if ( elem.id === m ) {
+							results.push( elem );
+							return results;
+						}
+					} else {
+						return results;
+					}
+				} else {
+					// Context is not a document
+					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
+						contains( context, elem ) && elem.id === m ) {
+						results.push( elem );
+						return results;
+					}
+				}
+
+			// Speed-up: Sizzle("TAG")
+			} else if ( match[2] ) {
+				push.apply( results, context.getElementsByTagName( selector ) );
+				return results;
+
+			// Speed-up: Sizzle(".CLASS")
+			} else if ( (m = match[3]) && support.getElementsByClassName ) {
+				push.apply( results, context.getElementsByClassName( m ) );
+				return results;
+			}
+		}
+
+		// QSA path
+		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
+			nid = old = expando;
+			newContext = context;
+			newSelector = nodeType !== 1 && selector;
+
+			// qSA works strangely on Element-rooted queries
+			// We can work around this by specifying an extra ID on the root
+			// and working up from there (Thanks to Andrew Dupont for the technique)
+			// IE 8 doesn't work on object elements
+			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
+				groups = tokenize( selector );
+
+				if ( (old = context.getAttribute("id")) ) {
+					nid = old.replace( rescape, "\\$&" );
+				} else {
+					context.setAttribute( "id", nid );
+				}
+				nid = "[id='" + nid + "'] ";
+
+				i = groups.length;
+				while ( i-- ) {
+					groups[i] = nid + toSelector( groups[i] );
+				}
+				newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context;
+				newSelector = groups.join(",");
+			}
+
+			if ( newSelector ) {
+				try {
+					push.apply( results,
+						newContext.querySelectorAll( newSelector )
+					);
+					return results;
+				} catch(qsaError) {
+				} finally {
+					if ( !old ) {
+						context.removeAttribute("id");
+					}
+				}
+			}
+		}
+	}
+
+	// All others
+	return select( selector.replace( rtrim, "$1" ), context, results, seed );
+}
+
+/**
+ * Create key-value caches of limited size
+ * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
+ *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
+ *	deleting the oldest entry
+ */
+function createCache() {
+	var keys = [];
+
+	function cache( key, value ) {
+		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
+		if ( keys.push( key + " " ) > Expr.cacheLength ) {
+			// Only keep the most recent entries
+			delete cache[ keys.shift() ];
+		}
+		return (cache[ key + " " ] = value);
+	}
+	return cache;
+}
+
+/**
+ * Mark a function for special use by Sizzle
+ * @param {Function} fn The function to mark
+ */
+function markFunction( fn ) {
+	fn[ expando ] = true;
+	return fn;
+}
+
+/**
+ * Support testing using an element
+ * @param {Function} fn Passed the created div and expects a boolean result
+ */
+function assert( fn ) {
+	var div = document.createElement("div");
+
+	try {
+		return !!fn( div );
+	} catch (e) {
+		return false;
+	} finally {
+		// Remove from its parent by default
+		if ( div.parentNode ) {
+			div.parentNode.removeChild( div );
+		}
+		// release memory in IE
+		div = null;
+	}
+}
+
+/**
+ * Adds the same handler for all of the specified attrs
+ * @param {String} attrs Pipe-separated list of attributes
+ * @param {Function} handler The method that will be applied
+ */
+function addHandle( attrs, handler ) {
+	var arr = attrs.split("|"),
+		i = attrs.length;
+
+	while ( i-- ) {
+		Expr.attrHandle[ arr[i] ] = handler;
+	}
+}
+
+/**
+ * Checks document order of two siblings
+ * @param {Element} a
+ * @param {Element} b
+ * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
+ */
+function siblingCheck( a, b ) {
+	var cur = b && a,
+		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
+			( ~b.sourceIndex || MAX_NEGATIVE ) -
+			( ~a.sourceIndex || MAX_NEGATIVE );
+
+	// Use IE sourceIndex if available on both nodes
+	if ( diff ) {
+		return diff;
+	}
+
+	// Check if b follows a
+	if ( cur ) {
+		while ( (cur = cur.nextSibling) ) {
+			if ( cur === b ) {
+				return -1;
+			}
+		}
+	}
+
+	return a ? 1 : -1;
+}
+
+/**
+ * Returns a function to use in pseudos for input types
+ * @param {String} type
+ */
+function createInputPseudo( type ) {
+	return function( elem ) {
+		var name = elem.nodeName.toLowerCase();
+		return name === "input" && elem.type === type;
+	};
+}
+
+/**
+ * Returns a function to use in pseudos for buttons
+ * @param {String} type
+ */
+function createButtonPseudo( type ) {
+	return function( elem ) {
+		var name = elem.nodeName.toLowerCase();
+		return (name === "input" || name === "button") && elem.type === type;
+	};
+}
+
+/**
+ * Returns a function to use in pseudos for positionals
+ * @param {Function} fn
+ */
+function createPositionalPseudo( fn ) {
+	return markFunction(function( argument ) {
+		argument = +argument;
+		return markFunction(function( seed, matches ) {
+			var j,
+				matchIndexes = fn( [], seed.length, argument ),
+				i = matchIndexes.length;
+
+			// Match elements found at the specified indexes
+			while ( i-- ) {
+				if ( seed[ (j = matchIndexes[i]) ] ) {
+					seed[j] = !(matches[j] = seed[j]);
+				}
+			}
+		});
+	});
+}
+
+/**
+ * Checks a node for validity as a Sizzle context
+ * @param {Element|Object=} context
+ * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
+ */
+function testContext( context ) {
+	return context && typeof context.getElementsByTagName !== "undefined" && context;
+}
+
+// Expose support vars for convenience
+support = Sizzle.support = {};
+
+/**
+ * Detects XML nodes
+ * @param {Element|Object} elem An element or a document
+ * @returns {Boolean} True iff elem is a non-HTML XML node
+ */
+isXML = Sizzle.isXML = function( elem ) {
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833)
+	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+/**
+ * Sets document-related variables once based on the current document
+ * @param {Element|Object} [doc] An element or document object to use to set the document
+ * @returns {Object} Returns the current document
+ */
+setDocument = Sizzle.setDocument = function( node ) {
+	var hasCompare, parent,
+		doc = node ? node.ownerDocument || node : preferredDoc;
+
+	// If no document and documentElement is available, return
+	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
+		return document;
+	}
+
+	// Set our document
+	document = doc;
+	docElem = doc.documentElement;
+	parent = doc.defaultView;
+
+	// Support: IE>8
+	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
+	// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
+	// IE6-8 do not support the defaultView property so parent will be undefined
+	if ( parent && parent !== parent.top ) {
+		// IE11 does not have attachEvent, so all must suffer
+		if ( parent.addEventListener ) {
+			parent.addEventListener( "unload", unloadHandler, false );
+		} else if ( parent.attachEvent ) {
+			parent.attachEvent( "onunload", unloadHandler );
+		}
+	}
+
+	/* Support tests
+	---------------------------------------------------------------------- */
+	documentIsHTML = !isXML( doc );
+
+	/* Attributes
+	---------------------------------------------------------------------- */
+
+	// Support: IE<8
+	// Verify that getAttribute really returns attributes and not properties
+	// (excepting IE8 booleans)
+	support.attributes = assert(function( div ) {
+		div.className = "i";
+		return !div.getAttribute("className");
+	});
+
+	/* getElement(s)By*
+	---------------------------------------------------------------------- */
+
+	// Check if getElementsByTagName("*") returns only elements
+	support.getElementsByTagName = assert(function( div ) {
+		div.appendChild( doc.createComment("") );
+		return !div.getElementsByTagName("*").length;
+	});
+
+	// Support: IE<9
+	support.getElementsByClassName = rnative.test( doc.getElementsByClassName );
+
+	// Support: IE<10
+	// Check if getElementById returns elements by name
+	// The broken getElementById methods don't pick up programatically-set names,
+	// so use a roundabout getElementsByName test
+	support.getById = assert(function( div ) {
+		docElem.appendChild( div ).id = expando;
+		return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
+	});
+
+	// ID find and filter
+	if ( support.getById ) {
+		Expr.find["ID"] = function( id, context ) {
+			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
+				var m = context.getElementById( id );
+				// Check parentNode to catch when Blackberry 4.6 returns
+				// nodes that are no longer in the document #6963
+				return m && m.parentNode ? [ m ] : [];
+			}
+		};
+		Expr.filter["ID"] = function( id ) {
+			var attrId = id.replace( runescape, funescape );
+			return function( elem ) {
+				return elem.getAttribute("id") === attrId;
+			};
+		};
+	} else {
+		// Support: IE6/7
+		// getElementById is not reliable as a find shortcut
+		delete Expr.find["ID"];
+
+		Expr.filter["ID"] =  function( id ) {
+			var attrId = id.replace( runescape, funescape );
+			return function( elem ) {
+				var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+				return node && node.value === attrId;
+			};
+		};
+	}
+
+	// Tag
+	Expr.find["TAG"] = support.getElementsByTagName ?
+		function( tag, context ) {
+			if ( typeof context.getElementsByTagName !== "undefined" ) {
+				return context.getElementsByTagName( tag );
+
+			// DocumentFragment nodes don't have gEBTN
+			} else if ( support.qsa ) {
+				return context.querySelectorAll( tag );
+			}
+		} :
+
+		function( tag, context ) {
+			var elem,
+				tmp = [],
+				i = 0,
+				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
+				results = context.getElementsByTagName( tag );
+
+			// Filter out possible comments
+			if ( tag === "*" ) {
+				while ( (elem = results[i++]) ) {
+					if ( elem.nodeType === 1 ) {
+						tmp.push( elem );
+					}
+				}
+
+				return tmp;
+			}
+			return results;
+		};
+
+	// Class
+	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
+		if ( documentIsHTML ) {
+			return context.getElementsByClassName( className );
+		}
+	};
+
+	/* QSA/matchesSelector
+	---------------------------------------------------------------------- */
+
+	// QSA and matchesSelector support
+
+	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
+	rbuggyMatches = [];
+
+	// qSa(:focus) reports false when true (Chrome 21)
+	// We allow this because of a bug in IE8/9 that throws an error
+	// whenever `document.activeElement` is accessed on an iframe
+	// So, we allow :focus to pass through QSA all the time to avoid the IE error
+	// See http://bugs.jquery.com/ticket/13378
+	rbuggyQSA = [];
+
+	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
+		// Build QSA regex
+		// Regex strategy adopted from Diego Perini
+		assert(function( div ) {
+			// Select is set to empty string on purpose
+			// This is to test IE's treatment of not explicitly
+			// setting a boolean content attribute,
+			// since its presence should be enough
+			// http://bugs.jquery.com/ticket/12359
+			docElem.appendChild( div ).innerHTML = "<a id='" + expando + "'></a>" +
+				"<select id='" + expando + "-\f]' msallowcapture=''>" +
+				"<option selected=''></option></select>";
+
+			// Support: IE8, Opera 11-12.16
+			// Nothing should be selected when empty strings follow ^= or $= or *=
+			// The test attribute must be unknown in Opera but "safe" for WinRT
+			// http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
+			if ( div.querySelectorAll("[msallowcapture^='']").length ) {
+				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
+			}
+
+			// Support: IE8
+			// Boolean attributes and "value" are not treated correctly
+			if ( !div.querySelectorAll("[selected]").length ) {
+				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
+			}
+
+			// Support: Chrome<29, Android<4.2+, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.7+
+			if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
+				rbuggyQSA.push("~=");
+			}
+
+			// Webkit/Opera - :checked should return selected option elements
+			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			// IE8 throws error here and will not see later tests
+			if ( !div.querySelectorAll(":checked").length ) {
+				rbuggyQSA.push(":checked");
+			}
+
+			// Support: Safari 8+, iOS 8+
+			// https://bugs.webkit.org/show_bug.cgi?id=136851
+			// In-page `selector#id sibing-combinator selector` fails
+			if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) {
+				rbuggyQSA.push(".#.+[+~]");
+			}
+		});
+
+		assert(function( div ) {
+			// Support: Windows 8 Native Apps
+			// The type and name attributes are restricted during .innerHTML assignment
+			var input = doc.createElement("input");
+			input.setAttribute( "type", "hidden" );
+			div.appendChild( input ).setAttribute( "name", "D" );
+
+			// Support: IE8
+			// Enforce case-sensitivity of name attribute
+			if ( div.querySelectorAll("[name=d]").length ) {
+				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
+			}
+
+			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
+			// IE8 throws error here and will not see later tests
+			if ( !div.querySelectorAll(":enabled").length ) {
+				rbuggyQSA.push( ":enabled", ":disabled" );
+			}
+
+			// Opera 10-11 does not throw on post-comma invalid pseudos
+			div.querySelectorAll("*,:x");
+			rbuggyQSA.push(",.*:");
+		});
+	}
+
+	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
+		docElem.webkitMatchesSelector ||
+		docElem.mozMatchesSelector ||
+		docElem.oMatchesSelector ||
+		docElem.msMatchesSelector) )) ) {
+
+		assert(function( div ) {
+			// Check to see if it's possible to do matchesSelector
+			// on a disconnected node (IE 9)
+			support.disconnectedMatch = matches.call( div, "div" );
+
+			// This should fail with an exception
+			// Gecko does not error, returns false instead
+			matches.call( div, "[s!='']:x" );
+			rbuggyMatches.push( "!=", pseudos );
+		});
+	}
+
+	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
+	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
+
+	/* Contains
+	---------------------------------------------------------------------- */
+	hasCompare = rnative.test( docElem.compareDocumentPosition );
+
+	// Element contains another
+	// Purposefully does not implement inclusive descendent
+	// As in, an element does not contain itself
+	contains = hasCompare || rnative.test( docElem.contains ) ?
+		function( a, b ) {
+			var adown = a.nodeType === 9 ? a.documentElement : a,
+				bup = b && b.parentNode;
+			return a === bup || !!( bup && bup.nodeType === 1 && (
+				adown.contains ?
+					adown.contains( bup ) :
+					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
+			));
+		} :
+		function( a, b ) {
+			if ( b ) {
+				while ( (b = b.parentNode) ) {
+					if ( b === a ) {
+						return true;
+					}
+				}
+			}
+			return false;
+		};
+
+	/* Sorting
+	---------------------------------------------------------------------- */
+
+	// Document order sorting
+	sortOrder = hasCompare ?
+	function( a, b ) {
+
+		// Flag for duplicate removal
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		// Sort on method existence if only one input has compareDocumentPosition
+		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
+		if ( compare ) {
+			return compare;
+		}
+
+		// Calculate position if both inputs belong to the same document
+		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
+			a.compareDocumentPosition( b ) :
+
+			// Otherwise we know they are disconnected
+			1;
+
+		// Disconnected nodes
+		if ( compare & 1 ||
+			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
+
+			// Choose the first element that is related to our preferred document
+			if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
+				return -1;
+			}
+			if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
+				return 1;
+			}
+
+			// Maintain original order
+			return sortInput ?
+				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
+				0;
+		}
+
+		return compare & 4 ? -1 : 1;
+	} :
+	function( a, b ) {
+		// Exit early if the nodes are identical
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		var cur,
+			i = 0,
+			aup = a.parentNode,
+			bup = b.parentNode,
+			ap = [ a ],
+			bp = [ b ];
+
+		// Parentless nodes are either documents or disconnected
+		if ( !aup || !bup ) {
+			return a === doc ? -1 :
+				b === doc ? 1 :
+				aup ? -1 :
+				bup ? 1 :
+				sortInput ?
+				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
+				0;
+
+		// If the nodes are siblings, we can do a quick check
+		} else if ( aup === bup ) {
+			return siblingCheck( a, b );
+		}
+
+		// Otherwise we need full lists of their ancestors for comparison
+		cur = a;
+		while ( (cur = cur.parentNode) ) {
+			ap.unshift( cur );
+		}
+		cur = b;
+		while ( (cur = cur.parentNode) ) {
+			bp.unshift( cur );
+		}
+
+		// Walk down the tree looking for a discrepancy
+		while ( ap[i] === bp[i] ) {
+			i++;
+		}
+
+		return i ?
+			// Do a sibling check if the nodes have a common ancestor
+			siblingCheck( ap[i], bp[i] ) :
+
+			// Otherwise nodes in our document sort first
+			ap[i] === preferredDoc ? -1 :
+			bp[i] === preferredDoc ? 1 :
+			0;
+	};
+
+	return doc;
+};
+
+Sizzle.matches = function( expr, elements ) {
+	return Sizzle( expr, null, null, elements );
+};
+
+Sizzle.matchesSelector = function( elem, expr ) {
+	// Set document vars if needed
+	if ( ( elem.ownerDocument || elem ) !== document ) {
+		setDocument( elem );
+	}
+
+	// Make sure that attribute selectors are quoted
+	expr = expr.replace( rattributeQuotes, "='$1']" );
+
+	if ( support.matchesSelector && documentIsHTML &&
+		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
+		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
+
+		try {
+			var ret = matches.call( elem, expr );
+
+			// IE 9's matchesSelector returns false on disconnected nodes
+			if ( ret || support.disconnectedMatch ||
+					// As well, disconnected nodes are said to be in a document
+					// fragment in IE 9
+					elem.document && elem.document.nodeType !== 11 ) {
+				return ret;
+			}
+		} catch (e) {}
+	}
+
+	return Sizzle( expr, document, null, [ elem ] ).length > 0;
+};
+
+Sizzle.contains = function( context, elem ) {
+	// Set document vars if needed
+	if ( ( context.ownerDocument || context ) !== document ) {
+		setDocument( context );
+	}
+	return contains( context, elem );
+};
+
+Sizzle.attr = function( elem, name ) {
+	// Set document vars if needed
+	if ( ( elem.ownerDocument || elem ) !== document ) {
+		setDocument( elem );
+	}
+
+	var fn = Expr.attrHandle[ name.toLowerCase() ],
+		// Don't get fooled by Object.prototype properties (jQuery #13807)
+		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
+			fn( elem, name, !documentIsHTML ) :
+			undefined;
+
+	return val !== undefined ?
+		val :
+		support.attributes || !documentIsHTML ?
+			elem.getAttribute( name ) :
+			(val = elem.getAttributeNode(name)) && val.specified ?
+				val.value :
+				null;
+};
+
+Sizzle.error = function( msg ) {
+	throw new Error( "Syntax error, unrecognized expression: " + msg );
+};
+
+/**
+ * Document sorting and removing duplicates
+ * @param {ArrayLike} results
+ */
+Sizzle.uniqueSort = function( results ) {
+	var elem,
+		duplicates = [],
+		j = 0,
+		i = 0;
+
+	// Unless we *know* we can detect duplicates, assume their presence
+	hasDuplicate = !support.detectDuplicates;
+	sortInput = !support.sortStable && results.slice( 0 );
+	results.sort( sortOrder );
+
+	if ( hasDuplicate ) {
+		while ( (elem = results[i++]) ) {
+			if ( elem === results[ i ] ) {
+				j = duplicates.push( i );
+			}
+		}
+		while ( j-- ) {
+			results.splice( duplicates[ j ], 1 );
+		}
+	}
+
+	// Clear input after sorting to release objects
+	// See https://github.com/jquery/sizzle/pull/225
+	sortInput = null;
+
+	return results;
+};
+
+/**
+ * Utility function for retrieving the text value of an array of DOM nodes
+ * @param {Array|Element} elem
+ */
+getText = Sizzle.getText = function( elem ) {
+	var node,
+		ret = "",
+		i = 0,
+		nodeType = elem.nodeType;
+
+	if ( !nodeType ) {
+		// If no nodeType, this is expected to be an array
+		while ( (node = elem[i++]) ) {
+			// Do not traverse comment nodes
+			ret += getText( node );
+		}
+	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+		// Use textContent for elements
+		// innerText usage removed for consistency of new lines (jQuery #11153)
+		if ( typeof elem.textContent === "string" ) {
+			return elem.textContent;
+		} else {
+			// Traverse its children
+			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+				ret += getText( elem );
+			}
+		}
+	} else if ( nodeType === 3 || nodeType === 4 ) {
+		return elem.nodeValue;
+	}
+	// Do not include comment or processing instruction nodes
+
+	return ret;
+};
+
+Expr = Sizzle.selectors = {
+
+	// Can be adjusted by the user
+	cacheLength: 50,
+
+	createPseudo: markFunction,
+
+	match: matchExpr,
+
+	attrHandle: {},
+
+	find: {},
+
+	relative: {
+		">": { dir: "parentNode", first: true },
+		" ": { dir: "parentNode" },
+		"+": { dir: "previousSibling", first: true },
+		"~": { dir: "previousSibling" }
+	},
+
+	preFilter: {
+		"ATTR": function( match ) {
+			match[1] = match[1].replace( runescape, funescape );
+
+			// Move the given value to match[3] whether quoted or unquoted
+			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
+
+			if ( match[2] === "~=" ) {
+				match[3] = " " + match[3] + " ";
+			}
+
+			return match.slice( 0, 4 );
+		},
+
+		"CHILD": function( match ) {
+			/* matches from matchExpr["CHILD"]
+				1 type (only|nth|...)
+				2 what (child|of-type)
+				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
+				4 xn-component of xn+y argument ([+-]?\d*n|)
+				5 sign of xn-component
+				6 x of xn-component
+				7 sign of y-component
+				8 y of y-component
+			*/
+			match[1] = match[1].toLowerCase();
+
+			if ( match[1].slice( 0, 3 ) === "nth" ) {
+				// nth-* requires argument
+				if ( !match[3] ) {
+					Sizzle.error( match[0] );
+				}
+
+				// numeric x and y parameters for Expr.filter.CHILD
+				// remember that false/true cast respectively to 0/1
+				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
+				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
+
+			// other types prohibit arguments
+			} else if ( match[3] ) {
+				Sizzle.error( match[0] );
+			}
+
+			return match;
+		},
+
+		"PSEUDO": function( match ) {
+			var excess,
+				unquoted = !match[6] && match[2];
+
+			if ( matchExpr["CHILD"].test( match[0] ) ) {
+				return null;
+			}
+
+			// Accept quoted arguments as-is
+			if ( match[3] ) {
+				match[2] = match[4] || match[5] || "";
+
+			// Strip excess characters from unquoted arguments
+			} else if ( unquoted && rpseudo.test( unquoted ) &&
+				// Get excess from tokenize (recursively)
+				(excess = tokenize( unquoted, true )) &&
+				// advance to the next closing parenthesis
+				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
+
+				// excess is a negative index
+				match[0] = match[0].slice( 0, excess );
+				match[2] = unquoted.slice( 0, excess );
+			}
+
+			// Return only captures needed by the pseudo filter method (type and argument)
+			return match.slice( 0, 3 );
+		}
+	},
+
+	filter: {
+
+		"TAG": function( nodeNameSelector ) {
+			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
+			return nodeNameSelector === "*" ?
+				function() { return true; } :
+				function( elem ) {
+					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
+				};
+		},
+
+		"CLASS": function( className ) {
+			var pattern = classCache[ className + " " ];
+
+			return pattern ||
+				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
+				classCache( className, function( elem ) {
+					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
+				});
+		},
+
+		"ATTR": function( name, operator, check ) {
+			return function( elem ) {
+				var result = Sizzle.attr( elem, name );
+
+				if ( result == null ) {
+					return operator === "!=";
+				}
+				if ( !operator ) {
+					return true;
+				}
+
+				result += "";
+
+				return operator === "=" ? result === check :
+					operator === "!=" ? result !== check :
+					operator === "^=" ? check && result.indexOf( check ) === 0 :
+					operator === "*=" ? check && result.indexOf( check ) > -1 :
+					operator === "$=" ? check && result.slice( -check.length ) === check :
+					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
+					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
+					false;
+			};
+		},
+
+		"CHILD": function( type, what, argument, first, last ) {
+			var simple = type.slice( 0, 3 ) !== "nth",
+				forward = type.slice( -4 ) !== "last",
+				ofType = what === "of-type";
+
+			return first === 1 && last === 0 ?
+
+				// Shortcut for :nth-*(n)
+				function( elem ) {
+					return !!elem.parentNode;
+				} :
+
+				function( elem, context, xml ) {
+					var cache, outerCache, node, diff, nodeIndex, start,
+						dir = simple !== forward ? "nextSibling" : "previousSibling",
+						parent = elem.parentNode,
+						name = ofType && elem.nodeName.toLowerCase(),
+						useCache = !xml && !ofType;
+
+					if ( parent ) {
+
+						// :(first|last|only)-(child|of-type)
+						if ( simple ) {
+							while ( dir ) {
+								node = elem;
+								while ( (node = node[ dir ]) ) {
+									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
+										return false;
+									}
+								}
+								// Reverse direction for :only-* (if we haven't yet done so)
+								start = dir = type === "only" && !start && "nextSibling";
+							}
+							return true;
+						}
+
+						start = [ forward ? parent.firstChild : parent.lastChild ];
+
+						// non-xml :nth-child(...) stores cache data on `parent`
+						if ( forward && useCache ) {
+							// Seek `elem` from a previously-cached index
+							outerCache = parent[ expando ] || (parent[ expando ] = {});
+							cache = outerCache[ type ] || [];
+							nodeIndex = cache[0] === dirruns && cache[1];
+							diff = cache[0] === dirruns && cache[2];
+							node = nodeIndex && parent.childNodes[ nodeIndex ];
+
+							while ( (node = ++nodeIndex && node && node[ dir ] ||
+
+								// Fallback to seeking `elem` from the start
+								(diff = nodeIndex = 0) || start.pop()) ) {
+
+								// When found, cache indexes on `parent` and break
+								if ( node.nodeType === 1 && ++diff && node === elem ) {
+									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
+									break;
+								}
+							}
+
+						// Use previously-cached element index if available
+						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
+							diff = cache[1];
+
+						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
+						} else {
+							// Use the same loop as above to seek `elem` from the start
+							while ( (node = ++nodeIndex && node && node[ dir ] ||
+								(diff = nodeIndex = 0) || start.pop()) ) {
+
+								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
+									// Cache the index of each encountered element
+									if ( useCache ) {
+										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
+									}
+
+									if ( node === elem ) {
+										break;
+									}
+								}
+							}
+						}
+
+						// Incorporate the offset, then check against cycle size
+						diff -= last;
+						return diff === first || ( diff % first === 0 && diff / first >= 0 );
+					}
+				};
+		},
+
+		"PSEUDO": function( pseudo, argument ) {
+			// pseudo-class names are case-insensitive
+			// http://www.w3.org/TR/selectors/#pseudo-classes
+			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
+			// Remember that setFilters inherits from pseudos
+			var args,
+				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
+					Sizzle.error( "unsupported pseudo: " + pseudo );
+
+			// The user may use createPseudo to indicate that
+			// arguments are needed to create the filter function
+			// just as Sizzle does
+			if ( fn[ expando ] ) {
+				return fn( argument );
+			}
+
+			// But maintain support for old signatures
+			if ( fn.length > 1 ) {
+				args = [ pseudo, pseudo, "", argument ];
+				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
+					markFunction(function( seed, matches ) {
+						var idx,
+							matched = fn( seed, argument ),
+							i = matched.length;
+						while ( i-- ) {
+							idx = indexOf( seed, matched[i] );
+							seed[ idx ] = !( matches[ idx ] = matched[i] );
+						}
+					}) :
+					function( elem ) {
+						return fn( elem, 0, args );
+					};
+			}
+
+			return fn;
+		}
+	},
+
+	pseudos: {
+		// Potentially complex pseudos
+		"not": markFunction(function( selector ) {
+			// Trim the selector passed to compile
+			// to avoid treating leading and trailing
+			// spaces as combinators
+			var input = [],
+				results = [],
+				matcher = compile( selector.replace( rtrim, "$1" ) );
+
+			return matcher[ expando ] ?
+				markFunction(function( seed, matches, context, xml ) {
+					var elem,
+						unmatched = matcher( seed, null, xml, [] ),
+						i = seed.length;
+
+					// Match elements unmatched by `matcher`
+					while ( i-- ) {
+						if ( (elem = unmatched[i]) ) {
+							seed[i] = !(matches[i] = elem);
+						}
+					}
+				}) :
+				function( elem, context, xml ) {
+					input[0] = elem;
+					matcher( input, null, xml, results );
+					// Don't keep the element (issue #299)
+					input[0] = null;
+					return !results.pop();
+				};
+		}),
+
+		"has": markFunction(function( selector ) {
+			return function( elem ) {
+				return Sizzle( selector, elem ).length > 0;
+			};
+		}),
+
+		"contains": markFunction(function( text ) {
+			text = text.replace( runescape, funescape );
+			return function( elem ) {
+				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
+			};
+		}),
+
+		// "Whether an element is represented by a :lang() selector
+		// is based solely on the element's language value
+		// being equal to the identifier C,
+		// or beginning with the identifier C immediately followed by "-".
+		// The matching of C against the element's language value is performed case-insensitively.
+		// The identifier C does not have to be a valid language name."
+		// http://www.w3.org/TR/selectors/#lang-pseudo
+		"lang": markFunction( function( lang ) {
+			// lang value must be a valid identifier
+			if ( !ridentifier.test(lang || "") ) {
+				Sizzle.error( "unsupported lang: " + lang );
+			}
+			lang = lang.replace( runescape, funescape ).toLowerCase();
+			return function( elem ) {
+				var elemLang;
+				do {
+					if ( (elemLang = documentIsHTML ?
+						elem.lang :
+						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
+
+						elemLang = elemLang.toLowerCase();
+						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
+					}
+				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
+				return false;
+			};
+		}),
+
+		// Miscellaneous
+		"target": function( elem ) {
+			var hash = window.location && window.location.hash;
+			return hash && hash.slice( 1 ) === elem.id;
+		},
+
+		"root": function( elem ) {
+			return elem === docElem;
+		},
+
+		"focus": function( elem ) {
+			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
+		},
+
+		// Boolean properties
+		"enabled": function( elem ) {
+			return elem.disabled === false;
+		},
+
+		"disabled": function( elem ) {
+			return elem.disabled === true;
+		},
+
+		"checked": function( elem ) {
+			// In CSS3, :checked should return both checked and selected elements
+			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			var nodeName = elem.nodeName.toLowerCase();
+			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
+		},
+
+		"selected": function( elem ) {
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			if ( elem.parentNode ) {
+				elem.parentNode.selectedIndex;
+			}
+
+			return elem.selected === true;
+		},
+
+		// Contents
+		"empty": function( elem ) {
+			// http://www.w3.org/TR/selectors/#empty-pseudo
+			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
+			//   but not by others (comment: 8; processing instruction: 7; etc.)
+			// nodeType < 6 works because attributes (2) do not appear as children
+			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+				if ( elem.nodeType < 6 ) {
+					return false;
+				}
+			}
+			return true;
+		},
+
+		"parent": function( elem ) {
+			return !Expr.pseudos["empty"]( elem );
+		},
+
+		// Element/input types
+		"header": function( elem ) {
+			return rheader.test( elem.nodeName );
+		},
+
+		"input": function( elem ) {
+			return rinputs.test( elem.nodeName );
+		},
+
+		"button": function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return name === "input" && elem.type === "button" || name === "button";
+		},
+
+		"text": function( elem ) {
+			var attr;
+			return elem.nodeName.toLowerCase() === "input" &&
+				elem.type === "text" &&
+
+				// Support: IE<8
+				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
+				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
+		},
+
+		// Position-in-collection
+		"first": createPositionalPseudo(function() {
+			return [ 0 ];
+		}),
+
+		"last": createPositionalPseudo(function( matchIndexes, length ) {
+			return [ length - 1 ];
+		}),
+
+		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			return [ argument < 0 ? argument + length : argument ];
+		}),
+
+		"even": createPositionalPseudo(function( matchIndexes, length ) {
+			var i = 0;
+			for ( ; i < length; i += 2 ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"odd": createPositionalPseudo(function( matchIndexes, length ) {
+			var i = 1;
+			for ( ; i < length; i += 2 ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			var i = argument < 0 ? argument + length : argument;
+			for ( ; --i >= 0; ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			var i = argument < 0 ? argument + length : argument;
+			for ( ; ++i < length; ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		})
+	}
+};
+
+Expr.pseudos["nth"] = Expr.pseudos["eq"];
+
+// Add button/input type pseudos
+for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
+	Expr.pseudos[ i ] = createInputPseudo( i );
+}
+for ( i in { submit: true, reset: true } ) {
+	Expr.pseudos[ i ] = createButtonPseudo( i );
+}
+
+// Easy API for creating new setFilters
+function setFilters() {}
+setFilters.prototype = Expr.filters = Expr.pseudos;
+Expr.setFilters = new setFilters();
+
+tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
+	var matched, match, tokens, type,
+		soFar, groups, preFilters,
+		cached = tokenCache[ selector + " " ];
+
+	if ( cached ) {
+		return parseOnly ? 0 : cached.slice( 0 );
+	}
+
+	soFar = selector;
+	groups = [];
+	preFilters = Expr.preFilter;
+
+	while ( soFar ) {
+
+		// Comma and first run
+		if ( !matched || (match = rcomma.exec( soFar )) ) {
+			if ( match ) {
+				// Don't consume trailing commas as valid
+				soFar = soFar.slice( match[0].length ) || soFar;
+			}
+			groups.push( (tokens = []) );
+		}
+
+		matched = false;
+
+		// Combinators
+		if ( (match = rcombinators.exec( soFar )) ) {
+			matched = match.shift();
+			tokens.push({
+				value: matched,
+				// Cast descendant combinators to space
+				type: match[0].replace( rtrim, " " )
+			});
+			soFar = soFar.slice( matched.length );
+		}
+
+		// Filters
+		for ( type in Expr.filter ) {
+			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
+				(match = preFilters[ type ]( match ))) ) {
+				matched = match.shift();
+				tokens.push({
+					value: matched,
+					type: type,
+					matches: match
+				});
+				soFar = soFar.slice( matched.length );
+			}
+		}
+
+		if ( !matched ) {
+			break;
+		}
+	}
+
+	// Return the length of the invalid excess
+	// if we're just parsing
+	// Otherwise, throw an error or return tokens
+	return parseOnly ?
+		soFar.length :
+		soFar ?
+			Sizzle.error( selector ) :
+			// Cache the tokens
+			tokenCache( selector, groups ).slice( 0 );
+};
+
+function toSelector( tokens ) {
+	var i = 0,
+		len = tokens.length,
+		selector = "";
+	for ( ; i < len; i++ ) {
+		selector += tokens[i].value;
+	}
+	return selector;
+}
+
+function addCombinator( matcher, combinator, base ) {
+	var dir = combinator.dir,
+		checkNonElements = base && dir === "parentNode",
+		doneName = done++;
+
+	return combinator.first ?
+		// Check against closest ancestor/preceding element
+		function( elem, context, xml ) {
+			while ( (elem = elem[ dir ]) ) {
+				if ( elem.nodeType === 1 || checkNonElements ) {
+					return matcher( elem, context, xml );
+				}
+			}
+		} :
+
+		// Check against all ancestor/preceding elements
+		function( elem, context, xml ) {
+			var oldCache, outerCache,
+				newCache = [ dirruns, doneName ];
+
+			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
+			if ( xml ) {
+				while ( (elem = elem[ dir ]) ) {
+					if ( elem.nodeType === 1 || checkNonElements ) {
+						if ( matcher( elem, context, xml ) ) {
+							return true;
+						}
+					}
+				}
+			} else {
+				while ( (elem = elem[ dir ]) ) {
+					if ( elem.nodeType === 1 || checkNonElements ) {
+						outerCache = elem[ expando ] || (elem[ expando ] = {});
+						if ( (oldCache = outerCache[ dir ]) &&
+							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
+
+							// Assign to newCache so results back-propagate to previous elements
+							return (newCache[ 2 ] = oldCache[ 2 ]);
+						} else {
+							// Reuse newcache so results back-propagate to previous elements
+							outerCache[ dir ] = newCache;
+
+							// A match means we're done; a fail means we have to keep checking
+							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
+								return true;
+							}
+						}
+					}
+				}
+			}
+		};
+}
+
+function elementMatcher( matchers ) {
+	return matchers.length > 1 ?
+		function( elem, context, xml ) {
+			var i = matchers.length;
+			while ( i-- ) {
+				if ( !matchers[i]( elem, context, xml ) ) {
+					return false;
+				}
+			}
+			return true;
+		} :
+		matchers[0];
+}
+
+function multipleContexts( selector, contexts, results ) {
+	var i = 0,
+		len = contexts.length;
+	for ( ; i < len; i++ ) {
+		Sizzle( selector, contexts[i], results );
+	}
+	return results;
+}
+
+function condense( unmatched, map, filter, context, xml ) {
+	var elem,
+		newUnmatched = [],
+		i = 0,
+		len = unmatched.length,
+		mapped = map != null;
+
+	for ( ; i < len; i++ ) {
+		if ( (elem = unmatched[i]) ) {
+			if ( !filter || filter( elem, context, xml ) ) {
+				newUnmatched.push( elem );
+				if ( mapped ) {
+					map.push( i );
+				}
+			}
+		}
+	}
+
+	return newUnmatched;
+}
+
+function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
+	if ( postFilter && !postFilter[ expando ] ) {
+		postFilter = setMatcher( postFilter );
+	}
+	if ( postFinder && !postFinder[ expando ] ) {
+		postFinder = setMatcher( postFinder, postSelector );
+	}
+	return markFunction(function( seed, results, context, xml ) {
+		var temp, i, elem,
+			preMap = [],
+			postMap = [],
+			preexisting = results.length,
+
+			// Get initial elements from seed or context
+			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
+
+			// Prefilter to get matcher input, preserving a map for seed-results synchronization
+			matcherIn = preFilter && ( seed || !selector ) ?
+				condense( elems, preMap, preFilter, context, xml ) :
+				elems,
+
+			matcherOut = matcher ?
+				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
+				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
+
+					// ...intermediate processing is necessary
+					[] :
+
+					// ...otherwise use results directly
+					results :
+				matcherIn;
+
+		// Find primary matches
+		if ( matcher ) {
+			matcher( matcherIn, matcherOut, context, xml );
+		}
+
+		// Apply postFilter
+		if ( postFilter ) {
+			temp = condense( matcherOut, postMap );
+			postFilter( temp, [], context, xml );
+
+			// Un-match failing elements by moving them back to matcherIn
+			i = temp.length;
+			while ( i-- ) {
+				if ( (elem = temp[i]) ) {
+					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
+				}
+			}
+		}
+
+		if ( seed ) {
+			if ( postFinder || preFilter ) {
+				if ( postFinder ) {
+					// Get the final matcherOut by condensing this intermediate into postFinder contexts
+					temp = [];
+					i = matcherOut.length;
+					while ( i-- ) {
+						if ( (elem = matcherOut[i]) ) {
+							// Restore matcherIn since elem is not yet a final match
+							temp.push( (matcherIn[i] = elem) );
+						}
+					}
+					postFinder( null, (matcherOut = []), temp, xml );
+				}
+
+				// Move matched elements from seed to results to keep them synchronized
+				i = matcherOut.length;
+				while ( i-- ) {
+					if ( (elem = matcherOut[i]) &&
+						(temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
+
+						seed[temp] = !(results[temp] = elem);
+					}
+				}
+			}
+
+		// Add elements to results, through postFinder if defined
+		} else {
+			matcherOut = condense(
+				matcherOut === results ?
+					matcherOut.splice( preexisting, matcherOut.length ) :
+					matcherOut
+			);
+			if ( postFinder ) {
+				postFinder( null, results, matcherOut, xml );
+			} else {
+				push.apply( results, matcherOut );
+			}
+		}
+	});
+}
+
+function matcherFromTokens( tokens ) {
+	var checkContext, matcher, j,
+		len = tokens.length,
+		leadingRelative = Expr.relative[ tokens[0].type ],
+		implicitRelative = leadingRelative || Expr.relative[" "],
+		i = leadingRelative ? 1 : 0,
+
+		// The foundational matcher ensures that elements are reachable from top-level context(s)
+		matchContext = addCombinator( function( elem ) {
+			return elem === checkContext;
+		}, implicitRelative, true ),
+		matchAnyContext = addCombinator( function( elem ) {
+			return indexOf( checkContext, elem ) > -1;
+		}, implicitRelative, true ),
+		matchers = [ function( elem, context, xml ) {
+			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
+				(checkContext = context).nodeType ?
+					matchContext( elem, context, xml ) :
+					matchAnyContext( elem, context, xml ) );
+			// Avoid hanging onto element (issue #299)
+			checkContext = null;
+			return ret;
+		} ];
+
+	for ( ; i < len; i++ ) {
+		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
+			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
+		} else {
+			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
+
+			// Return special upon seeing a positional matcher
+			if ( matcher[ expando ] ) {
+				// Find the next relative operator (if any) for proper handling
+				j = ++i;
+				for ( ; j < len; j++ ) {
+					if ( Expr.relative[ tokens[j].type ] ) {
+						break;
+					}
+				}
+				return setMatcher(
+					i > 1 && elementMatcher( matchers ),
+					i > 1 && toSelector(
+						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
+						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
+					).replace( rtrim, "$1" ),
+					matcher,
+					i < j && matcherFromTokens( tokens.slice( i, j ) ),
+					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
+					j < len && toSelector( tokens )
+				);
+			}
+			matchers.push( matcher );
+		}
+	}
+
+	return elementMatcher( matchers );
+}
+
+function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
+	var bySet = setMatchers.length > 0,
+		byElement = elementMatchers.length > 0,
+		superMatcher = function( seed, context, xml, results, outermost ) {
+			var elem, j, matcher,
+				matchedCount = 0,
+				i = "0",
+				unmatched = seed && [],
+				setMatched = [],
+				contextBackup = outermostContext,
+				// We must always have either seed elements or outermost context
+				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
+				// Use integer dirruns iff this is the outermost matcher
+				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
+				len = elems.length;
+
+			if ( outermost ) {
+				outermostContext = context !== document && context;
+			}
+
+			// Add elements passing elementMatchers directly to results
+			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
+			// Support: IE<9, Safari
+			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
+			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
+				if ( byElement && elem ) {
+					j = 0;
+					while ( (matcher = elementMatchers[j++]) ) {
+						if ( matcher( elem, context, xml ) ) {
+							results.push( elem );
+							break;
+						}
+					}
+					if ( outermost ) {
+						dirruns = dirrunsUnique;
+					}
+				}
+
+				// Track unmatched elements for set filters
+				if ( bySet ) {
+					// They will have gone through all possible matchers
+					if ( (elem = !matcher && elem) ) {
+						matchedCount--;
+					}
+
+					// Lengthen the array for every element, matched or not
+					if ( seed ) {
+						unmatched.push( elem );
+					}
+				}
+			}
+
+			// Apply set filters to unmatched elements
+			matchedCount += i;
+			if ( bySet && i !== matchedCount ) {
+				j = 0;
+				while ( (matcher = setMatchers[j++]) ) {
+					matcher( unmatched, setMatched, context, xml );
+				}
+
+				if ( seed ) {
+					// Reintegrate element matches to eliminate the need for sorting
+					if ( matchedCount > 0 ) {
+						while ( i-- ) {
+							if ( !(unmatched[i] || setMatched[i]) ) {
+								setMatched[i] = pop.call( results );
+							}
+						}
+					}
+
+					// Discard index placeholder values to get only actual matches
+					setMatched = condense( setMatched );
+				}
+
+				// Add matches to results
+				push.apply( results, setMatched );
+
+				// Seedless set matches succeeding multiple successful matchers stipulate sorting
+				if ( outermost && !seed && setMatched.length > 0 &&
+					( matchedCount + setMatchers.length ) > 1 ) {
+
+					Sizzle.uniqueSort( results );
+				}
+			}
+
+			// Override manipulation of globals by nested matchers
+			if ( outermost ) {
+				dirruns = dirrunsUnique;
+				outermostContext = contextBackup;
+			}
+
+			return unmatched;
+		};
+
+	return bySet ?
+		markFunction( superMatcher ) :
+		superMatcher;
+}
+
+compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
+	var i,
+		setMatchers = [],
+		elementMatchers = [],
+		cached = compilerCache[ selector + " " ];
+
+	if ( !cached ) {
+		// Generate a function of recursive functions that can be used to check each element
+		if ( !match ) {
+			match = tokenize( selector );
+		}
+		i = match.length;
+		while ( i-- ) {
+			cached = matcherFromTokens( match[i] );
+			if ( cached[ expando ] ) {
+				setMatchers.push( cached );
+			} else {
+				elementMatchers.push( cached );
+			}
+		}
+
+		// Cache the compiled function
+		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
+
+		// Save selector and tokenization
+		cached.selector = selector;
+	}
+	return cached;
+};
+
+/**
+ * A low-level selection function that works with Sizzle's compiled
+ *  selector functions
+ * @param {String|Function} selector A selector or a pre-compiled
+ *  selector function built with Sizzle.compile
+ * @param {Element} context
+ * @param {Array} [results]
+ * @param {Array} [seed] A set of elements to match against
+ */
+select = Sizzle.select = function( selector, context, results, seed ) {
+	var i, tokens, token, type, find,
+		compiled = typeof selector === "function" && selector,
+		match = !seed && tokenize( (selector = compiled.selector || selector) );
+
+	results = results || [];
+
+	// Try to minimize operations if there is no seed and only one group
+	if ( match.length === 1 ) {
+
+		// Take a shortcut and set the context if the root selector is an ID
+		tokens = match[0] = match[0].slice( 0 );
+		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
+				support.getById && context.nodeType === 9 && documentIsHTML &&
+				Expr.relative[ tokens[1].type ] ) {
+
+			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
+			if ( !context ) {
+				return results;
+
+			// Precompiled matchers will still verify ancestry, so step up a level
+			} else if ( compiled ) {
+				context = context.parentNode;
+			}
+
+			selector = selector.slice( tokens.shift().value.length );
+		}
+
+		// Fetch a seed set for right-to-left matching
+		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
+		while ( i-- ) {
+			token = tokens[i];
+
+			// Abort if we hit a combinator
+			if ( Expr.relative[ (type = token.type) ] ) {
+				break;
+			}
+			if ( (find = Expr.find[ type ]) ) {
+				// Search, expanding context for leading sibling combinators
+				if ( (seed = find(
+					token.matches[0].replace( runescape, funescape ),
+					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
+				)) ) {
+
+					// If seed is empty or no tokens remain, we can return early
+					tokens.splice( i, 1 );
+					selector = seed.length && toSelector( tokens );
+					if ( !selector ) {
+						push.apply( results, seed );
+						return results;
+					}
+
+					break;
+				}
+			}
+		}
+	}
+
+	// Compile and execute a filtering function if one is not provided
+	// Provide `match` to avoid retokenization if we modified the selector above
+	( compiled || compile( selector, match ) )(
+		seed,
+		context,
+		!documentIsHTML,
+		results,
+		rsibling.test( selector ) && testContext( context.parentNode ) || context
+	);
+	return results;
+};
+
+// One-time assignments
+
+// Sort stability
+support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
+
+// Support: Chrome 14-35+
+// Always assume duplicates if they aren't passed to the comparison function
+support.detectDuplicates = !!hasDuplicate;
+
+// Initialize against the default document
+setDocument();
+
+// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
+// Detached nodes confoundingly follow *each other*
+support.sortDetached = assert(function( div1 ) {
+	// Should return 1, but returns 4 (following)
+	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
+});
+
+// Support: IE<8
+// Prevent attribute/property "interpolation"
+// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !assert(function( div ) {
+	div.innerHTML = "<a href='#'></a>";
+	return div.firstChild.getAttribute("href") === "#" ;
+}) ) {
+	addHandle( "type|href|height|width", function( elem, name, isXML ) {
+		if ( !isXML ) {
+			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
+		}
+	});
+}
+
+// Support: IE<9
+// Use defaultValue in place of getAttribute("value")
+if ( !support.attributes || !assert(function( div ) {
+	div.innerHTML = "<input/>";
+	div.firstChild.setAttribute( "value", "" );
+	return div.firstChild.getAttribute( "value" ) === "";
+}) ) {
+	addHandle( "value", function( elem, name, isXML ) {
+		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
+			return elem.defaultValue;
+		}
+	});
+}
+
+// Support: IE<9
+// Use getAttributeNode to fetch booleans when getAttribute lies
+if ( !assert(function( div ) {
+	return div.getAttribute("disabled") == null;
+}) ) {
+	addHandle( booleans, function( elem, name, isXML ) {
+		var val;
+		if ( !isXML ) {
+			return elem[ name ] === true ? name.toLowerCase() :
+					(val = elem.getAttributeNode( name )) && val.specified ?
+					val.value :
+				null;
+		}
+	});
+}
+
+return Sizzle;
+
+})( window );
+
+
+
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.pseudos;
+jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
+
+
+
+var rneedsContext = jQuery.expr.match.needsContext;
+
+var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/);
+
+
+
+var risSimple = /^.[^:#\[\.,]*$/;
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, not ) {
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep( elements, function( elem, i ) {
+			/* jshint -W018 */
+			return !!qualifier.call( elem, i, elem ) !== not;
+		});
+
+	}
+
+	if ( qualifier.nodeType ) {
+		return jQuery.grep( elements, function( elem ) {
+			return ( elem === qualifier ) !== not;
+		});
+
+	}
+
+	if ( typeof qualifier === "string" ) {
+		if ( risSimple.test( qualifier ) ) {
+			return jQuery.filter( qualifier, elements, not );
+		}
+
+		qualifier = jQuery.filter( qualifier, elements );
+	}
+
+	return jQuery.grep( elements, function( elem ) {
+		return ( indexOf.call( qualifier, elem ) >= 0 ) !== not;
+	});
+}
+
+jQuery.filter = function( expr, elems, not ) {
+	var elem = elems[ 0 ];
+
+	if ( not ) {
+		expr = ":not(" + expr + ")";
+	}
+
+	return elems.length === 1 && elem.nodeType === 1 ?
+		jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
+		jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
+			return elem.nodeType === 1;
+		}));
+};
+
+jQuery.fn.extend({
+	find: function( selector ) {
+		var i,
+			len = this.length,
+			ret = [],
+			self = this;
+
+		if ( typeof selector !== "string" ) {
+			return this.pushStack( jQuery( selector ).filter(function() {
+				for ( i = 0; i < len; i++ ) {
+					if ( jQuery.contains( self[ i ], this ) ) {
+						return true;
+					}
+				}
+			}) );
+		}
+
+		for ( i = 0; i < len; i++ ) {
+			jQuery.find( selector, self[ i ], ret );
+		}
+
+		// Needed because $( selector, context ) becomes $( context ).find( selector )
+		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
+		ret.selector = this.selector ? this.selector + " " + selector : selector;
+		return ret;
+	},
+	filter: function( selector ) {
+		return this.pushStack( winnow(this, selector || [], false) );
+	},
+	not: function( selector ) {
+		return this.pushStack( winnow(this, selector || [], true) );
+	},
+	is: function( selector ) {
+		return !!winnow(
+			this,
+
+			// If this is a positional/relative selector, check membership in the returned set
+			// so $("p:first").is("p:last") won't return true for a doc with two "p".
+			typeof selector === "string" && rneedsContext.test( selector ) ?
+				jQuery( selector ) :
+				selector || [],
+			false
+		).length;
+	}
+});
+
+
+// Initialize a jQuery object
+
+
+// A central reference to the root jQuery(document)
+var rootjQuery,
+
+	// A simple way to check for HTML strings
+	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+	// Strict HTML recognition (#11290: must start with <)
+	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
+
+	init = jQuery.fn.init = function( selector, context ) {
+		var match, elem;
+
+		// HANDLE: $(""), $(null), $(undefined), $(false)
+		if ( !selector ) {
+			return this;
+		}
+
+		// Handle HTML strings
+		if ( typeof selector === "string" ) {
+			if ( selector[0] === "<" && selector[ selector.length - 1 ] === ">" && selector.length >= 3 ) {
+				// Assume that strings that start and end with <> are HTML and skip the regex check
+				match = [ null, selector, null ];
+
+			} else {
+				match = rquickExpr.exec( selector );
+			}
+
+			// Match html or make sure no context is specified for #id
+			if ( match && (match[1] || !context) ) {
+
+				// HANDLE: $(html) -> $(array)
+				if ( match[1] ) {
+					context = context instanceof jQuery ? context[0] : context;
+
+					// Option to run scripts is true for back-compat
+					// Intentionally let the error be thrown if parseHTML is not present
+					jQuery.merge( this, jQuery.parseHTML(
+						match[1],
+						context && context.nodeType ? context.ownerDocument || context : document,
+						true
+					) );
+
+					// HANDLE: $(html, props)
+					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
+						for ( match in context ) {
+							// Properties of context are called as methods if possible
+							if ( jQuery.isFunction( this[ match ] ) ) {
+								this[ match ]( context[ match ] );
+
+							// ...and otherwise set as attributes
+							} else {
+								this.attr( match, context[ match ] );
+							}
+						}
+					}
+
+					return this;
+
+				// HANDLE: $(#id)
+				} else {
+					elem = document.getElementById( match[2] );
+
+					// Support: Blackberry 4.6
+					// gEBID returns nodes no longer in the document (#6963)
+					if ( elem && elem.parentNode ) {
+						// Inject the element directly into the jQuery object
+						this.length = 1;
+						this[0] = elem;
+					}
+
+					this.context = document;
+					this.selector = selector;
+					return this;
+				}
+
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return ( context || rootjQuery ).find( selector );
+
+			// HANDLE: $(expr, context)
+			// (which is just equivalent to: $(context).find(expr)
+			} else {
+				return this.constructor( context ).find( selector );
+			}
+
+		// HANDLE: $(DOMElement)
+		} else if ( selector.nodeType ) {
+			this.context = this[0] = selector;
+			this.length = 1;
+			return this;
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( jQuery.isFunction( selector ) ) {
+			return typeof rootjQuery.ready !== "undefined" ?
+				rootjQuery.ready( selector ) :
+				// Execute immediately if ready is not present
+				selector( jQuery );
+		}
+
+		if ( selector.selector !== undefined ) {
+			this.selector = selector.selector;
+			this.context = selector.context;
+		}
+
+		return jQuery.makeArray( selector, this );
+	};
+
+// Give the init function the jQuery prototype for later instantiation
+init.prototype = jQuery.fn;
+
+// Initialize central reference
+rootjQuery = jQuery( document );
+
+
+var rparentsprev = /^(?:parents|prev(?:Until|All))/,
+	// Methods guaranteed to produce a unique set when starting from a unique set
+	guaranteedUnique = {
+		children: true,
+		contents: true,
+		next: true,
+		prev: true
+	};
+
+jQuery.extend({
+	dir: function( elem, dir, until ) {
+		var matched = [],
+			truncate = until !== undefined;
+
+		while ( (elem = elem[ dir ]) && elem.nodeType !== 9 ) {
+			if ( elem.nodeType === 1 ) {
+				if ( truncate && jQuery( elem ).is( until ) ) {
+					break;
+				}
+				matched.push( elem );
+			}
+		}
+		return matched;
+	},
+
+	sibling: function( n, elem ) {
+		var matched = [];
+
+		for ( ; n; n = n.nextSibling ) {
+			if ( n.nodeType === 1 && n !== elem ) {
+				matched.push( n );
+			}
+		}
+
+		return matched;
+	}
+});
+
+jQuery.fn.extend({
+	has: function( target ) {
+		var targets = jQuery( target, this ),
+			l = targets.length;
+
+		return this.filter(function() {
+			var i = 0;
+			for ( ; i < l; i++ ) {
+				if ( jQuery.contains( this, targets[i] ) ) {
+					return true;
+				}
+			}
+		});
+	},
+
+	closest: function( selectors, context ) {
+		var cur,
+			i = 0,
+			l = this.length,
+			matched = [],
+			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
+				jQuery( selectors, context || this.context ) :
+				0;
+
+		for ( ; i < l; i++ ) {
+			for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
+				// Always skip document fragments
+				if ( cur.nodeType < 11 && (pos ?
+					pos.index(cur) > -1 :
+
+					// Don't pass non-elements to Sizzle
+					cur.nodeType === 1 &&
+						jQuery.find.matchesSelector(cur, selectors)) ) {
+
+					matched.push( cur );
+					break;
+				}
+			}
+		}
+
+		return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched );
+	},
+
+	// Determine the position of an element within the set
+	index: function( elem ) {
+
+		// No argument, return index in parent
+		if ( !elem ) {
+			return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
+		}
+
+		// Index in selector
+		if ( typeof elem === "string" ) {
+			return indexOf.call( jQuery( elem ), this[ 0 ] );
+		}
+
+		// Locate the position of the desired element
+		return indexOf.call( this,
+
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[ 0 ] : elem
+		);
+	},
+
+	add: function( selector, context ) {
+		return this.pushStack(
+			jQuery.unique(
+				jQuery.merge( this.get(), jQuery( selector, context ) )
+			)
+		);
+	},
+
+	addBack: function( selector ) {
+		return this.add( selector == null ?
+			this.prevObject : this.prevObject.filter(selector)
+		);
+	}
+});
+
+function sibling( cur, dir ) {
+	while ( (cur = cur[dir]) && cur.nodeType !== 1 ) {}
+	return cur;
+}
+
+jQuery.each({
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
+	},
+	parents: function( elem ) {
+		return jQuery.dir( elem, "parentNode" );
+	},
+	parentsUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "parentNode", until );
+	},
+	next: function( elem ) {
+		return sibling( elem, "nextSibling" );
+	},
+	prev: function( elem ) {
+		return sibling( elem, "previousSibling" );
+	},
+	nextAll: function( elem ) {
+		return jQuery.dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return jQuery.dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
+	},
+	children: function( elem ) {
+		return jQuery.sibling( elem.firstChild );
+	},
+	contents: function( elem ) {
+		return elem.contentDocument || jQuery.merge( [], elem.childNodes );
+	}
+}, function( name, fn ) {
+	jQuery.fn[ name ] = function( until, selector ) {
+		var matched = jQuery.map( this, fn, until );
+
+		if ( name.slice( -5 ) !== "Until" ) {
+			selector = until;
+		}
+
+		if ( selector && typeof selector === "string" ) {
+			matched = jQuery.filter( selector, matched );
+		}
+
+		if ( this.length > 1 ) {
+			// Remove duplicates
+			if ( !guaranteedUnique[ name ] ) {
+				jQuery.unique( matched );
+			}
+
+			// Reverse order for parents* and prev-derivatives
+			if ( rparentsprev.test( name ) ) {
+				matched.reverse();
+			}
+		}
+
+		return this.pushStack( matched );
+	};
+});
+var rnotwhite = (/\S+/g);
+
+
+
+// String to Object options format cache
+var optionsCache = {};
+
+// Convert String-formatted options into Object-formatted ones and store in cache
+function createOptions( options ) {
+	var object = optionsCache[ options ] = {};
+	jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
+		object[ flag ] = true;
+	});
+	return object;
+}
+
+/*
+ * Create a callback list using the following parameters:
+ *
+ *	options: an optional list of space-separated options that will change how
+ *			the callback list behaves or a more traditional option object
+ *
+ * By default a callback list will act like an event callback list and can be
+ * "fired" multiple times.
+ *
+ * Possible options:
+ *
+ *	once:			will ensure the callback list can only be fired once (like a Deferred)
+ *
+ *	memory:			will keep track of previous values and will call any callback added
+ *					after the list has been fired right away with the latest "memorized"
+ *					values (like a Deferred)
+ *
+ *	unique:			will ensure a callback can only be added once (no duplicate in the list)
+ *
+ *	stopOnFalse:	interrupt callings when a callback returns false
+ *
+ */
+jQuery.Callbacks = function( options ) {
+
+	// Convert options from String-formatted to Object-formatted if needed
+	// (we check in cache first)
+	options = typeof options === "string" ?
+		( optionsCache[ options ] || createOptions( options ) ) :
+		jQuery.extend( {}, options );
+
+	var // Last fire value (for non-forgettable lists)
+		memory,
+		// Flag to know if list was already fired
+		fired,
+		// Flag to know if list is currently firing
+		firing,
+		// First callback to fire (used internally by add and fireWith)
+		firingStart,
+		// End of the loop when firing
+		firingLength,
+		// Index of currently firing callback (modified by remove if needed)
+		firingIndex,
+		// Actual callback list
+		list = [],
+		// Stack of fire calls for repeatable lists
+		stack = !options.once && [],
+		// Fire callbacks
+		fire = function( data ) {
+			memory = options.memory && data;
+			fired = true;
+			firingIndex = firingStart || 0;
+			firingStart = 0;
+			firingLength = list.length;
+			firing = true;
+			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
+				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
+					memory = false; // To prevent further calls using add
+					break;
+				}
+			}
+			firing = false;
+			if ( list ) {
+				if ( stack ) {
+					if ( stack.length ) {
+						fire( stack.shift() );
+					}
+				} else if ( memory ) {
+					list = [];
+				} else {
+					self.disable();
+				}
+			}
+		},
+		// Actual Callbacks object
+		self = {
+			// Add a callback or a collection of callbacks to the list
+			add: function() {
+				if ( list ) {
+					// First, we save the current length
+					var start = list.length;
+					(function add( args ) {
+						jQuery.each( args, function( _, arg ) {
+							var type = jQuery.type( arg );
+							if ( type === "function" ) {
+								if ( !options.unique || !self.has( arg ) ) {
+									list.push( arg );
+								}
+							} else if ( arg && arg.length && type !== "string" ) {
+								// Inspect recursively
+								add( arg );
+							}
+						});
+					})( arguments );
+					// Do we need to add the callbacks to the
+					// current firing batch?
+					if ( firing ) {
+						firingLength = list.length;
+					// With memory, if we're not firing then
+					// we should call right away
+					} else if ( memory ) {
+						firingStart = start;
+						fire( memory );
+					}
+				}
+				return this;
+			},
+			// Remove a callback from the list
+			remove: function() {
+				if ( list ) {
+					jQuery.each( arguments, function( _, arg ) {
+						var index;
+						while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
+							list.splice( index, 1 );
+							// Handle firing indexes
+							if ( firing ) {
+								if ( index <= firingLength ) {
+									firingLength--;
+								}
+								if ( index <= firingIndex ) {
+									firingIndex--;
+								}
+							}
+						}
+					});
+				}
+				return this;
+			},
+			// Check if a given callback is in the list.
+			// If no argument is given, return whether or not list has callbacks attached.
+			has: function( fn ) {
+				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
+			},
+			// Remove all callbacks from the list
+			empty: function() {
+				list = [];
+				firingLength = 0;
+				return this;
+			},
+			// Have the list do nothing anymore
+			disable: function() {
+				list = stack = memory = undefined;
+				return this;
+			},
+			// Is it disabled?
+			disabled: function() {
+				return !list;
+			},
+			// Lock the list in its current state
+			lock: function() {
+				stack = undefined;
+				if ( !memory ) {
+					self.disable();
+				}
+				return this;
+			},
+			// Is it locked?
+			locked: function() {
+				return !stack;
+			},
+			// Call all callbacks with the given context and arguments
+			fireWith: function( context, args ) {
+				if ( list && ( !fired || stack ) ) {
+					args = args || [];
+					args = [ context, args.slice ? args.slice() : args ];
+					if ( firing ) {
+						stack.push( args );
+					} else {
+						fire( args );
+					}
+				}
+				return this;
+			},
+			// Call all the callbacks with the given arguments
+			fire: function() {
+				self.fireWith( this, arguments );
+				return this;
+			},
+			// To know if the callbacks have already been called at least once
+			fired: function() {
+				return !!fired;
+			}
+		};
+
+	return self;
+};
+
+
+jQuery.extend({
+
+	Deferred: function( func ) {
+		var tuples = [
+				// action, add listener, listener list, final state
+				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
+				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
+				[ "notify", "progress", jQuery.Callbacks("memory") ]
+			],
+			state = "pending",
+			promise = {
+				state: function() {
+					return state;
+				},
+				always: function() {
+					deferred.done( arguments ).fail( arguments );
+					return this;
+				},
+				then: function( /* fnDone, fnFail, fnProgress */ ) {
+					var fns = arguments;
+					return jQuery.Deferred(function( newDefer ) {
+						jQuery.each( tuples, function( i, tuple ) {
+							var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+							// deferred[ done | fail | progress ] for forwarding actions to newDefer
+							deferred[ tuple[1] ](function() {
+								var returned = fn && fn.apply( this, arguments );
+								if ( returned && jQuery.isFunction( returned.promise ) ) {
+									returned.promise()
+										.done( newDefer.resolve )
+										.fail( newDefer.reject )
+										.progress( newDefer.notify );
+								} else {
+									newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
+								}
+							});
+						});
+						fns = null;
+					}).promise();
+				},
+				// Get a promise for this deferred
+				// If obj is provided, the promise aspect is added to the object
+				promise: function( obj ) {
+					return obj != null ? jQuery.extend( obj, promise ) : promise;
+				}
+			},
+			deferred = {};
+
+		// Keep pipe for back-compat
+		promise.pipe = promise.then;
+
+		// Add list-specific methods
+		jQuery.each( tuples, function( i, tuple ) {
+			var list = tuple[ 2 ],
+				stateString = tuple[ 3 ];
+
+			// promise[ done | fail | progress ] = list.add
+			promise[ tuple[1] ] = list.add;
+
+			// Handle state
+			if ( stateString ) {
+				list.add(function() {
+					// state = [ resolved | rejected ]
+					state = stateString;
+
+				// [ reject_list | resolve_list ].disable; progress_list.lock
+				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
+			}
+
+			// deferred[ resolve | reject | notify ]
+			deferred[ tuple[0] ] = function() {
+				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
+				return this;
+			};
+			deferred[ tuple[0] + "With" ] = list.fireWith;
+		});
+
+		// Make the deferred a promise
+		promise.promise( deferred );
+
+		// Call given func if any
+		if ( func ) {
+			func.call( deferred, deferred );
+		}
+
+		// All done!
+		return deferred;
+	},
+
+	// Deferred helper
+	when: function( subordinate /* , ..., subordinateN */ ) {
+		var i = 0,
+			resolveValues = slice.call( arguments ),
+			length = resolveValues.length,
+
+			// the count of uncompleted subordinates
+			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
+
+			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
+			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
+
+			// Update function for both resolve and progress values
+			updateFunc = function( i, contexts, values ) {
+				return function( value ) {
+					contexts[ i ] = this;
+					values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
+					if ( values === progressValues ) {
+						deferred.notifyWith( contexts, values );
+					} else if ( !( --remaining ) ) {
+						deferred.resolveWith( contexts, values );
+					}
+				};
+			},
+
+			progressValues, progressContexts, resolveContexts;
+
+		// Add listeners to Deferred subordinates; treat others as resolved
+		if ( length > 1 ) {
+			progressValues = new Array( length );
+			progressContexts = new Array( length );
+			resolveContexts = new Array( length );
+			for ( ; i < length; i++ ) {
+				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
+					resolveValues[ i ].promise()
+						.done( updateFunc( i, resolveContexts, resolveValues ) )
+						.fail( deferred.reject )
+						.progress( updateFunc( i, progressContexts, progressValues ) );
+				} else {
+					--remaining;
+				}
+			}
+		}
+
+		// If we're not waiting on anything, resolve the master
+		if ( !remaining ) {
+			deferred.resolveWith( resolveContexts, resolveValues );
+		}
+
+		return deferred.promise();
+	}
+});
+
+
+// The deferred used on DOM ready
+var readyList;
+
+jQuery.fn.ready = function( fn ) {
+	// Add the callback
+	jQuery.ready.promise().done( fn );
+
+	return this;
+};
+
+jQuery.extend({
+	// Is the DOM ready to be used? Set to true once it occurs.
+	isReady: false,
+
+	// A counter to track how many items to wait for before
+	// the ready event fires. See #6781
+	readyWait: 1,
+
+	// Hold (or release) the ready event
+	holdReady: function( hold ) {
+		if ( hold ) {
+			jQuery.readyWait++;
+		} else {
+			jQuery.ready( true );
+		}
+	},
+
+	// Handle when the DOM is ready
+	ready: function( wait ) {
+
+		// Abort if there are pending holds or we're already ready
+		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
+			return;
+		}
+
+		// Remember that the DOM is ready
+		jQuery.isReady = true;
+
+		// If a normal DOM Ready event fired, decrement, and wait if need be
+		if ( wait !== true && --jQuery.readyWait > 0 ) {
+			return;
+		}
+
+		// If there are functions bound, to execute
+		readyList.resolveWith( document, [ jQuery ] );
+
+		// Trigger any bound ready events
+		if ( jQuery.fn.triggerHandler ) {
+			jQuery( document ).triggerHandler( "ready" );
+			jQuery( document ).off( "ready" );
+		}
+	}
+});
+
+/**
+ * The ready event handler and self cleanup method
+ */
+function completed() {
+	document.removeEventListener( "DOMContentLoaded", completed, false );
+	window.removeEventListener( "load", completed, false );
+	jQuery.ready();
+}
+
+jQuery.ready.promise = function( obj ) {
+	if ( !readyList ) {
+
+		readyList = jQuery.Deferred();
+
+		// Catch cases where $(document).ready() is called after the browser event has already occurred.
+		// We once tried to use readyState "interactive" here, but it caused issues like the one
+		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
+		if ( document.readyState === "complete" ) {
+			// Handle it asynchronously to allow scripts the opportunity to delay ready
+			setTimeout( jQuery.ready );
+
+		} else {
+
+			// Use the handy event callback
+			document.addEventListener( "DOMContentLoaded", completed, false );
+
+			// A fallback to window.onload, that will always work
+			window.addEventListener( "load", completed, false );
+		}
+	}
+	return readyList.promise( obj );
+};
+
+// Kick off the DOM ready check even if the user does not
+jQuery.ready.promise();
+
+
+
+
+// Multifunctional method to get and set values of a collection
+// The value/s can optionally be executed if it's a function
+var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
+	var i = 0,
+		len = elems.length,
+		bulk = key == null;
+
+	// Sets many values
+	if ( jQuery.type( key ) === "object" ) {
+		chainable = true;
+		for ( i in key ) {
+			jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
+		}
+
+	// Sets one value
+	} else if ( value !== undefined ) {
+		chainable = true;
+
+		if ( !jQuery.isFunction( value ) ) {
+			raw = true;
+		}
+
+		if ( bulk ) {
+			// Bulk operations run against the entire set
+			if ( raw ) {
+				fn.call( elems, value );
+				fn = null;
+
+			// ...except when executing function values
+			} else {
+				bulk = fn;
+				fn = function( elem, key, value ) {
+					return bulk.call( jQuery( elem ), value );
+				};
+			}
+		}
+
+		if ( fn ) {
+			for ( ; i < len; i++ ) {
+				fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
+			}
+		}
+	}
+
+	return chainable ?
+		elems :
+
+		// Gets
+		bulk ?
+			fn.call( elems ) :
+			len ? fn( elems[0], key ) : emptyGet;
+};
+
+
+/**
+ * Determines whether an object can have data
+ */
+jQuery.acceptData = function( owner ) {
+	// Accepts only:
+	//  - Node
+	//    - Node.ELEMENT_NODE
+	//    - Node.DOCUMENT_NODE
+	//  - Object
+	//    - Any
+	/* jshint -W018 */
+	return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
+};
+
+
+function Data() {
+	// Support: Android<4,
+	// Old WebKit does not have Object.preventExtensions/freeze method,
+	// return new empty object instead with no [[set]] accessor
+	Object.defineProperty( this.cache = {}, 0, {
+		get: function() {
+			return {};
+		}
+	});
+
+	this.expando = jQuery.expando + Data.uid++;
+}
+
+Data.uid = 1;
+Data.accepts = jQuery.acceptData;
+
+Data.prototype = {
+	key: function( owner ) {
+		// We can accept data for non-element nodes in modern browsers,
+		// but we should not, see #8335.
+		// Always return the key for a frozen object.
+		if ( !Data.accepts( owner ) ) {
+			return 0;
+		}
+
+		var descriptor = {},
+			// Check if the owner object already has a cache key
+			unlock = owner[ this.expando ];
+
+		// If not, create one
+		if ( !unlock ) {
+			unlock = Data.uid++;
+
+			// Secure it in a non-enumerable, non-writable property
+			try {
+				descriptor[ this.expando ] = { value: unlock };
+				Object.defineProperties( owner, descriptor );
+
+			// Support: Android<4
+			// Fallback to a less secure definition
+			} catch ( e ) {
+				descriptor[ this.expando ] = unlock;
+				jQuery.extend( owner, descriptor );
+			}
+		}
+
+		// Ensure the cache object
+		if ( !this.cache[ unlock ] ) {
+			this.cache[ unlock ] = {};
+		}
+
+		return unlock;
+	},
+	set: function( owner, data, value ) {
+		var prop,
+			// There may be an unlock assigned to this node,
+			// if there is no entry for this "owner", create one inline
+			// and set the unlock as though an owner entry had always existed
+			unlock = this.key( owner ),
+			cache = this.cache[ unlock ];
+
+		// Handle: [ owner, key, value ] args
+		if ( typeof data === "string" ) {
+			cache[ data ] = value;
+
+		// Handle: [ owner, { properties } ] args
+		} else {
+			// Fresh assignments by object are shallow copied
+			if ( jQuery.isEmptyObject( cache ) ) {
+				jQuery.extend( this.cache[ unlock ], data );
+			// Otherwise, copy the properties one-by-one to the cache object
+			} else {
+				for ( prop in data ) {
+					cache[ prop ] = data[ prop ];
+				}
+			}
+		}
+		return cache;
+	},
+	get: function( owner, key ) {
+		// Either a valid cache is found, or will be created.
+		// New caches will be created and the unlock returned,
+		// allowing direct access to the newly created
+		// empty data object. A valid owner object must be provided.
+		var cache = this.cache[ this.key( owner ) ];
+
+		return key === undefined ?
+			cache : cache[ key ];
+	},
+	access: function( owner, key, value ) {
+		var stored;
+		// In cases where either:
+		//
+		//   1. No key was specified
+		//   2. A string key was specified, but no value provided
+		//
+		// Take the "read" path and allow the get method to determine
+		// which value to return, respectively either:
+		//
+		//   1. The entire cache object
+		//   2. The data stored at the key
+		//
+		if ( key === undefined ||
+				((key && typeof key === "string") && value === undefined) ) {
+
+			stored = this.get( owner, key );
+
+			return stored !== undefined ?
+				stored : this.get( owner, jQuery.camelCase(key) );
+		}
+
+		// [*]When the key is not a string, or both a key and value
+		// are specified, set or extend (existing objects) with either:
+		//
+		//   1. An object of properties
+		//   2. A key and value
+		//
+		this.set( owner, key, value );
+
+		// Since the "set" path can have two possible entry points
+		// return the expected data based on which path was taken[*]
+		return value !== undefined ? value : key;
+	},
+	remove: function( owner, key ) {
+		var i, name, camel,
+			unlock = this.key( owner ),
+			cache = this.cache[ unlock ];
+
+		if ( key === undefined ) {
+			this.cache[ unlock ] = {};
+
+		} else {
+			// Support array or space separated string of keys
+			if ( jQuery.isArray( key ) ) {
+				// If "name" is an array of keys...
+				// When data is initially created, via ("key", "val") signature,
+				// keys will be converted to camelCase.
+				// Since there is no way to tell _how_ a key was added, remove
+				// both plain key and camelCase key. #12786
+				// This will only penalize the array argument path.
+				name = key.concat( key.map( jQuery.camelCase ) );
+			} else {
+				camel = jQuery.camelCase( key );
+				// Try the string as a key before any manipulation
+				if ( key in cache ) {
+					name = [ key, camel ];
+				} else {
+					// If a key with the spaces exists, use it.
+					// Otherwise, create an array by matching non-whitespace
+					name = camel;
+					name = name in cache ?
+						[ name ] : ( name.match( rnotwhite ) || [] );
+				}
+			}
+
+			i = name.length;
+			while ( i-- ) {
+				delete cache[ name[ i ] ];
+			}
+		}
+	},
+	hasData: function( owner ) {
+		return !jQuery.isEmptyObject(
+			this.cache[ owner[ this.expando ] ] || {}
+		);
+	},
+	discard: function( owner ) {
+		if ( owner[ this.expando ] ) {
+			delete this.cache[ owner[ this.expando ] ];
+		}
+	}
+};
+var data_priv = new Data();
+
+var data_user = new Data();
+
+
+
+//	Implementation Summary
+//
+//	1. Enforce API surface and semantic compatibility with 1.9.x branch
+//	2. Improve the module's maintainability by reducing the storage
+//		paths to a single mechanism.
+//	3. Use the same single mechanism to support "private" and "user" data.
+//	4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData)
+//	5. Avoid exposing implementation details on user objects (eg. expando properties)
+//	6. Provide a clear path for implementation upgrade to WeakMap in 2014
+
+var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
+	rmultiDash = /([A-Z])/g;
+
+function dataAttr( elem, key, data ) {
+	var name;
+
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+		name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
+		data = elem.getAttribute( name );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = data === "true" ? true :
+					data === "false" ? false :
+					data === "null" ? null :
+					// Only convert to a number if it doesn't change the string
+					+data + "" === data ? +data :
+					rbrace.test( data ) ? jQuery.parseJSON( data ) :
+					data;
+			} catch( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			data_user.set( elem, key, data );
+		} else {
+			data = undefined;
+		}
+	}
+	return data;
+}
+
+jQuery.extend({
+	hasData: function( elem ) {
+		return data_user.hasData( elem ) || data_priv.hasData( elem );
+	},
+
+	data: function( elem, name, data ) {
+		return data_user.access( elem, name, data );
+	},
+
+	removeData: function( elem, name ) {
+		data_user.remove( elem, name );
+	},
+
+	// TODO: Now that all calls to _data and _removeData have been replaced
+	// with direct calls to data_priv methods, these can be deprecated.
+	_data: function( elem, name, data ) {
+		return data_priv.access( elem, name, data );
+	},
+
+	_removeData: function( elem, name ) {
+		data_priv.remove( elem, name );
+	}
+});
+
+jQuery.fn.extend({
+	data: function( key, value ) {
+		var i, name, data,
+			elem = this[ 0 ],
+			attrs = elem && elem.attributes;
+
+		// Gets all values
+		if ( key === undefined ) {
+			if ( this.length ) {
+				data = data_user.get( elem );
+
+				if ( elem.nodeType === 1 && !data_priv.get( elem, "hasDataAttrs" ) ) {
+					i = attrs.length;
+					while ( i-- ) {
+
+						// Support: IE11+
+						// The attrs elements can be null (#14894)
+						if ( attrs[ i ] ) {
+							name = attrs[ i ].name;
+							if ( name.indexOf( "data-" ) === 0 ) {
+								name = jQuery.camelCase( name.slice(5) );
+								dataAttr( elem, name, data[ name ] );
+							}
+						}
+					}
+					data_priv.set( elem, "hasDataAttrs", true );
+				}
+			}
+
+			return data;
+		}
+
+		// Sets multiple values
+		if ( typeof key === "object" ) {
+			return this.each(function() {
+				data_user.set( this, key );
+			});
+		}
+
+		return access( this, function( value ) {
+			var data,
+				camelKey = jQuery.camelCase( key );
+
+			// The calling jQuery object (element matches) is not empty
+			// (and therefore has an element appears at this[ 0 ]) and the
+			// `value` parameter was not undefined. An empty jQuery object
+			// will result in `undefined` for elem = this[ 0 ] which will
+			// throw an exception if an attempt to read a data cache is made.
+			if ( elem && value === undefined ) {
+				// Attempt to get data from the cache
+				// with the key as-is
+				data = data_user.get( elem, key );
+				if ( data !== undefined ) {
+					return data;
+				}
+
+				// Attempt to get data from the cache
+				// with the key camelized
+				data = data_user.get( elem, camelKey );
+				if ( data !== undefined ) {
+					return data;
+				}
+
+				// Attempt to "discover" the data in
+				// HTML5 custom data-* attrs
+				data = dataAttr( elem, camelKey, undefined );
+				if ( data !== undefined ) {
+					return data;
+				}
+
+				// We tried really hard, but the data doesn't exist.
+				return;
+			}
+
+			// Set the data...
+			this.each(function() {
+				// First, attempt to store a copy or reference of any
+				// data that might've been store with a camelCased key.
+				var data = data_user.get( this, camelKey );
+
+				// For HTML5 data-* attribute interop, we have to
+				// store property names with dashes in a camelCase form.
+				// This might not apply to all properties...*
+				data_user.set( this, camelKey, value );
+
+				// *... In the case of properties that might _actually_
+				// have dashes, we need to also store a copy of that
+				// unchanged property.
+				if ( key.indexOf("-") !== -1 && data !== undefined ) {
+					data_user.set( this, key, value );
+				}
+			});
+		}, null, value, arguments.length > 1, null, true );
+	},
+
+	removeData: function( key ) {
+		return this.each(function() {
+			data_user.remove( this, key );
+		});
+	}
+});
+
+
+jQuery.extend({
+	queue: function( elem, type, data ) {
+		var queue;
+
+		if ( elem ) {
+			type = ( type || "fx" ) + "queue";
+			queue = data_priv.get( elem, type );
+
+			// Speed up dequeue by getting out quickly if this is just a lookup
+			if ( data ) {
+				if ( !queue || jQuery.isArray( data ) ) {
+					queue = data_priv.access( elem, type, jQuery.makeArray(data) );
+				} else {
+					queue.push( data );
+				}
+			}
+			return queue || [];
+		}
+	},
+
+	dequeue: function( elem, type ) {
+		type = type || "fx";
+
+		var queue = jQuery.queue( elem, type ),
+			startLength = queue.length,
+			fn = queue.shift(),
+			hooks = jQuery._queueHooks( elem, type ),
+			next = function() {
+				jQuery.dequeue( elem, type );
+			};
+
+		// If the fx queue is dequeued, always remove the progress sentinel
+		if ( fn === "inprogress" ) {
+			fn = queue.shift();
+			startLength--;
+		}
+
+		if ( fn ) {
+
+			// Add a progress sentinel to prevent the fx queue from being
+			// automatically dequeued
+			if ( type === "fx" ) {
+				queue.unshift( "inprogress" );
+			}
+
+			// Clear up the last queue stop function
+			delete hooks.stop;
+			fn.call( elem, next, hooks );
+		}
+
+		if ( !startLength && hooks ) {
+			hooks.empty.fire();
+		}
+	},
+
+	// Not public - generate a queueHooks object, or return the current one
+	_queueHooks: function( elem, type ) {
+		var key = type + "queueHooks";
+		return data_priv.get( elem, key ) || data_priv.access( elem, key, {
+			empty: jQuery.Callbacks("once memory").add(function() {
+				data_priv.remove( elem, [ type + "queue", key ] );
+			})
+		});
+	}
+});
+
+jQuery.fn.extend({
+	queue: function( type, data ) {
+		var setter = 2;
+
+		if ( typeof type !== "string" ) {
+			data = type;
+			type = "fx";
+			setter--;
+		}
+
+		if ( arguments.length < setter ) {
+			return jQuery.queue( this[0], type );
+		}
+
+		return data === undefined ?
+			this :
+			this.each(function() {
+				var queue = jQuery.queue( this, type, data );
+
+				// Ensure a hooks for this queue
+				jQuery._queueHooks( this, type );
+
+				if ( type === "fx" && queue[0] !== "inprogress" ) {
+					jQuery.dequeue( this, type );
+				}
+			});
+	},
+	dequeue: function( type ) {
+		return this.each(function() {
+			jQuery.dequeue( this, type );
+		});
+	},
+	clearQueue: function( type ) {
+		return this.queue( type || "fx", [] );
+	},
+	// Get a promise resolved when queues of a certain type
+	// are emptied (fx is the type by default)
+	promise: function( type, obj ) {
+		var tmp,
+			count = 1,
+			defer = jQuery.Deferred(),
+			elements = this,
+			i = this.length,
+			resolve = function() {
+				if ( !( --count ) ) {
+					defer.resolveWith( elements, [ elements ] );
+				}
+			};
+
+		if ( typeof type !== "string" ) {
+			obj = type;
+			type = undefined;
+		}
+		type = type || "fx";
+
+		while ( i-- ) {
+			tmp = data_priv.get( elements[ i ], type + "queueHooks" );
+			if ( tmp && tmp.empty ) {
+				count++;
+				tmp.empty.add( resolve );
+			}
+		}
+		resolve();
+		return defer.promise( obj );
+	}
+});
+var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source;
+
+var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
+
+var isHidden = function( elem, el ) {
+		// isHidden might be called from jQuery#filter function;
+		// in that case, element will be second argument
+		elem = el || elem;
+		return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
+	};
+
+var rcheckableType = (/^(?:checkbox|radio)$/i);
+
+
+
+(function() {
+	var fragment = document.createDocumentFragment(),
+		div = fragment.appendChild( document.createElement( "div" ) ),
+		input = document.createElement( "input" );
+
+	// Support: Safari<=5.1
+	// Check state lost if the name is set (#11217)
+	// Support: Windows Web Apps (WWA)
+	// `name` and `type` must use .setAttribute for WWA (#14901)
+	input.setAttribute( "type", "radio" );
+	input.setAttribute( "checked", "checked" );
+	input.setAttribute( "name", "t" );
+
+	div.appendChild( input );
+
+	// Support: Safari<=5.1, Android<4.2
+	// Older WebKit doesn't clone checked state correctly in fragments
+	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+	// Support: IE<=11+
+	// Make sure textarea (and checkbox) defaultValue is properly cloned
+	div.innerHTML = "<textarea>x</textarea>";
+	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
+})();
+var strundefined = typeof undefined;
+
+
+
+support.focusinBubbles = "onfocusin" in window;
+
+
+var
+	rkeyEvent = /^key/,
+	rmouseEvent = /^(?:mouse|pointer|contextmenu)|click/,
+	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
+	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
+
+function returnTrue() {
+	return true;
+}
+
+function returnFalse() {
+	return false;
+}
+
+function safeActiveElement() {
+	try {
+		return document.activeElement;
+	} catch ( err ) { }
+}
+
+/*
+ * Helper functions for managing events -- not part of the public interface.
+ * Props to Dean Edwards' addEvent library for many of the ideas.
+ */
+jQuery.event = {
+
+	global: {},
+
+	add: function( elem, types, handler, data, selector ) {
+
+		var handleObjIn, eventHandle, tmp,
+			events, t, handleObj,
+			special, handlers, type, namespaces, origType,
+			elemData = data_priv.get( elem );
+
+		// Don't attach events to noData or text/comment nodes (but allow plain objects)
+		if ( !elemData ) {
+			return;
+		}
+
+		// Caller can pass in an object of custom data in lieu of the handler
+		if ( handler.handler ) {
+			handleObjIn = handler;
+			handler = handleObjIn.handler;
+			selector = handleObjIn.selector;
+		}
+
+		// Make sure that the handler has a unique ID, used to find/remove it later
+		if ( !handler.guid ) {
+			handler.guid = jQuery.guid++;
+		}
+
+		// Init the element's event structure and main handler, if this is the first
+		if ( !(events = elemData.events) ) {
+			events = elemData.events = {};
+		}
+		if ( !(eventHandle = elemData.handle) ) {
+			eventHandle = elemData.handle = function( e ) {
+				// Discard the second event of a jQuery.event.trigger() and
+				// when an event is called after a page has unloaded
+				return typeof jQuery !== strundefined && jQuery.event.triggered !== e.type ?
+					jQuery.event.dispatch.apply( elem, arguments ) : undefined;
+			};
+		}
+
+		// Handle multiple events separated by a space
+		types = ( types || "" ).match( rnotwhite ) || [ "" ];
+		t = types.length;
+		while ( t-- ) {
+			tmp = rtypenamespace.exec( types[t] ) || [];
+			type = origType = tmp[1];
+			namespaces = ( tmp[2] || "" ).split( "." ).sort();
+
+			// There *must* be a type, no attaching namespace-only handlers
+			if ( !type ) {
+				continue;
+			}
+
+			// If event changes its type, use the special event handlers for the changed type
+			special = jQuery.event.special[ type ] || {};
+
+			// If selector defined, determine special event api type, otherwise given type
+			type = ( selector ? special.delegateType : special.bindType ) || type;
+
+			// Update special based on newly reset type
+			special = jQuery.event.special[ type ] || {};
+
+			// handleObj is passed to all event handlers
+			handleObj = jQuery.extend({
+				type: type,
+				origType: origType,
+				data: data,
+				handler: handler,
+				guid: handler.guid,
+				selector: selector,
+				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
+				namespace: namespaces.join(".")
+			}, handleObjIn );
+
+			// Init the event handler queue if we're the first
+			if ( !(handlers = events[ type ]) ) {
+				handlers = events[ type ] = [];
+				handlers.delegateCount = 0;
+
+				// Only use addEventListener if the special events handler returns false
+				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+					if ( elem.addEventListener ) {
+						elem.addEventListener( type, eventHandle, false );
+					}
+				}
+			}
+
+			if ( special.add ) {
+				special.add.call( elem, handleObj );
+
+				if ( !handleObj.handler.guid ) {
+					handleObj.handler.guid = handler.guid;
+				}
+			}
+
+			// Add to the element's handler list, delegates in front
+			if ( selector ) {
+				handlers.splice( handlers.delegateCount++, 0, handleObj );
+			} else {
+				handlers.push( handleObj );
+			}
+
+			// Keep track of which events have ever been used, for event optimization
+			jQuery.event.global[ type ] = true;
+		}
+
+	},
+
+	// Detach an event or set of events from an element
+	remove: function( elem, types, handler, selector, mappedTypes ) {
+
+		var j, origCount, tmp,
+			events, t, handleObj,
+			special, handlers, type, namespaces, origType,
+			elemData = data_priv.hasData( elem ) && data_priv.get( elem );
+
+		if ( !elemData || !(events = elemData.events) ) {
+			return;
+		}
+
+		// Once for each type.namespace in types; type may be omitted
+		types = ( types || "" ).match( rnotwhite ) || [ "" ];
+		t = types.length;
+		while ( t-- ) {
+			tmp = rtypenamespace.exec( types[t] ) || [];
+			type = origType = tmp[1];
+			namespaces = ( tmp[2] || "" ).split( "." ).sort();
+
+			// Unbind all events (on this namespace, if provided) for the element
+			if ( !type ) {
+				for ( type in events ) {
+					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
+				}
+				continue;
+			}
+
+			special = jQuery.event.special[ type ] || {};
+			type = ( selector ? special.delegateType : special.bindType ) || type;
+			handlers = events[ type ] || [];
+			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
+
+			// Remove matching events
+			origCount = j = handlers.length;
+			while ( j-- ) {
+				handleObj = handlers[ j ];
+
+				if ( ( mappedTypes || origType === handleObj.origType ) &&
+					( !handler || handler.guid === handleObj.guid ) &&
+					( !tmp || tmp.test( handleObj.namespace ) ) &&
+					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
+					handlers.splice( j, 1 );
+
+					if ( handleObj.selector ) {
+						handlers.delegateCount--;
+					}
+					if ( special.remove ) {
+						special.remove.call( elem, handleObj );
+					}
+				}
+			}
+
+			// Remove generic event handler if we removed something and no more handlers exist
+			// (avoids potential for endless recursion during removal of special event handlers)
+			if ( origCount && !handlers.length ) {
+				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
+					jQuery.removeEvent( elem, type, elemData.handle );
+				}
+
+				delete events[ type ];
+			}
+		}
+
+		// Remove the expando if it's no longer used
+		if ( jQuery.isEmptyObject( events ) ) {
+			delete elemData.handle;
+			data_priv.remove( elem, "events" );
+		}
+	},
+
+	trigger: function( event, data, elem, onlyHandlers ) {
+
+		var i, cur, tmp, bubbleType, ontype, handle, special,
+			eventPath = [ elem || document ],
+			type = hasOwn.call( event, "type" ) ? event.type : event,
+			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
+
+		cur = tmp = elem = elem || document;
+
+		// Don't do events on text and comment nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		// focus/blur morphs to focusin/out; ensure we're not firing them right now
+		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
+			return;
+		}
+
+		if ( type.indexOf(".") >= 0 ) {
+			// Namespaced trigger; create a regexp to match event type in handle()
+			namespaces = type.split(".");
+			type = namespaces.shift();
+			namespaces.sort();
+		}
+		ontype = type.indexOf(":") < 0 && "on" + type;
+
+		// Caller can pass in a jQuery.Event object, Object, or just an event type string
+		event = event[ jQuery.expando ] ?
+			event :
+			new jQuery.Event( type, typeof event === "object" && event );
+
+		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
+		event.isTrigger = onlyHandlers ? 2 : 3;
+		event.namespace = namespaces.join(".");
+		event.namespace_re = event.namespace ?
+			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
+			null;
+
+		// Clean up the event in case it is being reused
+		event.result = undefined;
+		if ( !event.target ) {
+			event.target = elem;
+		}
+
+		// Clone any incoming data and prepend the event, creating the handler arg list
+		data = data == null ?
+			[ event ] :
+			jQuery.makeArray( data, [ event ] );
+
+		// Allow special events to draw outside the lines
+		special = jQuery.event.special[ type ] || {};
+		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
+			return;
+		}
+
+		// Determine event propagation path in advance, per W3C events spec (#9951)
+		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
+		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
+
+			bubbleType = special.delegateType || type;
+			if ( !rfocusMorph.test( bubbleType + type ) ) {
+				cur = cur.parentNode;
+			}
+			for ( ; cur; cur = cur.parentNode ) {
+				eventPath.push( cur );
+				tmp = cur;
+			}
+
+			// Only add window if we got to document (e.g., not plain obj or detached DOM)
+			if ( tmp === (elem.ownerDocument || document) ) {
+				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
+			}
+		}
+
+		// Fire handlers on the event path
+		i = 0;
+		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
+
+			event.type = i > 1 ?
+				bubbleType :
+				special.bindType || type;
+
+			// jQuery handler
+			handle = ( data_priv.get( cur, "events" ) || {} )[ event.type ] && data_priv.get( cur, "handle" );
+			if ( handle ) {
+				handle.apply( cur, data );
+			}
+
+			// Native handler
+			handle = ontype && cur[ ontype ];
+			if ( handle && handle.apply && jQuery.acceptData( cur ) ) {
+				event.result = handle.apply( cur, data );
+				if ( event.result === false ) {
+					event.preventDefault();
+				}
+			}
+		}
+		event.type = type;
+
+		// If nobody prevented the default action, do it now
+		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
+
+			if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
+				jQuery.acceptData( elem ) ) {
+
+				// Call a native DOM method on the target with the same name name as the event.
+				// Don't do default actions on window, that's where global variables be (#6170)
+				if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) {
+
+					// Don't re-trigger an onFOO event when we call its FOO() method
+					tmp = elem[ ontype ];
+
+					if ( tmp ) {
+						elem[ ontype ] = null;
+					}
+
+					// Prevent re-triggering of the same event, since we already bubbled it above
+					jQuery.event.triggered = type;
+					elem[ type ]();
+					jQuery.event.triggered = undefined;
+
+					if ( tmp ) {
+						elem[ ontype ] = tmp;
+					}
+				}
+			}
+		}
+
+		return event.result;
+	},
+
+	dispatch: function( event ) {
+
+		// Make a writable jQuery.Event from the native event object
+		event = jQuery.event.fix( event );
+
+		var i, j, ret, matched, handleObj,
+			handlerQueue = [],
+			args = slice.call( arguments ),
+			handlers = ( data_priv.get( this, "events" ) || {} )[ event.type ] || [],
+			special = jQuery.event.special[ event.type ] || {};
+
+		// Use the fix-ed jQuery.Event rather than the (read-only) native event
+		args[0] = event;
+		event.delegateTarget = this;
+
+		// Call the preDispatch hook for the mapped type, and let it bail if desired
+		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
+			return;
+		}
+
+		// Determine handlers
+		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
+
+		// Run delegates first; they may want to stop propagation beneath us
+		i = 0;
+		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
+			event.currentTarget = matched.elem;
+
+			j = 0;
+			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
+
+				// Triggered event must either 1) have no namespace, or 2) have namespace(s)
+				// a subset or equal to those in the bound event (both can have no namespace).
+				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
+
+					event.handleObj = handleObj;
+					event.data = handleObj.data;
+
+					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
+							.apply( matched.elem, args );
+
+					if ( ret !== undefined ) {
+						if ( (event.result = ret) === false ) {
+							event.preventDefault();
+							event.stopPropagation();
+						}
+					}
+				}
+			}
+		}
+
+		// Call the postDispatch hook for the mapped type
+		if ( special.postDispatch ) {
+			special.postDispatch.call( this, event );
+		}
+
+		return event.result;
+	},
+
+	handlers: function( event, handlers ) {
+		var i, matches, sel, handleObj,
+			handlerQueue = [],
+			delegateCount = handlers.delegateCount,
+			cur = event.target;
+
+		// Find delegate handlers
+		// Black-hole SVG <use> instance trees (#13180)
+		// Avoid non-left-click bubbling in Firefox (#3861)
+		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
+
+			for ( ; cur !== this; cur = cur.parentNode || this ) {
+
+				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
+				if ( cur.disabled !== true || event.type !== "click" ) {
+					matches = [];
+					for ( i = 0; i < delegateCount; i++ ) {
+						handleObj = handlers[ i ];
+
+						// Don't conflict with Object.prototype properties (#13203)
+						sel = handleObj.selector + " ";
+
+						if ( matches[ sel ] === undefined ) {
+							matches[ sel ] = handleObj.needsContext ?
+								jQuery( sel, this ).index( cur ) >= 0 :
+								jQuery.find( sel, this, null, [ cur ] ).length;
+						}
+						if ( matches[ sel ] ) {
+							matches.push( handleObj );
+						}
+					}
+					if ( matches.length ) {
+						handlerQueue.push({ elem: cur, handlers: matches });
+					}
+				}
+			}
+		}
+
+		// Add the remaining (directly-bound) handlers
+		if ( delegateCount < handlers.length ) {
+			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
+		}
+
+		return handlerQueue;
+	},
+
+	// Includes some event props shared by KeyEvent and MouseEvent
+	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
+
+	fixHooks: {},
+
+	keyHooks: {
+		props: "char charCode key keyCode".split(" "),
+		filter: function( event, original ) {
+
+			// Add which for key events
+			if ( event.which == null ) {
+				event.which = original.charCode != null ? original.charCode : original.keyCode;
+			}
+
+			return event;
+		}
+	},
+
+	mouseHooks: {
+		props: "button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
+		filter: function( event, original ) {
+			var eventDoc, doc, body,
+				button = original.button;
+
+			// Calculate pageX/Y if missing and clientX/Y available
+			if ( event.pageX == null && original.clientX != null ) {
+				eventDoc = event.target.ownerDocument || document;
+				doc = eventDoc.documentElement;
+				body = eventDoc.body;
+
+				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
+				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
+			}
+
+			// Add which for click: 1 === left; 2 === middle; 3 === right
+			// Note: button is not normalized, so don't use it
+			if ( !event.which && button !== undefined ) {
+				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
+			}
+
+			return event;
+		}
+	},
+
+	fix: function( event ) {
+		if ( event[ jQuery.expando ] ) {
+			return event;
+		}
+
+		// Create a writable copy of the event object and normalize some properties
+		var i, prop, copy,
+			type = event.type,
+			originalEvent = event,
+			fixHook = this.fixHooks[ type ];
+
+		if ( !fixHook ) {
+			this.fixHooks[ type ] = fixHook =
+				rmouseEvent.test( type ) ? this.mouseHooks :
+				rkeyEvent.test( type ) ? this.keyHooks :
+				{};
+		}
+		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
+
+		event = new jQuery.Event( originalEvent );
+
+		i = copy.length;
+		while ( i-- ) {
+			prop = copy[ i ];
+			event[ prop ] = originalEvent[ prop ];
+		}
+
+		// Support: Cordova 2.5 (WebKit) (#13255)
+		// All events should have a target; Cordova deviceready doesn't
+		if ( !event.target ) {
+			event.target = document;
+		}
+
+		// Support: Safari 6.0+, Chrome<28
+		// Target should not be a text node (#504, #13143)
+		if ( event.target.nodeType === 3 ) {
+			event.target = event.target.parentNode;
+		}
+
+		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
+	},
+
+	special: {
+		load: {
+			// Prevent triggered image.load events from bubbling to window.load
+			noBubble: true
+		},
+		focus: {
+			// Fire native event if possible so blur/focus sequence is correct
+			trigger: function() {
+				if ( this !== safeActiveElement() && this.focus ) {
+					this.focus();
+					return false;
+				}
+			},
+			delegateType: "focusin"
+		},
+		blur: {
+			trigger: function() {
+				if ( this === safeActiveElement() && this.blur ) {
+					this.blur();
+					return false;
+				}
+			},
+			delegateType: "focusout"
+		},
+		click: {
+			// For checkbox, fire native event so checked state will be right
+			trigger: function() {
+				if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) {
+					this.click();
+					return false;
+				}
+			},
+
+			// For cross-browser consistency, don't fire native .click() on links
+			_default: function( event ) {
+				return jQuery.nodeName( event.target, "a" );
+			}
+		},
+
+		beforeunload: {
+			postDispatch: function( event ) {
+
+				// Support: Firefox 20+
+				// Firefox doesn't alert if the returnValue field is not set.
+				if ( event.result !== undefined && event.originalEvent ) {
+					event.originalEvent.returnValue = event.result;
+				}
+			}
+		}
+	},
+
+	simulate: function( type, elem, event, bubble ) {
+		// Piggyback on a donor event to simulate a different one.
+		// Fake originalEvent to avoid donor's stopPropagation, but if the
+		// simulated event prevents default then we do the same on the donor.
+		var e = jQuery.extend(
+			new jQuery.Event(),
+			event,
+			{
+				type: type,
+				isSimulated: true,
+				originalEvent: {}
+			}
+		);
+		if ( bubble ) {
+			jQuery.event.trigger( e, null, elem );
+		} else {
+			jQuery.event.dispatch.call( elem, e );
+		}
+		if ( e.isDefaultPrevented() ) {
+			event.preventDefault();
+		}
+	}
+};
+
+jQuery.removeEvent = function( elem, type, handle ) {
+	if ( elem.removeEventListener ) {
+		elem.removeEventListener( type, handle, false );
+	}
+};
+
+jQuery.Event = function( src, props ) {
+	// Allow instantiation without the 'new' keyword
+	if ( !(this instanceof jQuery.Event) ) {
+		return new jQuery.Event( src, props );
+	}
+
+	// Event object
+	if ( src && src.type ) {
+		this.originalEvent = src;
+		this.type = src.type;
+
+		// Events bubbling up the document may have been marked as prevented
+		// by a handler lower down the tree; reflect the correct value.
+		this.isDefaultPrevented = src.defaultPrevented ||
+				src.defaultPrevented === undefined &&
+				// Support: Android<4.0
+				src.returnValue === false ?
+			returnTrue :
+			returnFalse;
+
+	// Event type
+	} else {
+		this.type = src;
+	}
+
+	// Put explicitly provided properties onto the event object
+	if ( props ) {
+		jQuery.extend( this, props );
+	}
+
+	// Create a timestamp if incoming event doesn't have one
+	this.timeStamp = src && src.timeStamp || jQuery.now();
+
+	// Mark it as fixed
+	this[ jQuery.expando ] = true;
+};
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+	isDefaultPrevented: returnFalse,
+	isPropagationStopped: returnFalse,
+	isImmediatePropagationStopped: returnFalse,
+
+	preventDefault: function() {
+		var e = this.originalEvent;
+
+		this.isDefaultPrevented = returnTrue;
+
+		if ( e && e.preventDefault ) {
+			e.preventDefault();
+		}
+	},
+	stopPropagation: function() {
+		var e = this.originalEvent;
+
+		this.isPropagationStopped = returnTrue;
+
+		if ( e && e.stopPropagation ) {
+			e.stopPropagation();
+		}
+	},
+	stopImmediatePropagation: function() {
+		var e = this.originalEvent;
+
+		this.isImmediatePropagationStopped = returnTrue;
+
+		if ( e && e.stopImmediatePropagation ) {
+			e.stopImmediatePropagation();
+		}
+
+		this.stopPropagation();
+	}
+};
+
+// Create mouseenter/leave events using mouseover/out and event-time checks
+// Support: Chrome 15+
+jQuery.each({
+	mouseenter: "mouseover",
+	mouseleave: "mouseout",
+	pointerenter: "pointerover",
+	pointerleave: "pointerout"
+}, function( orig, fix ) {
+	jQuery.event.special[ orig ] = {
+		delegateType: fix,
+		bindType: fix,
+
+		handle: function( event ) {
+			var ret,
+				target = this,
+				related = event.relatedTarget,
+				handleObj = event.handleObj;
+
+			// For mousenter/leave call the handler if related is outside the target.
+			// NB: No relatedTarget if the mouse left/entered the browser window
+			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
+				event.type = handleObj.origType;
+				ret = handleObj.handler.apply( this, arguments );
+				event.type = fix;
+			}
+			return ret;
+		}
+	};
+});
+
+// Support: Firefox, Chrome, Safari
+// Create "bubbling" focus and blur events
+if ( !support.focusinBubbles ) {
+	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+
+		// Attach a single capturing handler on the document while someone wants focusin/focusout
+		var handler = function( event ) {
+				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
+			};
+
+		jQuery.event.special[ fix ] = {
+			setup: function() {
+				var doc = this.ownerDocument || this,
+					attaches = data_priv.access( doc, fix );
+
+				if ( !attaches ) {
+					doc.addEventListener( orig, handler, true );
+				}
+				data_priv.access( doc, fix, ( attaches || 0 ) + 1 );
+			},
+			teardown: function() {
+				var doc = this.ownerDocument || this,
+					attaches = data_priv.access( doc, fix ) - 1;
+
+				if ( !attaches ) {
+					doc.removeEventListener( orig, handler, true );
+					data_priv.remove( doc, fix );
+
+				} else {
+					data_priv.access( doc, fix, attaches );
+				}
+			}
+		};
+	});
+}
+
+jQuery.fn.extend({
+
+	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
+		var origFn, type;
+
+		// Types can be a map of types/handlers
+		if ( typeof types === "object" ) {
+			// ( types-Object, selector, data )
+			if ( typeof selector !== "string" ) {
+				// ( types-Object, data )
+				data = data || selector;
+				selector = undefined;
+			}
+			for ( type in types ) {
+				this.on( type, selector, data, types[ type ], one );
+			}
+			return this;
+		}
+
+		if ( data == null && fn == null ) {
+			// ( types, fn )
+			fn = selector;
+			data = selector = undefined;
+		} else if ( fn == null ) {
+			if ( typeof selector === "string" ) {
+				// ( types, selector, fn )
+				fn = data;
+				data = undefined;
+			} else {
+				// ( types, data, fn )
+				fn = data;
+				data = selector;
+				selector = undefined;
+			}
+		}
+		if ( fn === false ) {
+			fn = returnFalse;
+		} else if ( !fn ) {
+			return this;
+		}
+
+		if ( one === 1 ) {
+			origFn = fn;
+			fn = function( event ) {
+				// Can use an empty set, since event contains the info
+				jQuery().off( event );
+				return origFn.apply( this, arguments );
+			};
+			// Use same guid so caller can remove using origFn
+			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
+		}
+		return this.each( function() {
+			jQuery.event.add( this, types, fn, data, selector );
+		});
+	},
+	one: function( types, selector, data, fn ) {
+		return this.on( types, selector, data, fn, 1 );
+	},
+	off: function( types, selector, fn ) {
+		var handleObj, type;
+		if ( types && types.preventDefault && types.handleObj ) {
+			// ( event )  dispatched jQuery.Event
+			handleObj = types.handleObj;
+			jQuery( types.delegateTarget ).off(
+				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
+				handleObj.selector,
+				handleObj.handler
+			);
+			return this;
+		}
+		if ( typeof types === "object" ) {
+			// ( types-object [, selector] )
+			for ( type in types ) {
+				this.off( type, selector, types[ type ] );
+			}
+			return this;
+		}
+		if ( selector === false || typeof selector === "function" ) {
+			// ( types [, fn] )
+			fn = selector;
+			selector = undefined;
+		}
+		if ( fn === false ) {
+			fn = returnFalse;
+		}
+		return this.each(function() {
+			jQuery.event.remove( this, types, fn, selector );
+		});
+	},
+
+	trigger: function( type, data ) {
+		return this.each(function() {
+			jQuery.event.trigger( type, data, this );
+		});
+	},
+	triggerHandler: function( type, data ) {
+		var elem = this[0];
+		if ( elem ) {
+			return jQuery.event.trigger( type, data, elem, true );
+		}
+	}
+});
+
+
+var
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
+	rtagName = /<([\w:]+)/,
+	rhtml = /<|&#?\w+;/,
+	rnoInnerhtml = /<(?:script|style|link)/i,
+	// checked="checked" or checked
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+	rscriptType = /^$|\/(?:java|ecma)script/i,
+	rscriptTypeMasked = /^true\/(.*)/,
+	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
+
+	// We have to close these tags to support XHTML (#13200)
+	wrapMap = {
+
+		// Support: IE9
+		option: [ 1, "<select multiple='multiple'>", "</select>" ],
+
+		thead: [ 1, "<table>", "</table>" ],
+		col: [ 2, "<table><colgroup>", "</colgroup></table>" ],
+		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+
+		_default: [ 0, "", "" ]
+	};
+
+// Support: IE9
+wrapMap.optgroup = wrapMap.option;
+
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+// Support: 1.x compatibility
+// Manipulating tables requires a tbody
+function manipulationTarget( elem, content ) {
+	return jQuery.nodeName( elem, "table" ) &&
+		jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ?
+
+		elem.getElementsByTagName("tbody")[0] ||
+			elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
+		elem;
+}
+
+// Replace/restore the type attribute of script elements for safe DOM manipulation
+function disableScript( elem ) {
+	elem.type = (elem.getAttribute("type") !== null) + "/" + elem.type;
+	return elem;
+}
+function restoreScript( elem ) {
+	var match = rscriptTypeMasked.exec( elem.type );
+
+	if ( match ) {
+		elem.type = match[ 1 ];
+	} else {
+		elem.removeAttribute("type");
+	}
+
+	return elem;
+}
+
+// Mark scripts as having already been evaluated
+function setGlobalEval( elems, refElements ) {
+	var i = 0,
+		l = elems.length;
+
+	for ( ; i < l; i++ ) {
+		data_priv.set(
+			elems[ i ], "globalEval", !refElements || data_priv.get( refElements[ i ], "globalEval" )
+		);
+	}
+}
+
+function cloneCopyEvent( src, dest ) {
+	var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events;
+
+	if ( dest.nodeType !== 1 ) {
+		return;
+	}
+
+	// 1. Copy private data: events, handlers, etc.
+	if ( data_priv.hasData( src ) ) {
+		pdataOld = data_priv.access( src );
+		pdataCur = data_priv.set( dest, pdataOld );
+		events = pdataOld.events;
+
+		if ( events ) {
+			delete pdataCur.handle;
+			pdataCur.events = {};
+
+			for ( type in events ) {
+				for ( i = 0, l = events[ type ].length; i < l; i++ ) {
+					jQuery.event.add( dest, type, events[ type ][ i ] );
+				}
+			}
+		}
+	}
+
+	// 2. Copy user data
+	if ( data_user.hasData( src ) ) {
+		udataOld = data_user.access( src );
+		udataCur = jQuery.extend( {}, udataOld );
+
+		data_user.set( dest, udataCur );
+	}
+}
+
+function getAll( context, tag ) {
+	var ret = context.getElementsByTagName ? context.getElementsByTagName( tag || "*" ) :
+			context.querySelectorAll ? context.querySelectorAll( tag || "*" ) :
+			[];
+
+	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
+		jQuery.merge( [ context ], ret ) :
+		ret;
+}
+
+// Fix IE bugs, see support tests
+function fixInput( src, dest ) {
+	var nodeName = dest.nodeName.toLowerCase();
+
+	// Fails to persist the checked state of a cloned checkbox or radio button.
+	if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
+		dest.checked = src.checked;
+
+	// Fails to return the selected option to the default selected state when cloning options
+	} else if ( nodeName === "input" || nodeName === "textarea" ) {
+		dest.defaultValue = src.defaultValue;
+	}
+}
+
+jQuery.extend({
+	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+		var i, l, srcElements, destElements,
+			clone = elem.cloneNode( true ),
+			inPage = jQuery.contains( elem.ownerDocument, elem );
+
+		// Fix IE cloning issues
+		if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
+				!jQuery.isXMLDoc( elem ) ) {
+
+			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
+			destElements = getAll( clone );
+			srcElements = getAll( elem );
+
+			for ( i = 0, l = srcElements.length; i < l; i++ ) {
+				fixInput( srcElements[ i ], destElements[ i ] );
+			}
+		}
+
+		// Copy the events from the original to the clone
+		if ( dataAndEvents ) {
+			if ( deepDataAndEvents ) {
+				srcElements = srcElements || getAll( elem );
+				destElements = destElements || getAll( clone );
+
+				for ( i = 0, l = srcElements.length; i < l; i++ ) {
+					cloneCopyEvent( srcElements[ i ], destElements[ i ] );
+				}
+			} else {
+				cloneCopyEvent( elem, clone );
+			}
+		}
+
+		// Preserve script evaluation history
+		destElements = getAll( clone, "script" );
+		if ( destElements.length > 0 ) {
+			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
+		}
+
+		// Return the cloned set
+		return clone;
+	},
+
+	buildFragment: function( elems, context, scripts, selection ) {
+		var elem, tmp, tag, wrap, contains, j,
+			fragment = context.createDocumentFragment(),
+			nodes = [],
+			i = 0,
+			l = elems.length;
+
+		for ( ; i < l; i++ ) {
+			elem = elems[ i ];
+
+			if ( elem || elem === 0 ) {
+
+				// Add nodes directly
+				if ( jQuery.type( elem ) === "object" ) {
+					// Support: QtWebKit, PhantomJS
+					// push.apply(_, arraylike) throws on ancient WebKit
+					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
+
+				// Convert non-html into a text node
+				} else if ( !rhtml.test( elem ) ) {
+					nodes.push( context.createTextNode( elem ) );
+
+				// Convert html into DOM nodes
+				} else {
+					tmp = tmp || fragment.appendChild( context.createElement("div") );
+
+					// Deserialize a standard representation
+					tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase();
+					wrap = wrapMap[ tag ] || wrapMap._default;
+					tmp.innerHTML = wrap[ 1 ] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[ 2 ];
+
+					// Descend through wrappers to the right content
+					j = wrap[ 0 ];
+					while ( j-- ) {
+						tmp = tmp.lastChild;
+					}
+
+					// Support: QtWebKit, PhantomJS
+					// push.apply(_, arraylike) throws on ancient WebKit
+					jQuery.merge( nodes, tmp.childNodes );
+
+					// Remember the top-level container
+					tmp = fragment.firstChild;
+
+					// Ensure the created nodes are orphaned (#12392)
+					tmp.textContent = "";
+				}
+			}
+		}
+
+		// Remove wrapper from fragment
+		fragment.textContent = "";
+
+		i = 0;
+		while ( (elem = nodes[ i++ ]) ) {
+
+			// #4087 - If origin and destination elements are the same, and this is
+			// that element, do not do anything
+			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
+				continue;
+			}
+
+			contains = jQuery.contains( elem.ownerDocument, elem );
+
+			// Append to fragment
+			tmp = getAll( fragment.appendChild( elem ), "script" );
+
+			// Preserve script evaluation history
+			if ( contains ) {
+				setGlobalEval( tmp );
+			}
+
+			// Capture executables
+			if ( scripts ) {
+				j = 0;
+				while ( (elem = tmp[ j++ ]) ) {
+					if ( rscriptType.test( elem.type || "" ) ) {
+						scripts.push( elem );
+					}
+				}
+			}
+		}
+
+		return fragment;
+	},
+
+	cleanData: function( elems ) {
+		var data, elem, type, key,
+			special = jQuery.event.special,
+			i = 0;
+
+		for ( ; (elem = elems[ i ]) !== undefined; i++ ) {
+			if ( jQuery.acceptData( elem ) ) {
+				key = elem[ data_priv.expando ];
+
+				if ( key && (data = data_priv.cache[ key ]) ) {
+					if ( data.events ) {
+						for ( type in data.events ) {
+							if ( special[ type ] ) {
+								jQuery.event.remove( elem, type );
+
+							// This is a shortcut to avoid jQuery.event.remove's overhead
+							} else {
+								jQuery.removeEvent( elem, type, data.handle );
+							}
+						}
+					}
+					if ( data_priv.cache[ key ] ) {
+						// Discard any remaining `private` data
+						delete data_priv.cache[ key ];
+					}
+				}
+			}
+			// Discard any remaining `user` data
+			delete data_user.cache[ elem[ data_user.expando ] ];
+		}
+	}
+});
+
+jQuery.fn.extend({
+	text: function( value ) {
+		return access( this, function( value ) {
+			return value === undefined ?
+				jQuery.text( this ) :
+				this.empty().each(function() {
+					if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+						this.textContent = value;
+					}
+				});
+		}, null, value, arguments.length );
+	},
+
+	append: function() {
+		return this.domManip( arguments, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+				var target = manipulationTarget( this, elem );
+				target.appendChild( elem );
+			}
+		});
+	},
+
+	prepend: function() {
+		return this.domManip( arguments, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+				var target = manipulationTarget( this, elem );
+				target.insertBefore( elem, target.firstChild );
+			}
+		});
+	},
+
+	before: function() {
+		return this.domManip( arguments, function( elem ) {
+			if ( this.parentNode ) {
+				this.parentNode.insertBefore( elem, this );
+			}
+		});
+	},
+
+	after: function() {
+		return this.domManip( arguments, function( elem ) {
+			if ( this.parentNode ) {
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			}
+		});
+	},
+
+	remove: function( selector, keepData /* Internal Use Only */ ) {
+		var elem,
+			elems = selector ? jQuery.filter( selector, this ) : this,
+			i = 0;
+
+		for ( ; (elem = elems[i]) != null; i++ ) {
+			if ( !keepData && elem.nodeType === 1 ) {
+				jQuery.cleanData( getAll( elem ) );
+			}
+
+			if ( elem.parentNode ) {
+				if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
+					setGlobalEval( getAll( elem, "script" ) );
+				}
+				elem.parentNode.removeChild( elem );
+			}
+		}
+
+		return this;
+	},
+
+	empty: function() {
+		var elem,
+			i = 0;
+
+		for ( ; (elem = this[i]) != null; i++ ) {
+			if ( elem.nodeType === 1 ) {
+
+				// Prevent memory leaks
+				jQuery.cleanData( getAll( elem, false ) );
+
+				// Remove any remaining nodes
+				elem.textContent = "";
+			}
+		}
+
+		return this;
+	},
+
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+
+		return this.map(function() {
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+		});
+	},
+
+	html: function( value ) {
+		return access( this, function( value ) {
+			var elem = this[ 0 ] || {},
+				i = 0,
+				l = this.length;
+
+			if ( value === undefined && elem.nodeType === 1 ) {
+				return elem.innerHTML;
+			}
+
+			// See if we can take a shortcut and just use innerHTML
+			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+				!wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
+
+				value = value.replace( rxhtmlTag, "<$1></$2>" );
+
+				try {
+					for ( ; i < l; i++ ) {
+						elem = this[ i ] || {};
+
+						// Remove element nodes and prevent memory leaks
+						if ( elem.nodeType === 1 ) {
+							jQuery.cleanData( getAll( elem, false ) );
+							elem.innerHTML = value;
+						}
+					}
+
+					elem = 0;
+
+				// If using innerHTML throws an exception, use the fallback method
+				} catch( e ) {}
+			}
+
+			if ( elem ) {
+				this.empty().append( value );
+			}
+		}, null, value, arguments.length );
+	},
+
+	replaceWith: function() {
+		var arg = arguments[ 0 ];
+
+		// Make the changes, replacing each context element with the new content
+		this.domManip( arguments, function( elem ) {
+			arg = this.parentNode;
+
+			jQuery.cleanData( getAll( this ) );
+
+			if ( arg ) {
+				arg.replaceChild( elem, this );
+			}
+		});
+
+		// Force removal if there was no new content (e.g., from empty arguments)
+		return arg && (arg.length || arg.nodeType) ? this : this.remove();
+	},
+
+	detach: function( selector ) {
+		return this.remove( selector, true );
+	},
+
+	domManip: function( args, callback ) {
+
+		// Flatten any nested arrays
+		args = concat.apply( [], args );
+
+		var fragment, first, scripts, hasScripts, node, doc,
+			i = 0,
+			l = this.length,
+			set = this,
+			iNoClone = l - 1,
+			value = args[ 0 ],
+			isFunction = jQuery.isFunction( value );
+
+		// We can't cloneNode fragments that contain checked, in WebKit
+		if ( isFunction ||
+				( l > 1 && typeof value === "string" &&
+					!support.checkClone && rchecked.test( value ) ) ) {
+			return this.each(function( index ) {
+				var self = set.eq( index );
+				if ( isFunction ) {
+					args[ 0 ] = value.call( this, index, self.html() );
+				}
+				self.domManip( args, callback );
+			});
+		}
+
+		if ( l ) {
+			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this );
+			first = fragment.firstChild;
+
+			if ( fragment.childNodes.length === 1 ) {
+				fragment = first;
+			}
+
+			if ( first ) {
+				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
+				hasScripts = scripts.length;
+
+				// Use the original fragment for the last item instead of the first because it can end up
+				// being emptied incorrectly in certain situations (#8070).
+				for ( ; i < l; i++ ) {
+					node = fragment;
+
+					if ( i !== iNoClone ) {
+						node = jQuery.clone( node, true, true );
+
+						// Keep references to cloned scripts for later restoration
+						if ( hasScripts ) {
+							// Support: QtWebKit
+							// jQuery.merge because push.apply(_, arraylike) throws
+							jQuery.merge( scripts, getAll( node, "script" ) );
+						}
+					}
+
+					callback.call( this[ i ], node, i );
+				}
+
+				if ( hasScripts ) {
+					doc = scripts[ scripts.length - 1 ].ownerDocument;
+
+					// Reenable scripts
+					jQuery.map( scripts, restoreScript );
+
+					// Evaluate executable scripts on first document insertion
+					for ( i = 0; i < hasScripts; i++ ) {
+						node = scripts[ i ];
+						if ( rscriptType.test( node.type || "" ) &&
+							!data_priv.access( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
+
+							if ( node.src ) {
+								// Optional AJAX dependency, but won't run scripts if not present
+								if ( jQuery._evalUrl ) {
+									jQuery._evalUrl( node.src );
+								}
+							} else {
+								jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) );
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return this;
+	}
+});
+
+jQuery.each({
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function( name, original ) {
+	jQuery.fn[ name ] = function( selector ) {
+		var elems,
+			ret = [],
+			insert = jQuery( selector ),
+			last = insert.length - 1,
+			i = 0;
+
+		for ( ; i <= last; i++ ) {
+			elems = i === last ? this : this.clone( true );
+			jQuery( insert[ i ] )[ original ]( elems );
+
+			// Support: QtWebKit
+			// .get() because push.apply(_, arraylike) throws
+			push.apply( ret, elems.get() );
+		}
+
+		return this.pushStack( ret );
+	};
+});
+
+
+var iframe,
+	elemdisplay = {};
+
+/**
+ * Retrieve the actual display of a element
+ * @param {String} name nodeName of the element
+ * @param {Object} doc Document object
+ */
+// Called only from within defaultDisplay
+function actualDisplay( name, doc ) {
+	var style,
+		elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
+
+		// getDefaultComputedStyle might be reliably used only on attached element
+		display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ?
+
+			// Use of this method is a temporary fix (more like optimization) until something better comes along,
+			// since it was removed from specification and supported only in FF
+			style.display : jQuery.css( elem[ 0 ], "display" );
+
+	// We don't have any data stored on the element,
+	// so use "detach" method as fast way to get rid of the element
+	elem.detach();
+
+	return display;
+}
+
+/**
+ * Try to determine the default display value of an element
+ * @param {String} nodeName
+ */
+function defaultDisplay( nodeName ) {
+	var doc = document,
+		display = elemdisplay[ nodeName ];
+
+	if ( !display ) {
+		display = actualDisplay( nodeName, doc );
+
+		// If the simple way fails, read from inside an iframe
+		if ( display === "none" || !display ) {
+
+			// Use the already-created iframe if possible
+			iframe = (iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" )).appendTo( doc.documentElement );
+
+			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
+			doc = iframe[ 0 ].contentDocument;
+
+			// Support: IE
+			doc.write();
+			doc.close();
+
+			display = actualDisplay( nodeName, doc );
+			iframe.detach();
+		}
+
+		// Store the correct default display
+		elemdisplay[ nodeName ] = display;
+	}
+
+	return display;
+}
+var rmargin = (/^margin/);
+
+var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
+
+var getStyles = function( elem ) {
+		// Support: IE<=11+, Firefox<=30+ (#15098, #14150)
+		// IE throws on elements created in popups
+		// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
+		if ( elem.ownerDocument.defaultView.opener ) {
+			return elem.ownerDocument.defaultView.getComputedStyle( elem, null );
+		}
+
+		return window.getComputedStyle( elem, null );
+	};
+
+
+
+function curCSS( elem, name, computed ) {
+	var width, minWidth, maxWidth, ret,
+		style = elem.style;
+
+	computed = computed || getStyles( elem );
+
+	// Support: IE9
+	// getPropertyValue is only needed for .css('filter') (#12537)
+	if ( computed ) {
+		ret = computed.getPropertyValue( name ) || computed[ name ];
+	}
+
+	if ( computed ) {
+
+		if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
+			ret = jQuery.style( elem, name );
+		}
+
+		// Support: iOS < 6
+		// A tribute to the "awesome hack by Dean Edwards"
+		// iOS < 6 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
+		// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
+		if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
+
+			// Remember the original values
+			width = style.width;
+			minWidth = style.minWidth;
+			maxWidth = style.maxWidth;
+
+			// Put in the new values to get a computed value out
+			style.minWidth = style.maxWidth = style.width = ret;
+			ret = computed.width;
+
+			// Revert the changed values
+			style.width = width;
+			style.minWidth = minWidth;
+			style.maxWidth = maxWidth;
+		}
+	}
+
+	return ret !== undefined ?
+		// Support: IE
+		// IE returns zIndex value as an integer.
+		ret + "" :
+		ret;
+}
+
+
+function addGetHookIf( conditionFn, hookFn ) {
+	// Define the hook, we'll check on the first run if it's really needed.
+	return {
+		get: function() {
+			if ( conditionFn() ) {
+				// Hook not needed (or it's not possible to use it due
+				// to missing dependency), remove it.
+				delete this.get;
+				return;
+			}
+
+			// Hook needed; redefine it so that the support test is not executed again.
+			return (this.get = hookFn).apply( this, arguments );
+		}
+	};
+}
+
+
+(function() {
+	var pixelPositionVal, boxSizingReliableVal,
+		docElem = document.documentElement,
+		container = document.createElement( "div" ),
+		div = document.createElement( "div" );
+
+	if ( !div.style ) {
+		return;
+	}
+
+	// Support: IE9-11+
+	// Style of cloned element affects source element cloned (#8908)
+	div.style.backgroundClip = "content-box";
+	div.cloneNode( true ).style.backgroundClip = "";
+	support.clearCloneStyle = div.style.backgroundClip === "content-box";
+
+	container.style.cssText = "border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;" +
+		"position:absolute";
+	container.appendChild( div );
+
+	// Executing both pixelPosition & boxSizingReliable tests require only one layout
+	// so they're executed at the same time to save the second computation.
+	function computePixelPositionAndBoxSizingReliable() {
+		div.style.cssText =
+			// Support: Firefox<29, Android 2.3
+			// Vendor-prefix box-sizing
+			"-webkit-box-sizing:border-box;-moz-box-sizing:border-box;" +
+			"box-sizing:border-box;display:block;margin-top:1%;top:1%;" +
+			"border:1px;padding:1px;width:4px;position:absolute";
+		div.innerHTML = "";
+		docElem.appendChild( container );
+
+		var divStyle = window.getComputedStyle( div, null );
+		pixelPositionVal = divStyle.top !== "1%";
+		boxSizingReliableVal = divStyle.width === "4px";
+
+		docElem.removeChild( container );
+	}
+
+	// Support: node.js jsdom
+	// Don't assume that getComputedStyle is a property of the global object
+	if ( window.getComputedStyle ) {
+		jQuery.extend( support, {
+			pixelPosition: function() {
+
+				// This test is executed only once but we still do memoizing
+				// since we can use the boxSizingReliable pre-computing.
+				// No need to check if the test was already performed, though.
+				computePixelPositionAndBoxSizingReliable();
+				return pixelPositionVal;
+			},
+			boxSizingReliable: function() {
+				if ( boxSizingReliableVal == null ) {
+					computePixelPositionAndBoxSizingReliable();
+				}
+				return boxSizingReliableVal;
+			},
+			reliableMarginRight: function() {
+
+				// Support: Android 2.3
+				// Check if div with explicit width and no margin-right incorrectly
+				// gets computed margin-right based on width of container. (#3333)
+				// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+				// This support function is only executed once so no memoizing is needed.
+				var ret,
+					marginDiv = div.appendChild( document.createElement( "div" ) );
+
+				// Reset CSS: box-sizing; display; margin; border; padding
+				marginDiv.style.cssText = div.style.cssText =
+					// Support: Firefox<29, Android 2.3
+					// Vendor-prefix box-sizing
+					"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
+					"box-sizing:content-box;display:block;margin:0;border:0;padding:0";
+				marginDiv.style.marginRight = marginDiv.style.width = "0";
+				div.style.width = "1px";
+				docElem.appendChild( container );
+
+				ret = !parseFloat( window.getComputedStyle( marginDiv, null ).marginRight );
+
+				docElem.removeChild( container );
+				div.removeChild( marginDiv );
+
+				return ret;
+			}
+		});
+	}
+})();
+
+
+// A method for quickly swapping in/out CSS properties to get correct calculations.
+jQuery.swap = function( elem, options, callback, args ) {
+	var ret, name,
+		old = {};
+
+	// Remember the old values, and insert the new ones
+	for ( name in options ) {
+		old[ name ] = elem.style[ name ];
+		elem.style[ name ] = options[ name ];
+	}
+
+	ret = callback.apply( elem, args || [] );
+
+	// Revert the old values
+	for ( name in options ) {
+		elem.style[ name ] = old[ name ];
+	}
+
+	return ret;
+};
+
+
+var
+	// Swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
+	// See here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
+	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
+	rnumsplit = new RegExp( "^(" + pnum + ")(.*)$", "i" ),
+	rrelNum = new RegExp( "^([+-])=(" + pnum + ")", "i" ),
+
+	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+	cssNormalTransform = {
+		letterSpacing: "0",
+		fontWeight: "400"
+	},
+
+	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
+
+// Return a css property mapped to a potentially vendor prefixed property
+function vendorPropName( style, name ) {
+
+	// Shortcut for names that are not vendor prefixed
+	if ( name in style ) {
+		return name;
+	}
+
+	// Check for vendor prefixed names
+	var capName = name[0].toUpperCase() + name.slice(1),
+		origName = name,
+		i = cssPrefixes.length;
+
+	while ( i-- ) {
+		name = cssPrefixes[ i ] + capName;
+		if ( name in style ) {
+			return name;
+		}
+	}
+
+	return origName;
+}
+
+function setPositiveNumber( elem, value, subtract ) {
+	var matches = rnumsplit.exec( value );
+	return matches ?
+		// Guard against undefined "subtract", e.g., when used as in cssHooks
+		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
+		value;
+}
+
+function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
+	var i = extra === ( isBorderBox ? "border" : "content" ) ?
+		// If we already have the right measurement, avoid augmentation
+		4 :
+		// Otherwise initialize for horizontal or vertical properties
+		name === "width" ? 1 : 0,
+
+		val = 0;
+
+	for ( ; i < 4; i += 2 ) {
+		// Both box models exclude margin, so add it if we want it
+		if ( extra === "margin" ) {
+			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
+		}
+
+		if ( isBorderBox ) {
+			// border-box includes padding, so remove it if we want content
+			if ( extra === "content" ) {
+				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+			}
+
+			// At this point, extra isn't border nor margin, so remove border
+			if ( extra !== "margin" ) {
+				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		} else {
+			// At this point, extra isn't content, so add padding
+			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+
+			// At this point, extra isn't content nor padding, so add border
+			if ( extra !== "padding" ) {
+				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		}
+	}
+
+	return val;
+}
+
+function getWidthOrHeight( elem, name, extra ) {
+
+	// Start with offset property, which is equivalent to the border-box value
+	var valueIsBorderBox = true,
+		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+		styles = getStyles( elem ),
+		isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
+
+	// Some non-html elements return undefined for offsetWidth, so check for null/undefined
+	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
+	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
+	if ( val <= 0 || val == null ) {
+		// Fall back to computed then uncomputed css if necessary
+		val = curCSS( elem, name, styles );
+		if ( val < 0 || val == null ) {
+			val = elem.style[ name ];
+		}
+
+		// Computed unit is not pixels. Stop here and return.
+		if ( rnumnonpx.test(val) ) {
+			return val;
+		}
+
+		// Check for style in case a browser which returns unreliable values
+		// for getComputedStyle silently falls back to the reliable elem.style
+		valueIsBorderBox = isBorderBox &&
+			( support.boxSizingReliable() || val === elem.style[ name ] );
+
+		// Normalize "", auto, and prepare for extra
+		val = parseFloat( val ) || 0;
+	}
+
+	// Use the active box-sizing model to add/subtract irrelevant styles
+	return ( val +
+		augmentWidthOrHeight(
+			elem,
+			name,
+			extra || ( isBorderBox ? "border" : "content" ),
+			valueIsBorderBox,
+			styles
+		)
+	) + "px";
+}
+
+function showHide( elements, show ) {
+	var display, elem, hidden,
+		values = [],
+		index = 0,
+		length = elements.length;
+
+	for ( ; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+
+		values[ index ] = data_priv.get( elem, "olddisplay" );
+		display = elem.style.display;
+		if ( show ) {
+			// Reset the inline display of this element to learn if it is
+			// being hidden by cascaded rules or not
+			if ( !values[ index ] && display === "none" ) {
+				elem.style.display = "";
+			}
+
+			// Set elements which have been overridden with display: none
+			// in a stylesheet to whatever the default browser style is
+			// for such an element
+			if ( elem.style.display === "" && isHidden( elem ) ) {
+				values[ index ] = data_priv.access( elem, "olddisplay", defaultDisplay(elem.nodeName) );
+			}
+		} else {
+			hidden = isHidden( elem );
+
+			if ( display !== "none" || !hidden ) {
+				data_priv.set( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
+			}
+		}
+	}
+
+	// Set the display of most of the elements in a second loop
+	// to avoid the constant reflow
+	for ( index = 0; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
+			elem.style.display = show ? values[ index ] || "" : "none";
+		}
+	}
+
+	return elements;
+}
+
+jQuery.extend({
+
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity" );
+					return ret === "" ? "1" : ret;
+				}
+			}
+		}
+	},
+
+	// Don't automatically add "px" to these possibly-unitless properties
+	cssNumber: {
+		"columnCount": true,
+		"fillOpacity": true,
+		"flexGrow": true,
+		"flexShrink": true,
+		"fontWeight": true,
+		"lineHeight": true,
+		"opacity": true,
+		"order": true,
+		"orphans": true,
+		"widows": true,
+		"zIndex": true,
+		"zoom": true
+	},
+
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {
+		"float": "cssFloat"
+	},
+
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
+		}
+
+		// Make sure that we're working with the right name
+		var ret, type, hooks,
+			origName = jQuery.camelCase( name ),
+			style = elem.style;
+
+		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
+
+		// Gets hook for the prefixed version, then unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			type = typeof value;
+
+			// Convert "+=" or "-=" to relative numbers (#7345)
+			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
+				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
+				// Fixes bug #9237
+				type = "number";
+			}
+
+			// Make sure that null and NaN values aren't set (#7116)
+			if ( value == null || value !== value ) {
+				return;
+			}
+
+			// If a number, add 'px' to the (except for certain CSS properties)
+			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
+				value += "px";
+			}
+
+			// Support: IE9-11+
+			// background-* props affect original clone's values
+			if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) {
+				style[ name ] = "inherit";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
+				style[ name ] = value;
+			}
+
+		} else {
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
+				return ret;
+			}
+
+			// Otherwise just get the value from the style object
+			return style[ name ];
+		}
+	},
+
+	css: function( elem, name, extra, styles ) {
+		var val, num, hooks,
+			origName = jQuery.camelCase( name );
+
+		// Make sure that we're working with the right name
+		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
+
+		// Try prefixed name followed by the unprefixed name
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks ) {
+			val = hooks.get( elem, true, extra );
+		}
+
+		// Otherwise, if a way to get the computed value exists, use that
+		if ( val === undefined ) {
+			val = curCSS( elem, name, styles );
+		}
+
+		// Convert "normal" to computed value
+		if ( val === "normal" && name in cssNormalTransform ) {
+			val = cssNormalTransform[ name ];
+		}
+
+		// Make numeric if forced or a qualifier was provided and val looks numeric
+		if ( extra === "" || extra ) {
+			num = parseFloat( val );
+			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
+		}
+		return val;
+	}
+});
+
+jQuery.each([ "height", "width" ], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, computed, extra ) {
+			if ( computed ) {
+
+				// Certain elements can have dimension info if we invisibly show them
+				// but it must have a current display style that would benefit
+				return rdisplayswap.test( jQuery.css( elem, "display" ) ) && elem.offsetWidth === 0 ?
+					jQuery.swap( elem, cssShow, function() {
+						return getWidthOrHeight( elem, name, extra );
+					}) :
+					getWidthOrHeight( elem, name, extra );
+			}
+		},
+
+		set: function( elem, value, extra ) {
+			var styles = extra && getStyles( elem );
+			return setPositiveNumber( elem, value, extra ?
+				augmentWidthOrHeight(
+					elem,
+					name,
+					extra,
+					jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+					styles
+				) : 0
+			);
+		}
+	};
+});
+
+// Support: Android 2.3
+jQuery.cssHooks.marginRight = addGetHookIf( support.reliableMarginRight,
+	function( elem, computed ) {
+		if ( computed ) {
+			return jQuery.swap( elem, { "display": "inline-block" },
+				curCSS, [ elem, "marginRight" ] );
+		}
+	}
+);
+
+// These hooks are used by animate to expand properties
+jQuery.each({
+	margin: "",
+	padding: "",
+	border: "Width"
+}, function( prefix, suffix ) {
+	jQuery.cssHooks[ prefix + suffix ] = {
+		expand: function( value ) {
+			var i = 0,
+				expanded = {},
+
+				// Assumes a single number if not a string
+				parts = typeof value === "string" ? value.split(" ") : [ value ];
+
+			for ( ; i < 4; i++ ) {
+				expanded[ prefix + cssExpand[ i ] + suffix ] =
+					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
+			}
+
+			return expanded;
+		}
+	};
+
+	if ( !rmargin.test( prefix ) ) {
+		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
+	}
+});
+
+jQuery.fn.extend({
+	css: function( name, value ) {
+		return access( this, function( elem, name, value ) {
+			var styles, len,
+				map = {},
+				i = 0;
+
+			if ( jQuery.isArray( name ) ) {
+				styles = getStyles( elem );
+				len = name.length;
+
+				for ( ; i < len; i++ ) {
+					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
+				}
+
+				return map;
+			}
+
+			return value !== undefined ?
+				jQuery.style( elem, name, value ) :
+				jQuery.css( elem, name );
+		}, name, value, arguments.length > 1 );
+	},
+	show: function() {
+		return showHide( this, true );
+	},
+	hide: function() {
+		return showHide( this );
+	},
+	toggle: function( state ) {
+		if ( typeof state === "boolean" ) {
+			return state ? this.show() : this.hide();
+		}
+
+		return this.each(function() {
+			if ( isHidden( this ) ) {
+				jQuery( this ).show();
+			} else {
+				jQuery( this ).hide();
+			}
+		});
+	}
+});
+
+
+function Tween( elem, options, prop, end, easing ) {
+	return new Tween.prototype.init( elem, options, prop, end, easing );
+}
+jQuery.Tween = Tween;
+
+Tween.prototype = {
+	constructor: Tween,
+	init: function( elem, options, prop, end, easing, unit ) {
+		this.elem = elem;
+		this.prop = prop;
+		this.easing = easing || "swing";
+		this.options = options;
+		this.start = this.now = this.cur();
+		this.end = end;
+		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+	},
+	cur: function() {
+		var hooks = Tween.propHooks[ this.prop ];
+
+		return hooks && hooks.get ?
+			hooks.get( this ) :
+			Tween.propHooks._default.get( this );
+	},
+	run: function( percent ) {
+		var eased,
+			hooks = Tween.propHooks[ this.prop ];
+
+		if ( this.options.duration ) {
+			this.pos = eased = jQuery.easing[ this.easing ](
+				percent, this.options.duration * percent, 0, 1, this.options.duration
+			);
+		} else {
+			this.pos = eased = percent;
+		}
+		this.now = ( this.end - this.start ) * eased + this.start;
+
+		if ( this.options.step ) {
+			this.options.step.call( this.elem, this.now, this );
+		}
+
+		if ( hooks && hooks.set ) {
+			hooks.set( this );
+		} else {
+			Tween.propHooks._default.set( this );
+		}
+		return this;
+	}
+};
+
+Tween.prototype.init.prototype = Tween.prototype;
+
+Tween.propHooks = {
+	_default: {
+		get: function( tween ) {
+			var result;
+
+			if ( tween.elem[ tween.prop ] != null &&
+				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
+				return tween.elem[ tween.prop ];
+			}
+
+			// Passing an empty string as a 3rd parameter to .css will automatically
+			// attempt a parseFloat and fallback to a string if the parse fails.
+			// Simple values such as "10px" are parsed to Float;
+			// complex values such as "rotate(1rad)" are returned as-is.
+			result = jQuery.css( tween.elem, tween.prop, "" );
+			// Empty strings, null, undefined and "auto" are converted to 0.
+			return !result || result === "auto" ? 0 : result;
+		},
+		set: function( tween ) {
+			// Use step hook for back compat.
+			// Use cssHook if its there.
+			// Use .style if available and use plain properties where available.
+			if ( jQuery.fx.step[ tween.prop ] ) {
+				jQuery.fx.step[ tween.prop ]( tween );
+			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
+				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
+			} else {
+				tween.elem[ tween.prop ] = tween.now;
+			}
+		}
+	}
+};
+
+// Support: IE9
+// Panic based approach to setting things on disconnected nodes
+Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
+	set: function( tween ) {
+		if ( tween.elem.nodeType && tween.elem.parentNode ) {
+			tween.elem[ tween.prop ] = tween.now;
+		}
+	}
+};
+
+jQuery.easing = {
+	linear: function( p ) {
+		return p;
+	},
+	swing: function( p ) {
+		return 0.5 - Math.cos( p * Math.PI ) / 2;
+	}
+};
+
+jQuery.fx = Tween.prototype.init;
+
+// Back Compat <1.8 extension point
+jQuery.fx.step = {};
+
+
+
+
+var
+	fxNow, timerId,
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rfxnum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ),
+	rrun = /queueHooks$/,
+	animationPrefilters = [ defaultPrefilter ],
+	tweeners = {
+		"*": [ function( prop, value ) {
+			var tween = this.createTween( prop, value ),
+				target = tween.cur(),
+				parts = rfxnum.exec( value ),
+				unit = parts && parts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
+
+				// Starting value computation is required for potential unit mismatches
+				start = ( jQuery.cssNumber[ prop ] || unit !== "px" && +target ) &&
+					rfxnum.exec( jQuery.css( tween.elem, prop ) ),
+				scale = 1,
+				maxIterations = 20;
+
+			if ( start && start[ 3 ] !== unit ) {
+				// Trust units reported by jQuery.css
+				unit = unit || start[ 3 ];
+
+				// Make sure we update the tween properties later on
+				parts = parts || [];
+
+				// Iteratively approximate from a nonzero starting point
+				start = +target || 1;
+
+				do {
+					// If previous iteration zeroed out, double until we get *something*.
+					// Use string for doubling so we don't accidentally see scale as unchanged below
+					scale = scale || ".5";
+
+					// Adjust and apply
+					start = start / scale;
+					jQuery.style( tween.elem, prop, start + unit );
+
+				// Update scale, tolerating zero or NaN from tween.cur(),
+				// break the loop if scale is unchanged or perfect, or if we've just had enough
+				} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
+			}
+
+			// Update tween properties
+			if ( parts ) {
+				start = tween.start = +start || +target || 0;
+				tween.unit = unit;
+				// If a +=/-= token was provided, we're doing a relative animation
+				tween.end = parts[ 1 ] ?
+					start + ( parts[ 1 ] + 1 ) * parts[ 2 ] :
+					+parts[ 2 ];
+			}
+
+			return tween;
+		} ]
+	};
+
+// Animations created synchronously will run synchronously
+function createFxNow() {
+	setTimeout(function() {
+		fxNow = undefined;
+	});
+	return ( fxNow = jQuery.now() );
+}
+
+// Generate parameters to create a standard animation
+function genFx( type, includeWidth ) {
+	var which,
+		i = 0,
+		attrs = { height: type };
+
+	// If we include width, step value is 1 to do all cssExpand values,
+	// otherwise step value is 2 to skip over Left and Right
+	includeWidth = includeWidth ? 1 : 0;
+	for ( ; i < 4 ; i += 2 - includeWidth ) {
+		which = cssExpand[ i ];
+		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
+	}
+
+	if ( includeWidth ) {
+		attrs.opacity = attrs.width = type;
+	}
+
+	return attrs;
+}
+
+function createTween( value, prop, animation ) {
+	var tween,
+		collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
+		index = 0,
+		length = collection.length;
+	for ( ; index < length; index++ ) {
+		if ( (tween = collection[ index ].call( animation, prop, value )) ) {
+
+			// We're done with this property
+			return tween;
+		}
+	}
+}
+
+function defaultPrefilter( elem, props, opts ) {
+	/* jshint validthis: true */
+	var prop, value, toggle, tween, hooks, oldfire, display, checkDisplay,
+		anim = this,
+		orig = {},
+		style = elem.style,
+		hidden = elem.nodeType && isHidden( elem ),
+		dataShow = data_priv.get( elem, "fxshow" );
+
+	// Handle queue: false promises
+	if ( !opts.queue ) {
+		hooks = jQuery._queueHooks( elem, "fx" );
+		if ( hooks.unqueued == null ) {
+			hooks.unqueued = 0;
+			oldfire = hooks.empty.fire;
+			hooks.empty.fire = function() {
+				if ( !hooks.unqueued ) {
+					oldfire();
+				}
+			};
+		}
+		hooks.unqueued++;
+
+		anim.always(function() {
+			// Ensure the complete handler is called before this completes
+			anim.always(function() {
+				hooks.unqueued--;
+				if ( !jQuery.queue( elem, "fx" ).length ) {
+					hooks.empty.fire();
+				}
+			});
+		});
+	}
+
+	// Height/width overflow pass
+	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
+		// Make sure that nothing sneaks out
+		// Record all 3 overflow attributes because IE9-10 do not
+		// change the overflow attribute when overflowX and
+		// overflowY are set to the same value
+		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
+
+		// Set display property to inline-block for height/width
+		// animations on inline elements that are having width/height animated
+		display = jQuery.css( elem, "display" );
+
+		// Test default display if display is currently "none"
+		checkDisplay = display === "none" ?
+			data_priv.get( elem, "olddisplay" ) || defaultDisplay( elem.nodeName ) : display;
+
+		if ( checkDisplay === "inline" && jQuery.css( elem, "float" ) === "none" ) {
+			style.display = "inline-block";
+		}
+	}
+
+	if ( opts.overflow ) {
+		style.overflow = "hidden";
+		anim.always(function() {
+			style.overflow = opts.overflow[ 0 ];
+			style.overflowX = opts.overflow[ 1 ];
+			style.overflowY = opts.overflow[ 2 ];
+		});
+	}
+
+	// show/hide pass
+	for ( prop in props ) {
+		value = props[ prop ];
+		if ( rfxtypes.exec( value ) ) {
+			delete props[ prop ];
+			toggle = toggle || value === "toggle";
+			if ( value === ( hidden ? "hide" : "show" ) ) {
+
+				// If there is dataShow left over from a stopped hide or show and we are going to proceed with show, we should pretend to be hidden
+				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
+					hidden = true;
+				} else {
+					continue;
+				}
+			}
+			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
+
+		// Any non-fx value stops us from restoring the original display value
+		} else {
+			display = undefined;
+		}
+	}
+
+	if ( !jQuery.isEmptyObject( orig ) ) {
+		if ( dataShow ) {
+			if ( "hidden" in dataShow ) {
+				hidden = dataShow.hidden;
+			}
+		} else {
+			dataShow = data_priv.access( elem, "fxshow", {} );
+		}
+
+		// Store state if its toggle - enables .stop().toggle() to "reverse"
+		if ( toggle ) {
+			dataShow.hidden = !hidden;
+		}
+		if ( hidden ) {
+			jQuery( elem ).show();
+		} else {
+			anim.done(function() {
+				jQuery( elem ).hide();
+			});
+		}
+		anim.done(function() {
+			var prop;
+
+			data_priv.remove( elem, "fxshow" );
+			for ( prop in orig ) {
+				jQuery.style( elem, prop, orig[ prop ] );
+			}
+		});
+		for ( prop in orig ) {
+			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
+
+			if ( !( prop in dataShow ) ) {
+				dataShow[ prop ] = tween.start;
+				if ( hidden ) {
+					tween.end = tween.start;
+					tween.start = prop === "width" || prop === "height" ? 1 : 0;
+				}
+			}
+		}
+
+	// If this is a noop like .hide().hide(), restore an overwritten display value
+	} else if ( (display === "none" ? defaultDisplay( elem.nodeName ) : display) === "inline" ) {
+		style.display = display;
+	}
+}
+
+function propFilter( props, specialEasing ) {
+	var index, name, easing, value, hooks;
+
+	// camelCase, specialEasing and expand cssHook pass
+	for ( index in props ) {
+		name = jQuery.camelCase( index );
+		easing = specialEasing[ name ];
+		value = props[ index ];
+		if ( jQuery.isArray( value ) ) {
+			easing = value[ 1 ];
+			value = props[ index ] = value[ 0 ];
+		}
+
+		if ( index !== name ) {
+			props[ name ] = value;
+			delete props[ index ];
+		}
+
+		hooks = jQuery.cssHooks[ name ];
+		if ( hooks && "expand" in hooks ) {
+			value = hooks.expand( value );
+			delete props[ name ];
+
+			// Not quite $.extend, this won't overwrite existing keys.
+			// Reusing 'index' because we have the correct "name"
+			for ( index in value ) {
+				if ( !( index in props ) ) {
+					props[ index ] = value[ index ];
+					specialEasing[ index ] = easing;
+				}
+			}
+		} else {
+			specialEasing[ name ] = easing;
+		}
+	}
+}
+
+function Animation( elem, properties, options ) {
+	var result,
+		stopped,
+		index = 0,
+		length = animationPrefilters.length,
+		deferred = jQuery.Deferred().always( function() {
+			// Don't match elem in the :animated selector
+			delete tick.elem;
+		}),
+		tick = function() {
+			if ( stopped ) {
+				return false;
+			}
+			var currentTime = fxNow || createFxNow(),
+				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
+				// Support: Android 2.3
+				// Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497)
+				temp = remaining / animation.duration || 0,
+				percent = 1 - temp,
+				index = 0,
+				length = animation.tweens.length;
+
+			for ( ; index < length ; index++ ) {
+				animation.tweens[ index ].run( percent );
+			}
+
+			deferred.notifyWith( elem, [ animation, percent, remaining ]);
+
+			if ( percent < 1 && length ) {
+				return remaining;
+			} else {
+				deferred.resolveWith( elem, [ animation ] );
+				return false;
+			}
+		},
+		animation = deferred.promise({
+			elem: elem,
+			props: jQuery.extend( {}, properties ),
+			opts: jQuery.extend( true, { specialEasing: {} }, options ),
+			originalProperties: properties,
+			originalOptions: options,
+			startTime: fxNow || createFxNow(),
+			duration: options.duration,
+			tweens: [],
+			createTween: function( prop, end ) {
+				var tween = jQuery.Tween( elem, animation.opts, prop, end,
+						animation.opts.specialEasing[ prop ] || animation.opts.easing );
+				animation.tweens.push( tween );
+				return tween;
+			},
+			stop: function( gotoEnd ) {
+				var index = 0,
+					// If we are going to the end, we want to run all the tweens
+					// otherwise we skip this part
+					length = gotoEnd ? animation.tweens.length : 0;
+				if ( stopped ) {
+					return this;
+				}
+				stopped = true;
+				for ( ; index < length ; index++ ) {
+					animation.tweens[ index ].run( 1 );
+				}
+
+				// Resolve when we played the last frame; otherwise, reject
+				if ( gotoEnd ) {
+					deferred.resolveWith( elem, [ animation, gotoEnd ] );
+				} else {
+					deferred.rejectWith( elem, [ animation, gotoEnd ] );
+				}
+				return this;
+			}
+		}),
+		props = animation.props;
+
+	propFilter( props, animation.opts.specialEasing );
+
+	for ( ; index < length ; index++ ) {
+		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
+		if ( result ) {
+			return result;
+		}
+	}
+
+	jQuery.map( props, createTween, animation );
+
+	if ( jQuery.isFunction( animation.opts.start ) ) {
+		animation.opts.start.call( elem, animation );
+	}
+
+	jQuery.fx.timer(
+		jQuery.extend( tick, {
+			elem: elem,
+			anim: animation,
+			queue: animation.opts.queue
+		})
+	);
+
+	// attach callbacks from options
+	return animation.progress( animation.opts.progress )
+		.done( animation.opts.done, animation.opts.complete )
+		.fail( animation.opts.fail )
+		.always( animation.opts.always );
+}
+
+jQuery.Animation = jQuery.extend( Animation, {
+
+	tweener: function( props, callback ) {
+		if ( jQuery.isFunction( props ) ) {
+			callback = props;
+			props = [ "*" ];
+		} else {
+			props = props.split(" ");
+		}
+
+		var prop,
+			index = 0,
+			length = props.length;
+
+		for ( ; index < length ; index++ ) {
+			prop = props[ index ];
+			tweeners[ prop ] = tweeners[ prop ] || [];
+			tweeners[ prop ].unshift( callback );
+		}
+	},
+
+	prefilter: function( callback, prepend ) {
+		if ( prepend ) {
+			animationPrefilters.unshift( callback );
+		} else {
+			animationPrefilters.push( callback );
+		}
+	}
+});
+
+jQuery.speed = function( speed, easing, fn ) {
+	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
+		complete: fn || !fn && easing ||
+			jQuery.isFunction( speed ) && speed,
+		duration: speed,
+		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
+	};
+
+	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
+
+	// Normalize opt.queue - true/undefined/null -> "fx"
+	if ( opt.queue == null || opt.queue === true ) {
+		opt.queue = "fx";
+	}
+
+	// Queueing
+	opt.old = opt.complete;
+
+	opt.complete = function() {
+		if ( jQuery.isFunction( opt.old ) ) {
+			opt.old.call( this );
+		}
+
+		if ( opt.queue ) {
+			jQuery.dequeue( this, opt.queue );
+		}
+	};
+
+	return opt;
+};
+
+jQuery.fn.extend({
+	fadeTo: function( speed, to, easing, callback ) {
+
+		// Show any hidden elements after setting opacity to 0
+		return this.filter( isHidden ).css( "opacity", 0 ).show()
+
+			// Animate to the value specified
+			.end().animate({ opacity: to }, speed, easing, callback );
+	},
+	animate: function( prop, speed, easing, callback ) {
+		var empty = jQuery.isEmptyObject( prop ),
+			optall = jQuery.speed( speed, easing, callback ),
+			doAnimation = function() {
+				// Operate on a copy of prop so per-property easing won't be lost
+				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
+
+				// Empty animations, or finishing resolves immediately
+				if ( empty || data_priv.get( this, "finish" ) ) {
+					anim.stop( true );
+				}
+			};
+			doAnimation.finish = doAnimation;
+
+		return empty || optall.queue === false ?
+			this.each( doAnimation ) :
+			this.queue( optall.queue, doAnimation );
+	},
+	stop: function( type, clearQueue, gotoEnd ) {
+		var stopQueue = function( hooks ) {
+			var stop = hooks.stop;
+			delete hooks.stop;
+			stop( gotoEnd );
+		};
+
+		if ( typeof type !== "string" ) {
+			gotoEnd = clearQueue;
+			clearQueue = type;
+			type = undefined;
+		}
+		if ( clearQueue && type !== false ) {
+			this.queue( type || "fx", [] );
+		}
+
+		return this.each(function() {
+			var dequeue = true,
+				index = type != null && type + "queueHooks",
+				timers = jQuery.timers,
+				data = data_priv.get( this );
+
+			if ( index ) {
+				if ( data[ index ] && data[ index ].stop ) {
+					stopQueue( data[ index ] );
+				}
+			} else {
+				for ( index in data ) {
+					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
+						stopQueue( data[ index ] );
+					}
+				}
+			}
+
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
+					timers[ index ].anim.stop( gotoEnd );
+					dequeue = false;
+					timers.splice( index, 1 );
+				}
+			}
+
+			// Start the next in the queue if the last step wasn't forced.
+			// Timers currently will call their complete callbacks, which
+			// will dequeue but only if they were gotoEnd.
+			if ( dequeue || !gotoEnd ) {
+				jQuery.dequeue( this, type );
+			}
+		});
+	},
+	finish: function( type ) {
+		if ( type !== false ) {
+			type = type || "fx";
+		}
+		return this.each(function() {
+			var index,
+				data = data_priv.get( this ),
+				queue = data[ type + "queue" ],
+				hooks = data[ type + "queueHooks" ],
+				timers = jQuery.timers,
+				length = queue ? queue.length : 0;
+
+			// Enable finishing flag on private data
+			data.finish = true;
+
+			// Empty the queue first
+			jQuery.queue( this, type, [] );
+
+			if ( hooks && hooks.stop ) {
+				hooks.stop.call( this, true );
+			}
+
+			// Look for any active animations, and finish them
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
+					timers[ index ].anim.stop( true );
+					timers.splice( index, 1 );
+				}
+			}
+
+			// Look for any animations in the old queue and finish them
+			for ( index = 0; index < length; index++ ) {
+				if ( queue[ index ] && queue[ index ].finish ) {
+					queue[ index ].finish.call( this );
+				}
+			}
+
+			// Turn off finishing flag
+			delete data.finish;
+		});
+	}
+});
+
+jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
+	var cssFn = jQuery.fn[ name ];
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return speed == null || typeof speed === "boolean" ?
+			cssFn.apply( this, arguments ) :
+			this.animate( genFx( name, true ), speed, easing, callback );
+	};
+});
+
+// Generate shortcuts for custom animations
+jQuery.each({
+	slideDown: genFx("show"),
+	slideUp: genFx("hide"),
+	slideToggle: genFx("toggle"),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
+	};
+});
+
+jQuery.timers = [];
+jQuery.fx.tick = function() {
+	var timer,
+		i = 0,
+		timers = jQuery.timers;
+
+	fxNow = jQuery.now();
+
+	for ( ; i < timers.length; i++ ) {
+		timer = timers[ i ];
+		// Checks the timer has not already been removed
+		if ( !timer() && timers[ i ] === timer ) {
+			timers.splice( i--, 1 );
+		}
+	}
+
+	if ( !timers.length ) {
+		jQuery.fx.stop();
+	}
+	fxNow = undefined;
+};
+
+jQuery.fx.timer = function( timer ) {
+	jQuery.timers.push( timer );
+	if ( timer() ) {
+		jQuery.fx.start();
+	} else {
+		jQuery.timers.pop();
+	}
+};
+
+jQuery.fx.interval = 13;
+
+jQuery.fx.start = function() {
+	if ( !timerId ) {
+		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
+	}
+};
+
+jQuery.fx.stop = function() {
+	clearInterval( timerId );
+	timerId = null;
+};
+
+jQuery.fx.speeds = {
+	slow: 600,
+	fast: 200,
+	// Default speed
+	_default: 400
+};
+
+
+// Based off of the plugin by Clint Helfers, with permission.
+// http://blindsignals.com/index.php/2009/07/jquery-delay/
+jQuery.fn.delay = function( time, type ) {
+	time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
+	type = type || "fx";
+
+	return this.queue( type, function( next, hooks ) {
+		var timeout = setTimeout( next, time );
+		hooks.stop = function() {
+			clearTimeout( timeout );
+		};
+	});
+};
+
+
+(function() {
+	var input = document.createElement( "input" ),
+		select = document.createElement( "select" ),
+		opt = select.appendChild( document.createElement( "option" ) );
+
+	input.type = "checkbox";
+
+	// Support: iOS<=5.1, Android<=4.2+
+	// Default value for a checkbox should be "on"
+	support.checkOn = input.value !== "";
+
+	// Support: IE<=11+
+	// Must access selectedIndex to make default options select
+	support.optSelected = opt.selected;
+
+	// Support: Android<=2.3
+	// Options inside disabled selects are incorrectly marked as disabled
+	select.disabled = true;
+	support.optDisabled = !opt.disabled;
+
+	// Support: IE<=11+
+	// An input loses its value after becoming a radio
+	input = document.createElement( "input" );
+	input.value = "t";
+	input.type = "radio";
+	support.radioValue = input.value === "t";
+})();
+
+
+var nodeHook, boolHook,
+	attrHandle = jQuery.expr.attrHandle;
+
+jQuery.fn.extend({
+	attr: function( name, value ) {
+		return access( this, jQuery.attr, name, value, arguments.length > 1 );
+	},
+
+	removeAttr: function( name ) {
+		return this.each(function() {
+			jQuery.removeAttr( this, name );
+		});
+	}
+});
+
+jQuery.extend({
+	attr: function( elem, name, value ) {
+		var hooks, ret,
+			nType = elem.nodeType;
+
+		// don't get/set attributes on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		// Fallback to prop when attributes are not supported
+		if ( typeof elem.getAttribute === strundefined ) {
+			return jQuery.prop( elem, name, value );
+		}
+
+		// All attributes are lowercase
+		// Grab necessary hook if one is defined
+		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
+			name = name.toLowerCase();
+			hooks = jQuery.attrHooks[ name ] ||
+				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
+		}
+
+		if ( value !== undefined ) {
+
+			if ( value === null ) {
+				jQuery.removeAttr( elem, name );
+
+			} else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
+				return ret;
+
+			} else {
+				elem.setAttribute( name, value + "" );
+				return value;
+			}
+
+		} else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
+			return ret;
+
+		} else {
+			ret = jQuery.find.attr( elem, name );
+
+			// Non-existent attributes return null, we normalize to undefined
+			return ret == null ?
+				undefined :
+				ret;
+		}
+	},
+
+	removeAttr: function( elem, value ) {
+		var name, propName,
+			i = 0,
+			attrNames = value && value.match( rnotwhite );
+
+		if ( attrNames && elem.nodeType === 1 ) {
+			while ( (name = attrNames[i++]) ) {
+				propName = jQuery.propFix[ name ] || name;
+
+				// Boolean attributes get special treatment (#10870)
+				if ( jQuery.expr.match.bool.test( name ) ) {
+					// Set corresponding property to false
+					elem[ propName ] = false;
+				}
+
+				elem.removeAttribute( name );
+			}
+		}
+	},
+
+	attrHooks: {
+		type: {
+			set: function( elem, value ) {
+				if ( !support.radioValue && value === "radio" &&
+					jQuery.nodeName( elem, "input" ) ) {
+					var val = elem.value;
+					elem.setAttribute( "type", value );
+					if ( val ) {
+						elem.value = val;
+					}
+					return value;
+				}
+			}
+		}
+	}
+});
+
+// Hooks for boolean attributes
+boolHook = {
+	set: function( elem, value, name ) {
+		if ( value === false ) {
+			// Remove boolean attributes when set to false
+			jQuery.removeAttr( elem, name );
+		} else {
+			elem.setAttribute( name, name );
+		}
+		return name;
+	}
+};
+jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
+	var getter = attrHandle[ name ] || jQuery.find.attr;
+
+	attrHandle[ name ] = function( elem, name, isXML ) {
+		var ret, handle;
+		if ( !isXML ) {
+			// Avoid an infinite loop by temporarily removing this function from the getter
+			handle = attrHandle[ name ];
+			attrHandle[ name ] = ret;
+			ret = getter( elem, name, isXML ) != null ?
+				name.toLowerCase() :
+				null;
+			attrHandle[ name ] = handle;
+		}
+		return ret;
+	};
+});
+
+
+
+
+var rfocusable = /^(?:input|select|textarea|button)$/i;
+
+jQuery.fn.extend({
+	prop: function( name, value ) {
+		return access( this, jQuery.prop, name, value, arguments.length > 1 );
+	},
+
+	removeProp: function( name ) {
+		return this.each(function() {
+			delete this[ jQuery.propFix[ name ] || name ];
+		});
+	}
+});
+
+jQuery.extend({
+	propFix: {
+		"for": "htmlFor",
+		"class": "className"
+	},
+
+	prop: function( elem, name, value ) {
+		var ret, hooks, notxml,
+			nType = elem.nodeType;
+
+		// Don't get/set properties on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+		if ( notxml ) {
+			// Fix name and attach hooks
+			name = jQuery.propFix[ name ] || name;
+			hooks = jQuery.propHooks[ name ];
+		}
+
+		if ( value !== undefined ) {
+			return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ?
+				ret :
+				( elem[ name ] = value );
+
+		} else {
+			return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ?
+				ret :
+				elem[ name ];
+		}
+	},
+
+	propHooks: {
+		tabIndex: {
+			get: function( elem ) {
+				return elem.hasAttribute( "tabindex" ) || rfocusable.test( elem.nodeName ) || elem.href ?
+					elem.tabIndex :
+					-1;
+			}
+		}
+	}
+});
+
+if ( !support.optSelected ) {
+	jQuery.propHooks.selected = {
+		get: function( elem ) {
+			var parent = elem.parentNode;
+			if ( parent && parent.parentNode ) {
+				parent.parentNode.selectedIndex;
+			}
+			return null;
+		}
+	};
+}
+
+jQuery.each([
+	"tabIndex",
+	"readOnly",
+	"maxLength",
+	"cellSpacing",
+	"cellPadding",
+	"rowSpan",
+	"colSpan",
+	"useMap",
+	"frameBorder",
+	"contentEditable"
+], function() {
+	jQuery.propFix[ this.toLowerCase() ] = this;
+});
+
+
+
+
+var rclass = /[\t\r\n\f]/g;
+
+jQuery.fn.extend({
+	addClass: function( value ) {
+		var classes, elem, cur, clazz, j, finalValue,
+			proceed = typeof value === "string" && value,
+			i = 0,
+			len = this.length;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).addClass( value.call( this, j, this.className ) );
+			});
+		}
+
+		if ( proceed ) {
+			// The disjunction here is for better compressibility (see removeClass)
+			classes = ( value || "" ).match( rnotwhite ) || [];
+
+			for ( ; i < len; i++ ) {
+				elem = this[ i ];
+				cur = elem.nodeType === 1 && ( elem.className ?
+					( " " + elem.className + " " ).replace( rclass, " " ) :
+					" "
+				);
+
+				if ( cur ) {
+					j = 0;
+					while ( (clazz = classes[j++]) ) {
+						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
+							cur += clazz + " ";
+						}
+					}
+
+					// only assign if different to avoid unneeded rendering.
+					finalValue = jQuery.trim( cur );
+					if ( elem.className !== finalValue ) {
+						elem.className = finalValue;
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	removeClass: function( value ) {
+		var classes, elem, cur, clazz, j, finalValue,
+			proceed = arguments.length === 0 || typeof value === "string" && value,
+			i = 0,
+			len = this.length;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).removeClass( value.call( this, j, this.className ) );
+			});
+		}
+		if ( proceed ) {
+			classes = ( value || "" ).match( rnotwhite ) || [];
+
+			for ( ; i < len; i++ ) {
+				elem = this[ i ];
+				// This expression is here for better compressibility (see addClass)
+				cur = elem.nodeType === 1 && ( elem.className ?
+					( " " + elem.className + " " ).replace( rclass, " " ) :
+					""
+				);
+
+				if ( cur ) {
+					j = 0;
+					while ( (clazz = classes[j++]) ) {
+						// Remove *all* instances
+						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
+							cur = cur.replace( " " + clazz + " ", " " );
+						}
+					}
+
+					// Only assign if different to avoid unneeded rendering.
+					finalValue = value ? jQuery.trim( cur ) : "";
+					if ( elem.className !== finalValue ) {
+						elem.className = finalValue;
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value;
+
+		if ( typeof stateVal === "boolean" && type === "string" ) {
+			return stateVal ? this.addClass( value ) : this.removeClass( value );
+		}
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( i ) {
+				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
+			});
+		}
+
+		return this.each(function() {
+			if ( type === "string" ) {
+				// Toggle individual class names
+				var className,
+					i = 0,
+					self = jQuery( this ),
+					classNames = value.match( rnotwhite ) || [];
+
+				while ( (className = classNames[ i++ ]) ) {
+					// Check each className given, space separated list
+					if ( self.hasClass( className ) ) {
+						self.removeClass( className );
+					} else {
+						self.addClass( className );
+					}
+				}
+
+			// Toggle whole class name
+			} else if ( type === strundefined || type === "boolean" ) {
+				if ( this.className ) {
+					// store className if set
+					data_priv.set( this, "__className__", this.className );
+				}
+
+				// If the element has a class name or if we're passed `false`,
+				// then remove the whole classname (if there was one, the above saved it).
+				// Otherwise bring back whatever was previously saved (if anything),
+				// falling back to the empty string if nothing was stored.
+				this.className = this.className || value === false ? "" : data_priv.get( this, "__className__" ) || "";
+			}
+		});
+	},
+
+	hasClass: function( selector ) {
+		var className = " " + selector + " ",
+			i = 0,
+			l = this.length;
+		for ( ; i < l; i++ ) {
+			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+});
+
+
+
+
+var rreturn = /\r/g;
+
+jQuery.fn.extend({
+	val: function( value ) {
+		var hooks, ret, isFunction,
+			elem = this[0];
+
+		if ( !arguments.length ) {
+			if ( elem ) {
+				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+
+				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
+					return ret;
+				}
+
+				ret = elem.value;
+
+				return typeof ret === "string" ?
+					// Handle most common string cases
+					ret.replace(rreturn, "") :
+					// Handle cases where value is null/undef or number
+					ret == null ? "" : ret;
+			}
+
+			return;
+		}
+
+		isFunction = jQuery.isFunction( value );
+
+		return this.each(function( i ) {
+			var val;
+
+			if ( this.nodeType !== 1 ) {
+				return;
+			}
+
+			if ( isFunction ) {
+				val = value.call( this, i, jQuery( this ).val() );
+			} else {
+				val = value;
+			}
+
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+
+			} else if ( typeof val === "number" ) {
+				val += "";
+
+			} else if ( jQuery.isArray( val ) ) {
+				val = jQuery.map( val, function( value ) {
+					return value == null ? "" : value + "";
+				});
+			}
+
+			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
+
+			// If set returns undefined, fall back to normal setting
+			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
+				this.value = val;
+			}
+		});
+	}
+});
+
+jQuery.extend({
+	valHooks: {
+		option: {
+			get: function( elem ) {
+				var val = jQuery.find.attr( elem, "value" );
+				return val != null ?
+					val :
+					// Support: IE10-11+
+					// option.text throws exceptions (#14686, #14858)
+					jQuery.trim( jQuery.text( elem ) );
+			}
+		},
+		select: {
+			get: function( elem ) {
+				var value, option,
+					options = elem.options,
+					index = elem.selectedIndex,
+					one = elem.type === "select-one" || index < 0,
+					values = one ? null : [],
+					max = one ? index + 1 : options.length,
+					i = index < 0 ?
+						max :
+						one ? index : 0;
+
+				// Loop through all the selected options
+				for ( ; i < max; i++ ) {
+					option = options[ i ];
+
+					// IE6-9 doesn't update selected after form reset (#2551)
+					if ( ( option.selected || i === index ) &&
+							// Don't return options that are disabled or in a disabled optgroup
+							( support.optDisabled ? !option.disabled : option.getAttribute( "disabled" ) === null ) &&
+							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
+
+						// Get the specific value for the option
+						value = jQuery( option ).val();
+
+						// We don't need an array for one selects
+						if ( one ) {
+							return value;
+						}
+
+						// Multi-Selects return an array
+						values.push( value );
+					}
+				}
+
+				return values;
+			},
+
+			set: function( elem, value ) {
+				var optionSet, option,
+					options = elem.options,
+					values = jQuery.makeArray( value ),
+					i = options.length;
+
+				while ( i-- ) {
+					option = options[ i ];
+					if ( (option.selected = jQuery.inArray( option.value, values ) >= 0) ) {
+						optionSet = true;
+					}
+				}
+
+				// Force browsers to behave consistently when non-matching value is set
+				if ( !optionSet ) {
+					elem.selectedIndex = -1;
+				}
+				return values;
+			}
+		}
+	}
+});
+
+// Radios and checkboxes getter/setter
+jQuery.each([ "radio", "checkbox" ], function() {
+	jQuery.valHooks[ this ] = {
+		set: function( elem, value ) {
+			if ( jQuery.isArray( value ) ) {
+				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
+			}
+		}
+	};
+	if ( !support.checkOn ) {
+		jQuery.valHooks[ this ].get = function( elem ) {
+			return elem.getAttribute("value") === null ? "on" : elem.value;
+		};
+	}
+});
+
+
+
+
+// Return jQuery for attributes-only inclusion
+
+
+jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
+
+	// Handle event binding
+	jQuery.fn[ name ] = function( data, fn ) {
+		return arguments.length > 0 ?
+			this.on( name, null, data, fn ) :
+			this.trigger( name );
+	};
+});
+
+jQuery.fn.extend({
+	hover: function( fnOver, fnOut ) {
+		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+	},
+
+	bind: function( types, data, fn ) {
+		return this.on( types, null, data, fn );
+	},
+	unbind: function( types, fn ) {
+		return this.off( types, null, fn );
+	},
+
+	delegate: function( selector, types, data, fn ) {
+		return this.on( types, selector, data, fn );
+	},
+	undelegate: function( selector, types, fn ) {
+		// ( namespace ) or ( selector, types [, fn] )
+		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
+	}
+});
+
+
+var nonce = jQuery.now();
+
+var rquery = (/\?/);
+
+
+
+// Support: Android 2.3
+// Workaround failure to string-cast null input
+jQuery.parseJSON = function( data ) {
+	return JSON.parse( data + "" );
+};
+
+
+// Cross-browser xml parsing
+jQuery.parseXML = function( data ) {
+	var xml, tmp;
+	if ( !data || typeof data !== "string" ) {
+		return null;
+	}
+
+	// Support: IE9
+	try {
+		tmp = new DOMParser();
+		xml = tmp.parseFromString( data, "text/xml" );
+	} catch ( e ) {
+		xml = undefined;
+	}
+
+	if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
+		jQuery.error( "Invalid XML: " + data );
+	}
+	return xml;
+};
+
+
+var
+	rhash = /#.*$/,
+	rts = /([?&])_=[^&]*/,
+	rheaders = /^(.*?):[ \t]*([^\r\n]*)$/mg,
+	// #7653, #8125, #8152: local protocol detection
+	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
+	rnoContent = /^(?:GET|HEAD)$/,
+	rprotocol = /^\/\//,
+	rurl = /^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,
+
+	/* Prefilters
+	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
+	 * 2) These are called:
+	 *    - BEFORE asking for a transport
+	 *    - AFTER param serialization (s.data is a string if s.processData is true)
+	 * 3) key is the dataType
+	 * 4) the catchall symbol "*" can be used
+	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
+	 */
+	prefilters = {},
+
+	/* Transports bindings
+	 * 1) key is the dataType
+	 * 2) the catchall symbol "*" can be used
+	 * 3) selection will start with transport dataType and THEN go to "*" if needed
+	 */
+	transports = {},
+
+	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
+	allTypes = "*/".concat( "*" ),
+
+	// Document location
+	ajaxLocation = window.location.href,
+
+	// Segment location into parts
+	ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
+
+// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
+function addToPrefiltersOrTransports( structure ) {
+
+	// dataTypeExpression is optional and defaults to "*"
+	return function( dataTypeExpression, func ) {
+
+		if ( typeof dataTypeExpression !== "string" ) {
+			func = dataTypeExpression;
+			dataTypeExpression = "*";
+		}
+
+		var dataType,
+			i = 0,
+			dataTypes = dataTypeExpression.toLowerCase().match( rnotwhite ) || [];
+
+		if ( jQuery.isFunction( func ) ) {
+			// For each dataType in the dataTypeExpression
+			while ( (dataType = dataTypes[i++]) ) {
+				// Prepend if requested
+				if ( dataType[0] === "+" ) {
+					dataType = dataType.slice( 1 ) || "*";
+					(structure[ dataType ] = structure[ dataType ] || []).unshift( func );
+
+				// Otherwise append
+				} else {
+					(structure[ dataType ] = structure[ dataType ] || []).push( func );
+				}
+			}
+		}
+	};
+}
+
+// Base inspection function for prefilters and transports
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
+
+	var inspected = {},
+		seekingTransport = ( structure === transports );
+
+	function inspect( dataType ) {
+		var selected;
+		inspected[ dataType ] = true;
+		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
+			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
+			if ( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
+				options.dataTypes.unshift( dataTypeOrTransport );
+				inspect( dataTypeOrTransport );
+				return false;
+			} else if ( seekingTransport ) {
+				return !( selected = dataTypeOrTransport );
+			}
+		});
+		return selected;
+	}
+
+	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
+}
+
+// A special extend for ajax options
+// that takes "flat" options (not to be deep extended)
+// Fixes #9887
+function ajaxExtend( target, src ) {
+	var key, deep,
+		flatOptions = jQuery.ajaxSettings.flatOptions || {};
+
+	for ( key in src ) {
+		if ( src[ key ] !== undefined ) {
+			( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
+		}
+	}
+	if ( deep ) {
+		jQuery.extend( true, target, deep );
+	}
+
+	return target;
+}
+
+/* Handles responses to an ajax request:
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+
+	var ct, type, finalDataType, firstDataType,
+		contents = s.contents,
+		dataTypes = s.dataTypes;
+
+	// Remove auto dataType and get content-type in the process
+	while ( dataTypes[ 0 ] === "*" ) {
+		dataTypes.shift();
+		if ( ct === undefined ) {
+			ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
+		}
+	}
+
+	// Check if we're dealing with a known content-type
+	if ( ct ) {
+		for ( type in contents ) {
+			if ( contents[ type ] && contents[ type ].test( ct ) ) {
+				dataTypes.unshift( type );
+				break;
+			}
+		}
+	}
+
+	// Check to see if we have a response for the expected dataType
+	if ( dataTypes[ 0 ] in responses ) {
+		finalDataType = dataTypes[ 0 ];
+	} else {
+		// Try convertible dataTypes
+		for ( type in responses ) {
+			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
+				finalDataType = type;
+				break;
+			}
+			if ( !firstDataType ) {
+				firstDataType = type;
+			}
+		}
+		// Or just use first one
+		finalDataType = finalDataType || firstDataType;
+	}
+
+	// If we found a dataType
+	// We add the dataType to the list if needed
+	// and return the corresponding response
+	if ( finalDataType ) {
+		if ( finalDataType !== dataTypes[ 0 ] ) {
+			dataTypes.unshift( finalDataType );
+		}
+		return responses[ finalDataType ];
+	}
+}
+
+/* Chain conversions given the request and the original response
+ * Also sets the responseXXX fields on the jqXHR instance
+ */
+function ajaxConvert( s, response, jqXHR, isSuccess ) {
+	var conv2, current, conv, tmp, prev,
+		converters = {},
+		// Work with a copy of dataTypes in case we need to modify it for conversion
+		dataTypes = s.dataTypes.slice();
+
+	// Create converters map with lowercased keys
+	if ( dataTypes[ 1 ] ) {
+		for ( conv in s.converters ) {
+			converters[ conv.toLowerCase() ] = s.converters[ conv ];
+		}
+	}
+
+	current = dataTypes.shift();
+
+	// Convert to each sequential dataType
+	while ( current ) {
+
+		if ( s.responseFields[ current ] ) {
+			jqXHR[ s.responseFields[ current ] ] = response;
+		}
+
+		// Apply the dataFilter if provided
+		if ( !prev && isSuccess && s.dataFilter ) {
+			response = s.dataFilter( response, s.dataType );
+		}
+
+		prev = current;
+		current = dataTypes.shift();
+
+		if ( current ) {
+
+		// There's only work to do if current dataType is non-auto
+			if ( current === "*" ) {
+
+				current = prev;
+
+			// Convert response if prev dataType is non-auto and differs from current
+			} else if ( prev !== "*" && prev !== current ) {
+
+				// Seek a direct converter
+				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
+
+				// If none found, seek a pair
+				if ( !conv ) {
+					for ( conv2 in converters ) {
+
+						// If conv2 outputs current
+						tmp = conv2.split( " " );
+						if ( tmp[ 1 ] === current ) {
+
+							// If prev can be converted to accepted input
+							conv = converters[ prev + " " + tmp[ 0 ] ] ||
+								converters[ "* " + tmp[ 0 ] ];
+							if ( conv ) {
+								// Condense equivalence converters
+								if ( conv === true ) {
+									conv = converters[ conv2 ];
+
+								// Otherwise, insert the intermediate dataType
+								} else if ( converters[ conv2 ] !== true ) {
+									current = tmp[ 0 ];
+									dataTypes.unshift( tmp[ 1 ] );
+								}
+								break;
+							}
+						}
+					}
+				}
+
+				// Apply converter (if not an equivalence)
+				if ( conv !== true ) {
+
+					// Unless errors are allowed to bubble, catch and return them
+					if ( conv && s[ "throws" ] ) {
+						response = conv( response );
+					} else {
+						try {
+							response = conv( response );
+						} catch ( e ) {
+							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return { state: "success", data: response };
+}
+
+jQuery.extend({
+
+	// Counter for holding the number of active queries
+	active: 0,
+
+	// Last-Modified header cache for next request
+	lastModified: {},
+	etag: {},
+
+	ajaxSettings: {
+		url: ajaxLocation,
+		type: "GET",
+		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
+		global: true,
+		processData: true,
+		async: true,
+		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+		/*
+		timeout: 0,
+		data: null,
+		dataType: null,
+		username: null,
+		password: null,
+		cache: null,
+		throws: false,
+		traditional: false,
+		headers: {},
+		*/
+
+		accepts: {
+			"*": allTypes,
+			text: "text/plain",
+			html: "text/html",
+			xml: "application/xml, text/xml",
+			json: "application/json, text/javascript"
+		},
+
+		contents: {
+			xml: /xml/,
+			html: /html/,
+			json: /json/
+		},
+
+		responseFields: {
+			xml: "responseXML",
+			text: "responseText",
+			json: "responseJSON"
+		},
+
+		// Data converters
+		// Keys separate source (or catchall "*") and destination types with a single space
+		converters: {
+
+			// Convert anything to text
+			"* text": String,
+
+			// Text to html (true = no transformation)
+			"text html": true,
+
+			// Evaluate text as a json expression
+			"text json": jQuery.parseJSON,
+
+			// Parse text as xml
+			"text xml": jQuery.parseXML
+		},
+
+		// For options that shouldn't be deep extended:
+		// you can add your own custom options here if
+		// and when you create one that shouldn't be
+		// deep extended (see ajaxExtend)
+		flatOptions: {
+			url: true,
+			context: true
+		}
+	},
+
+	// Creates a full fledged settings object into target
+	// with both ajaxSettings and settings fields.
+	// If target is omitted, writes into ajaxSettings.
+	ajaxSetup: function( target, settings ) {
+		return settings ?
+
+			// Building a settings object
+			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
+
+			// Extending ajaxSettings
+			ajaxExtend( jQuery.ajaxSettings, target );
+	},
+
+	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+	ajaxTransport: addToPrefiltersOrTransports( transports ),
+
+	// Main method
+	ajax: function( url, options ) {
+
+		// If url is an object, simulate pre-1.5 signature
+		if ( typeof url === "object" ) {
+			options = url;
+			url = undefined;
+		}
+
+		// Force options to be an object
+		options = options || {};
+
+		var transport,
+			// URL without anti-cache param
+			cacheURL,
+			// Response headers
+			responseHeadersString,
+			responseHeaders,
+			// timeout handle
+			timeoutTimer,
+			// Cross-domain detection vars
+			parts,
+			// To know if global events are to be dispatched
+			fireGlobals,
+			// Loop variable
+			i,
+			// Create the final options object
+			s = jQuery.ajaxSetup( {}, options ),
+			// Callbacks context
+			callbackContext = s.context || s,
+			// Context for global events is callbackContext if it is a DOM node or jQuery collection
+			globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
+				jQuery( callbackContext ) :
+				jQuery.event,
+			// Deferreds
+			deferred = jQuery.Deferred(),
+			completeDeferred = jQuery.Callbacks("once memory"),
+			// Status-dependent callbacks
+			statusCode = s.statusCode || {},
+			// Headers (they are sent all at once)
+			requestHeaders = {},
+			requestHeadersNames = {},
+			// The jqXHR state
+			state = 0,
+			// Default abort message
+			strAbort = "canceled",
+			// Fake xhr
+			jqXHR = {
+				readyState: 0,
+
+				// Builds headers hashtable if needed
+				getResponseHeader: function( key ) {
+					var match;
+					if ( state === 2 ) {
+						if ( !responseHeaders ) {
+							responseHeaders = {};
+							while ( (match = rheaders.exec( responseHeadersString )) ) {
+								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
+							}
+						}
+						match = responseHeaders[ key.toLowerCase() ];
+					}
+					return match == null ? null : match;
+				},
+
+				// Raw string
+				getAllResponseHeaders: function() {
+					return state === 2 ? responseHeadersString : null;
+				},
+
+				// Caches the header
+				setRequestHeader: function( name, value ) {
+					var lname = name.toLowerCase();
+					if ( !state ) {
+						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
+						requestHeaders[ name ] = value;
+					}
+					return this;
+				},
+
+				// Overrides response content-type header
+				overrideMimeType: function( type ) {
+					if ( !state ) {
+						s.mimeType = type;
+					}
+					return this;
+				},
+
+				// Status-dependent callbacks
+				statusCode: function( map ) {
+					var code;
+					if ( map ) {
+						if ( state < 2 ) {
+							for ( code in map ) {
+								// Lazy-add the new callback in a way that preserves old ones
+								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
+							}
+						} else {
+							// Execute the appropriate callbacks
+							jqXHR.always( map[ jqXHR.status ] );
+						}
+					}
+					return this;
+				},
+
+				// Cancel the request
+				abort: function( statusText ) {
+					var finalText = statusText || strAbort;
+					if ( transport ) {
+						transport.abort( finalText );
+					}
+					done( 0, finalText );
+					return this;
+				}
+			};
+
+		// Attach deferreds
+		deferred.promise( jqXHR ).complete = completeDeferred.add;
+		jqXHR.success = jqXHR.done;
+		jqXHR.error = jqXHR.fail;
+
+		// Remove hash character (#7531: and string promotion)
+		// Add protocol if not provided (prefilters might expect it)
+		// Handle falsy url in the settings object (#10093: consistency with old signature)
+		// We also use the url parameter if available
+		s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" )
+			.replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+
+		// Alias method option to type as per ticket #12004
+		s.type = options.method || options.type || s.method || s.type;
+
+		// Extract dataTypes list
+		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( rnotwhite ) || [ "" ];
+
+		// A cross-domain request is in order when we have a protocol:host:port mismatch
+		if ( s.crossDomain == null ) {
+			parts = rurl.exec( s.url.toLowerCase() );
+			s.crossDomain = !!( parts &&
+				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
+					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? "80" : "443" ) ) !==
+						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? "80" : "443" ) ) )
+			);
+		}
+
+		// Convert data if not already a string
+		if ( s.data && s.processData && typeof s.data !== "string" ) {
+			s.data = jQuery.param( s.data, s.traditional );
+		}
+
+		// Apply prefilters
+		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+
+		// If request was aborted inside a prefilter, stop there
+		if ( state === 2 ) {
+			return jqXHR;
+		}
+
+		// We can fire global events as of now if asked to
+		// Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118)
+		fireGlobals = jQuery.event && s.global;
+
+		// Watch for a new set of requests
+		if ( fireGlobals && jQuery.active++ === 0 ) {
+			jQuery.event.trigger("ajaxStart");
+		}
+
+		// Uppercase the type
+		s.type = s.type.toUpperCase();
+
+		// Determine if request has content
+		s.hasContent = !rnoContent.test( s.type );
+
+		// Save the URL in case we're toying with the If-Modified-Since
+		// and/or If-None-Match header later on
+		cacheURL = s.url;
+
+		// More options handling for requests with no content
+		if ( !s.hasContent ) {
+
+			// If data is available, append data to url
+			if ( s.data ) {
+				cacheURL = ( s.url += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
+				// #9682: remove data so that it's not used in an eventual retry
+				delete s.data;
+			}
+
+			// Add anti-cache in url if needed
+			if ( s.cache === false ) {
+				s.url = rts.test( cacheURL ) ?
+
+					// If there is already a '_' parameter, set its value
+					cacheURL.replace( rts, "$1_=" + nonce++ ) :
+
+					// Otherwise add one to the end
+					cacheURL + ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + nonce++;
+			}
+		}
+
+		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+		if ( s.ifModified ) {
+			if ( jQuery.lastModified[ cacheURL ] ) {
+				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
+			}
+			if ( jQuery.etag[ cacheURL ] ) {
+				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
+			}
+		}
+
+		// Set the correct header, if data is being sent
+		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+			jqXHR.setRequestHeader( "Content-Type", s.contentType );
+		}
+
+		// Set the Accepts header for the server, depending on the dataType
+		jqXHR.setRequestHeader(
+			"Accept",
+			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
+				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+				s.accepts[ "*" ]
+		);
+
+		// Check for headers option
+		for ( i in s.headers ) {
+			jqXHR.setRequestHeader( i, s.headers[ i ] );
+		}
+
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+			// Abort if not done already and return
+			return jqXHR.abort();
+		}
+
+		// Aborting is no longer a cancellation
+		strAbort = "abort";
+
+		// Install callbacks on deferreds
+		for ( i in { success: 1, error: 1, complete: 1 } ) {
+			jqXHR[ i ]( s[ i ] );
+		}
+
+		// Get transport
+		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+
+		// If no transport, we auto-abort
+		if ( !transport ) {
+			done( -1, "No Transport" );
+		} else {
+			jqXHR.readyState = 1;
+
+			// Send global event
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+			}
+			// Timeout
+			if ( s.async && s.timeout > 0 ) {
+				timeoutTimer = setTimeout(function() {
+					jqXHR.abort("timeout");
+				}, s.timeout );
+			}
+
+			try {
+				state = 1;
+				transport.send( requestHeaders, done );
+			} catch ( e ) {
+				// Propagate exception as error if not done
+				if ( state < 2 ) {
+					done( -1, e );
+				// Simply rethrow otherwise
+				} else {
+					throw e;
+				}
+			}
+		}
+
+		// Callback for when everything is done
+		function done( status, nativeStatusText, responses, headers ) {
+			var isSuccess, success, error, response, modified,
+				statusText = nativeStatusText;
+
+			// Called once
+			if ( state === 2 ) {
+				return;
+			}
+
+			// State is "done" now
+			state = 2;
+
+			// Clear timeout if it exists
+			if ( timeoutTimer ) {
+				clearTimeout( timeoutTimer );
+			}
+
+			// Dereference transport for early garbage collection
+			// (no matter how long the jqXHR object will be used)
+			transport = undefined;
+
+			// Cache response headers
+			responseHeadersString = headers || "";
+
+			// Set readyState
+			jqXHR.readyState = status > 0 ? 4 : 0;
+
+			// Determine if successful
+			isSuccess = status >= 200 && status < 300 || status === 304;
+
+			// Get response data
+			if ( responses ) {
+				response = ajaxHandleResponses( s, jqXHR, responses );
+			}
+
+			// Convert no matter what (that way responseXXX fields are always set)
+			response = ajaxConvert( s, response, jqXHR, isSuccess );
+
+			// If successful, handle type chaining
+			if ( isSuccess ) {
+
+				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+				if ( s.ifModified ) {
+					modified = jqXHR.getResponseHeader("Last-Modified");
+					if ( modified ) {
+						jQuery.lastModified[ cacheURL ] = modified;
+					}
+					modified = jqXHR.getResponseHeader("etag");
+					if ( modified ) {
+						jQuery.etag[ cacheURL ] = modified;
+					}
+				}
+
+				// if no content
+				if ( status === 204 || s.type === "HEAD" ) {
+					statusText = "nocontent";
+
+				// if not modified
+				} else if ( status === 304 ) {
+					statusText = "notmodified";
+
+				// If we have data, let's convert it
+				} else {
+					statusText = response.state;
+					success = response.data;
+					error = response.error;
+					isSuccess = !error;
+				}
+			} else {
+				// Extract error from statusText and normalize for non-aborts
+				error = statusText;
+				if ( status || !statusText ) {
+					statusText = "error";
+					if ( status < 0 ) {
+						status = 0;
+					}
+				}
+			}
+
+			// Set data for the fake xhr object
+			jqXHR.status = status;
+			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
+
+			// Success/Error
+			if ( isSuccess ) {
+				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+			} else {
+				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
+			}
+
+			// Status-dependent callbacks
+			jqXHR.statusCode( statusCode );
+			statusCode = undefined;
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
+					[ jqXHR, s, isSuccess ? success : error ] );
+			}
+
+			// Complete
+			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
+				// Handle the global AJAX counter
+				if ( !( --jQuery.active ) ) {
+					jQuery.event.trigger("ajaxStop");
+				}
+			}
+		}
+
+		return jqXHR;
+	},
+
+	getJSON: function( url, data, callback ) {
+		return jQuery.get( url, data, callback, "json" );
+	},
+
+	getScript: function( url, callback ) {
+		return jQuery.get( url, undefined, callback, "script" );
+	}
+});
+
+jQuery.each( [ "get", "post" ], function( i, method ) {
+	jQuery[ method ] = function( url, data, callback, type ) {
+		// Shift arguments if data argument was omitted
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = undefined;
+		}
+
+		return jQuery.ajax({
+			url: url,
+			type: method,
+			dataType: type,
+			data: data,
+			success: callback
+		});
+	};
+});
+
+
+jQuery._evalUrl = function( url ) {
+	return jQuery.ajax({
+		url: url,
+		type: "GET",
+		dataType: "script",
+		async: false,
+		global: false,
+		"throws": true
+	});
+};
+
+
+jQuery.fn.extend({
+	wrapAll: function( html ) {
+		var wrap;
+
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function( i ) {
+				jQuery( this ).wrapAll( html.call(this, i) );
+			});
+		}
+
+		if ( this[ 0 ] ) {
+
+			// The elements to wrap the target around
+			wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
+
+			if ( this[ 0 ].parentNode ) {
+				wrap.insertBefore( this[ 0 ] );
+			}
+
+			wrap.map(function() {
+				var elem = this;
+
+				while ( elem.firstElementChild ) {
+					elem = elem.firstElementChild;
+				}
+
+				return elem;
+			}).append( this );
+		}
+
+		return this;
+	},
+
+	wrapInner: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function( i ) {
+				jQuery( this ).wrapInner( html.call(this, i) );
+			});
+		}
+
+		return this.each(function() {
+			var self = jQuery( this ),
+				contents = self.contents();
+
+			if ( contents.length ) {
+				contents.wrapAll( html );
+
+			} else {
+				self.append( html );
+			}
+		});
+	},
+
+	wrap: function( html ) {
+		var isFunction = jQuery.isFunction( html );
+
+		return this.each(function( i ) {
+			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
+		});
+	},
+
+	unwrap: function() {
+		return this.parent().each(function() {
+			if ( !jQuery.nodeName( this, "body" ) ) {
+				jQuery( this ).replaceWith( this.childNodes );
+			}
+		}).end();
+	}
+});
+
+
+jQuery.expr.filters.hidden = function( elem ) {
+	// Support: Opera <= 12.12
+	// Opera reports offsetWidths and offsetHeights less than zero on some elements
+	return elem.offsetWidth <= 0 && elem.offsetHeight <= 0;
+};
+jQuery.expr.filters.visible = function( elem ) {
+	return !jQuery.expr.filters.hidden( elem );
+};
+
+
+
+
+var r20 = /%20/g,
+	rbracket = /\[\]$/,
+	rCRLF = /\r?\n/g,
+	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
+	rsubmittable = /^(?:input|select|textarea|keygen)/i;
+
+function buildParams( prefix, obj, traditional, add ) {
+	var name;
+
+	if ( jQuery.isArray( obj ) ) {
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+				// Item is non-scalar (array or object), encode its numeric index.
+				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
+			}
+		});
+
+	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
+		// Serialize object item.
+		for ( name in obj ) {
+			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+		}
+
+	} else {
+		// Serialize scalar item.
+		add( prefix, obj );
+	}
+}
+
+// Serialize an array of form elements or a set of
+// key/values into a query string
+jQuery.param = function( a, traditional ) {
+	var prefix,
+		s = [],
+		add = function( key, value ) {
+			// If value is a function, invoke it and return its value
+			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
+			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
+		};
+
+	// Set traditional to true for jQuery <= 1.3.2 behavior.
+	if ( traditional === undefined ) {
+		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
+	}
+
+	// If an array was passed in, assume that it is an array of form elements.
+	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+		// Serialize the form elements
+		jQuery.each( a, function() {
+			add( this.name, this.value );
+		});
+
+	} else {
+		// If traditional, encode the "old" way (the way 1.3.2 or older
+		// did it), otherwise encode params recursively.
+		for ( prefix in a ) {
+			buildParams( prefix, a[ prefix ], traditional, add );
+		}
+	}
+
+	// Return the resulting serialization
+	return s.join( "&" ).replace( r20, "+" );
+};
+
+jQuery.fn.extend({
+	serialize: function() {
+		return jQuery.param( this.serializeArray() );
+	},
+	serializeArray: function() {
+		return this.map(function() {
+			// Can add propHook for "elements" to filter or add form elements
+			var elements = jQuery.prop( this, "elements" );
+			return elements ? jQuery.makeArray( elements ) : this;
+		})
+		.filter(function() {
+			var type = this.type;
+
+			// Use .is( ":disabled" ) so that fieldset[disabled] works
+			return this.name && !jQuery( this ).is( ":disabled" ) &&
+				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
+				( this.checked || !rcheckableType.test( type ) );
+		})
+		.map(function( i, elem ) {
+			var val = jQuery( this ).val();
+
+			return val == null ?
+				null :
+				jQuery.isArray( val ) ?
+					jQuery.map( val, function( val ) {
+						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+					}) :
+					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+		}).get();
+	}
+});
+
+
+jQuery.ajaxSettings.xhr = function() {
+	try {
+		return new XMLHttpRequest();
+	} catch( e ) {}
+};
+
+var xhrId = 0,
+	xhrCallbacks = {},
+	xhrSuccessStatus = {
+		// file protocol always yields status code 0, assume 200
+		0: 200,
+		// Support: IE9
+		// #1450: sometimes IE returns 1223 when it should be 204
+		1223: 204
+	},
+	xhrSupported = jQuery.ajaxSettings.xhr();
+
+// Support: IE9
+// Open requests must be manually aborted on unload (#5280)
+// See https://support.microsoft.com/kb/2856746 for more info
+if ( window.attachEvent ) {
+	window.attachEvent( "onunload", function() {
+		for ( var key in xhrCallbacks ) {
+			xhrCallbacks[ key ]();
+		}
+	});
+}
+
+support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
+support.ajax = xhrSupported = !!xhrSupported;
+
+jQuery.ajaxTransport(function( options ) {
+	var callback;
+
+	// Cross domain only allowed if supported through XMLHttpRequest
+	if ( support.cors || xhrSupported && !options.crossDomain ) {
+		return {
+			send: function( headers, complete ) {
+				var i,
+					xhr = options.xhr(),
+					id = ++xhrId;
+
+				xhr.open( options.type, options.url, options.async, options.username, options.password );
+
+				// Apply custom fields if provided
+				if ( options.xhrFields ) {
+					for ( i in options.xhrFields ) {
+						xhr[ i ] = options.xhrFields[ i ];
+					}
+				}
+
+				// Override mime type if needed
+				if ( options.mimeType && xhr.overrideMimeType ) {
+					xhr.overrideMimeType( options.mimeType );
+				}
+
+				// X-Requested-With header
+				// For cross-domain requests, seeing as conditions for a preflight are
+				// akin to a jigsaw puzzle, we simply never set it to be sure.
+				// (it can always be set on a per-request basis or even using ajaxSetup)
+				// For same-domain requests, won't change header if already provided.
+				if ( !options.crossDomain && !headers["X-Requested-With"] ) {
+					headers["X-Requested-With"] = "XMLHttpRequest";
+				}
+
+				// Set headers
+				for ( i in headers ) {
+					xhr.setRequestHeader( i, headers[ i ] );
+				}
+
+				// Callback
+				callback = function( type ) {
+					return function() {
+						if ( callback ) {
+							delete xhrCallbacks[ id ];
+							callback = xhr.onload = xhr.onerror = null;
+
+							if ( type === "abort" ) {
+								xhr.abort();
+							} else if ( type === "error" ) {
+								complete(
+									// file: protocol always yields status 0; see #8605, #14207
+									xhr.status,
+									xhr.statusText
+								);
+							} else {
+								complete(
+									xhrSuccessStatus[ xhr.status ] || xhr.status,
+									xhr.statusText,
+									// Support: IE9
+									// Accessing binary-data responseText throws an exception
+									// (#11426)
+									typeof xhr.responseText === "string" ? {
+										text: xhr.responseText
+									} : undefined,
+									xhr.getAllResponseHeaders()
+								);
+							}
+						}
+					};
+				};
+
+				// Listen to events
+				xhr.onload = callback();
+				xhr.onerror = callback("error");
+
+				// Create the abort callback
+				callback = xhrCallbacks[ id ] = callback("abort");
+
+				try {
+					// Do send the request (this may raise an exception)
+					xhr.send( options.hasContent && options.data || null );
+				} catch ( e ) {
+					// #14683: Only rethrow if this hasn't been notified as an error yet
+					if ( callback ) {
+						throw e;
+					}
+				}
+			},
+
+			abort: function() {
+				if ( callback ) {
+					callback();
+				}
+			}
+		};
+	}
+});
+
+
+
+
+// Install script dataType
+jQuery.ajaxSetup({
+	accepts: {
+		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+	},
+	contents: {
+		script: /(?:java|ecma)script/
+	},
+	converters: {
+		"text script": function( text ) {
+			jQuery.globalEval( text );
+			return text;
+		}
+	}
+});
+
+// Handle cache's special case and crossDomain
+jQuery.ajaxPrefilter( "script", function( s ) {
+	if ( s.cache === undefined ) {
+		s.cache = false;
+	}
+	if ( s.crossDomain ) {
+		s.type = "GET";
+	}
+});
+
+// Bind script tag hack transport
+jQuery.ajaxTransport( "script", function( s ) {
+	// This transport only deals with cross domain requests
+	if ( s.crossDomain ) {
+		var script, callback;
+		return {
+			send: function( _, complete ) {
+				script = jQuery("<script>").prop({
+					async: true,
+					charset: s.scriptCharset,
+					src: s.url
+				}).on(
+					"load error",
+					callback = function( evt ) {
+						script.remove();
+						callback = null;
+						if ( evt ) {
+							complete( evt.type === "error" ? 404 : 200, evt.type );
+						}
+					}
+				);
+				document.head.appendChild( script[ 0 ] );
+			},
+			abort: function() {
+				if ( callback ) {
+					callback();
+				}
+			}
+		};
+	}
+});
+
+
+
+
+var oldCallbacks = [],
+	rjsonp = /(=)\?(?=&|$)|\?\?/;
+
+// Default jsonp settings
+jQuery.ajaxSetup({
+	jsonp: "callback",
+	jsonpCallback: function() {
+		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
+		this[ callback ] = true;
+		return callback;
+	}
+});
+
+// Detect, normalize options and install callbacks for jsonp requests
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+
+	var callbackName, overwritten, responseContainer,
+		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
+			"url" :
+			typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
+		);
+
+	// Handle iff the expected data type is "jsonp" or we have a parameter to set
+	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
+
+		// Get callback name, remembering preexisting value associated with it
+		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
+			s.jsonpCallback() :
+			s.jsonpCallback;
+
+		// Insert callback into url or form data
+		if ( jsonProp ) {
+			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
+		} else if ( s.jsonp !== false ) {
+			s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
+		}
+
+		// Use data converter to retrieve json after script execution
+		s.converters["script json"] = function() {
+			if ( !responseContainer ) {
+				jQuery.error( callbackName + " was not called" );
+			}
+			return responseContainer[ 0 ];
+		};
+
+		// force json dataType
+		s.dataTypes[ 0 ] = "json";
+
+		// Install callback
+		overwritten = window[ callbackName ];
+		window[ callbackName ] = function() {
+			responseContainer = arguments;
+		};
+
+		// Clean-up function (fires after converters)
+		jqXHR.always(function() {
+			// Restore preexisting value
+			window[ callbackName ] = overwritten;
+
+			// Save back as free
+			if ( s[ callbackName ] ) {
+				// make sure that re-using the options doesn't screw things around
+				s.jsonpCallback = originalSettings.jsonpCallback;
+
+				// save the callback name for future use
+				oldCallbacks.push( callbackName );
+			}
+
+			// Call if it was a function and we have a response
+			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
+				overwritten( responseContainer[ 0 ] );
+			}
+
+			responseContainer = overwritten = undefined;
+		});
+
+		// Delegate to script
+		return "script";
+	}
+});
+
+
+
+
+// data: string of html
+// context (optional): If specified, the fragment will be created in this context, defaults to document
+// keepScripts (optional): If true, will include scripts passed in the html string
+jQuery.parseHTML = function( data, context, keepScripts ) {
+	if ( !data || typeof data !== "string" ) {
+		return null;
+	}
+	if ( typeof context === "boolean" ) {
+		keepScripts = context;
+		context = false;
+	}
+	context = context || document;
+
+	var parsed = rsingleTag.exec( data ),
+		scripts = !keepScripts && [];
+
+	// Single tag
+	if ( parsed ) {
+		return [ context.createElement( parsed[1] ) ];
+	}
+
+	parsed = jQuery.buildFragment( [ data ], context, scripts );
+
+	if ( scripts && scripts.length ) {
+		jQuery( scripts ).remove();
+	}
+
+	return jQuery.merge( [], parsed.childNodes );
+};
+
+
+// Keep a copy of the old load method
+var _load = jQuery.fn.load;
+
+/**
+ * Load a url into a page
+ */
+jQuery.fn.load = function( url, params, callback ) {
+	if ( typeof url !== "string" && _load ) {
+		return _load.apply( this, arguments );
+	}
+
+	var selector, type, response,
+		self = this,
+		off = url.indexOf(" ");
+
+	if ( off >= 0 ) {
+		selector = jQuery.trim( url.slice( off ) );
+		url = url.slice( 0, off );
+	}
+
+	// If it's a function
+	if ( jQuery.isFunction( params ) ) {
+
+		// We assume that it's the callback
+		callback = params;
+		params = undefined;
+
+	// Otherwise, build a param string
+	} else if ( params && typeof params === "object" ) {
+		type = "POST";
+	}
+
+	// If we have elements to modify, make the request
+	if ( self.length > 0 ) {
+		jQuery.ajax({
+			url: url,
+
+			// if "type" variable is undefined, then "GET" method will be used
+			type: type,
+			dataType: "html",
+			data: params
+		}).done(function( responseText ) {
+
+			// Save response for use in complete callback
+			response = arguments;
+
+			self.html( selector ?
+
+				// If a selector was specified, locate the right elements in a dummy div
+				// Exclude scripts to avoid IE 'Permission Denied' errors
+				jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
+
+				// Otherwise use the full result
+				responseText );
+
+		}).complete( callback && function( jqXHR, status ) {
+			self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
+		});
+	}
+
+	return this;
+};
+
+
+
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ) {
+	jQuery.fn[ type ] = function( fn ) {
+		return this.on( type, fn );
+	};
+});
+
+
+
+
+jQuery.expr.filters.animated = function( elem ) {
+	return jQuery.grep(jQuery.timers, function( fn ) {
+		return elem === fn.elem;
+	}).length;
+};
+
+
+
+
+var docElem = window.document.documentElement;
+
+/**
+ * Gets a window from an element
+ */
+function getWindow( elem ) {
+	return jQuery.isWindow( elem ) ? elem : elem.nodeType === 9 && elem.defaultView;
+}
+
+jQuery.offset = {
+	setOffset: function( elem, options, i ) {
+		var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
+			position = jQuery.css( elem, "position" ),
+			curElem = jQuery( elem ),
+			props = {};
+
+		// Set position first, in-case top/left are set even on static elem
+		if ( position === "static" ) {
+			elem.style.position = "relative";
+		}
+
+		curOffset = curElem.offset();
+		curCSSTop = jQuery.css( elem, "top" );
+		curCSSLeft = jQuery.css( elem, "left" );
+		calculatePosition = ( position === "absolute" || position === "fixed" ) &&
+			( curCSSTop + curCSSLeft ).indexOf("auto") > -1;
+
+		// Need to be able to calculate position if either
+		// top or left is auto and position is either absolute or fixed
+		if ( calculatePosition ) {
+			curPosition = curElem.position();
+			curTop = curPosition.top;
+			curLeft = curPosition.left;
+
+		} else {
+			curTop = parseFloat( curCSSTop ) || 0;
+			curLeft = parseFloat( curCSSLeft ) || 0;
+		}
+
+		if ( jQuery.isFunction( options ) ) {
+			options = options.call( elem, i, curOffset );
+		}
+
+		if ( options.top != null ) {
+			props.top = ( options.top - curOffset.top ) + curTop;
+		}
+		if ( options.left != null ) {
+			props.left = ( options.left - curOffset.left ) + curLeft;
+		}
+
+		if ( "using" in options ) {
+			options.using.call( elem, props );
+
+		} else {
+			curElem.css( props );
+		}
+	}
+};
+
+jQuery.fn.extend({
+	offset: function( options ) {
+		if ( arguments.length ) {
+			return options === undefined ?
+				this :
+				this.each(function( i ) {
+					jQuery.offset.setOffset( this, options, i );
+				});
+		}
+
+		var docElem, win,
+			elem = this[ 0 ],
+			box = { top: 0, left: 0 },
+			doc = elem && elem.ownerDocument;
+
+		if ( !doc ) {
+			return;
+		}
+
+		docElem = doc.documentElement;
+
+		// Make sure it's not a disconnected DOM node
+		if ( !jQuery.contains( docElem, elem ) ) {
+			return box;
+		}
+
+		// Support: BlackBerry 5, iOS 3 (original iPhone)
+		// If we don't have gBCR, just use 0,0 rather than error
+		if ( typeof elem.getBoundingClientRect !== strundefined ) {
+			box = elem.getBoundingClientRect();
+		}
+		win = getWindow( doc );
+		return {
+			top: box.top + win.pageYOffset - docElem.clientTop,
+			left: box.left + win.pageXOffset - docElem.clientLeft
+		};
+	},
+
+	position: function() {
+		if ( !this[ 0 ] ) {
+			return;
+		}
+
+		var offsetParent, offset,
+			elem = this[ 0 ],
+			parentOffset = { top: 0, left: 0 };
+
+		// Fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is its only offset parent
+		if ( jQuery.css( elem, "position" ) === "fixed" ) {
+			// Assume getBoundingClientRect is there when computed position is fixed
+			offset = elem.getBoundingClientRect();
+
+		} else {
+			// Get *real* offsetParent
+			offsetParent = this.offsetParent();
+
+			// Get correct offsets
+			offset = this.offset();
+			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
+				parentOffset = offsetParent.offset();
+			}
+
+			// Add offsetParent borders
+			parentOffset.top += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
+			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
+		}
+
+		// Subtract parent offsets and element margins
+		return {
+			top: offset.top - parentOffset.top - jQuery.css( elem, "marginTop", true ),
+			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true )
+		};
+	},
+
+	offsetParent: function() {
+		return this.map(function() {
+			var offsetParent = this.offsetParent || docElem;
+
+			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position" ) === "static" ) ) {
+				offsetParent = offsetParent.offsetParent;
+			}
+
+			return offsetParent || docElem;
+		});
+	}
+});
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
+	var top = "pageYOffset" === prop;
+
+	jQuery.fn[ method ] = function( val ) {
+		return access( this, function( elem, method, val ) {
+			var win = getWindow( elem );
+
+			if ( val === undefined ) {
+				return win ? win[ prop ] : elem[ method ];
+			}
+
+			if ( win ) {
+				win.scrollTo(
+					!top ? val : window.pageXOffset,
+					top ? val : window.pageYOffset
+				);
+
+			} else {
+				elem[ method ] = val;
+			}
+		}, method, val, arguments.length, null );
+	};
+});
+
+// Support: Safari<7+, Chrome<37+
+// Add the top/left cssHooks using jQuery.fn.position
+// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
+// Blink bug: https://code.google.com/p/chromium/issues/detail?id=229280
+// getComputedStyle returns percent when specified for top/left/bottom/right;
+// rather than make the css module depend on the offset module, just check for it here
+jQuery.each( [ "top", "left" ], function( i, prop ) {
+	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
+		function( elem, computed ) {
+			if ( computed ) {
+				computed = curCSS( elem, prop );
+				// If curCSS returns percentage, fallback to offset
+				return rnumnonpx.test( computed ) ?
+					jQuery( elem ).position()[ prop ] + "px" :
+					computed;
+			}
+		}
+	);
+});
+
+
+// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
+jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
+	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
+		// Margin is only for outerHeight, outerWidth
+		jQuery.fn[ funcName ] = function( margin, value ) {
+			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
+				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
+
+			return access( this, function( elem, type, value ) {
+				var doc;
+
+				if ( jQuery.isWindow( elem ) ) {
+					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
+					// isn't a whole lot we can do. See pull request at this URL for discussion:
+					// https://github.com/jquery/jquery/pull/764
+					return elem.document.documentElement[ "client" + name ];
+				}
+
+				// Get document width or height
+				if ( elem.nodeType === 9 ) {
+					doc = elem.documentElement;
+
+					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height],
+					// whichever is greatest
+					return Math.max(
+						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
+						elem.body[ "offset" + name ], doc[ "offset" + name ],
+						doc[ "client" + name ]
+					);
+				}
+
+				return value === undefined ?
+					// Get width or height on the element, requesting but not forcing parseFloat
+					jQuery.css( elem, type, extra ) :
+
+					// Set width or height on the element
+					jQuery.style( elem, type, value, extra );
+			}, type, chainable ? margin : undefined, chainable, null );
+		};
+	});
+});
+
+
+// The number of elements contained in the matched element set
+jQuery.fn.size = function() {
+	return this.length;
+};
+
+jQuery.fn.andSelf = jQuery.fn.addBack;
+
+
+
+
+// Register as a named AMD module, since jQuery can be concatenated with other
+// files that may use define, but not via a proper concatenation script that
+// understands anonymous AMD modules. A named AMD is safest and most robust
+// way to register. Lowercase jquery is used because AMD module names are
+// derived from file names, and jQuery is normally delivered in a lowercase
+// file name. Do this after creating the global so that if an AMD module wants
+// to call noConflict to hide this version of jQuery, it will work.
+
+// Note that for maximum portability, libraries that are not jQuery should
+// declare themselves as anonymous modules, and avoid setting a global if an
+// AMD loader is present. jQuery is a special case. For more information, see
+// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
+
+if ( typeof define === "function" && define.amd ) {
+	define( "jquery", [], function() {
+		return jQuery;
+	});
+}
+
+
+
+
+var
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$;
+
+jQuery.noConflict = function( deep ) {
+	if ( window.$ === jQuery ) {
+		window.$ = _$;
+	}
+
+	if ( deep && window.jQuery === jQuery ) {
+		window.jQuery = _jQuery;
+	}
+
+	return jQuery;
+};
+
+// Expose jQuery and $ identifiers, even in AMD
+// (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
+// and CommonJS for browser emulators (#13566)
+if ( typeof noGlobal === strundefined ) {
+	window.jQuery = window.$ = jQuery;
+}
+
+
+
+
+return jQuery;
+
+}));
diff --git a/www/js/embed-src/main.js b/www/js/embed-src/main.js
new file mode 100644
index 0000000000000000000000000000000000000000..6cba0fec73cb92fc14ff3a89e899b76aa80dbad6
--- /dev/null
+++ b/www/js/embed-src/main.js
@@ -0,0 +1,14 @@
+requirejs.config({
+	map: {
+		"*": {
+			css: 'require-css/css'
+		}
+	}
+});
+
+requirejs([
+	'jquery',
+	'analytics'
+], function($, analytics) {
+	analytics.initialize();
+});
diff --git a/www/js/embed-src/require-css/LICENSE b/www/js/embed-src/require-css/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..e39e77c72a034607564a739c7a4446c585f76994
--- /dev/null
+++ b/www/js/embed-src/require-css/LICENSE
@@ -0,0 +1,10 @@
+MIT License
+-----------
+
+Copyright (C) 2013 Guy Bedford
+
+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.
diff --git a/www/js/embed-src/require-css/css-builder.js b/www/js/embed-src/require-css/css-builder.js
new file mode 100644
index 0000000000000000000000000000000000000000..0f908ccba0930ceea6c502cb633f64852136291e
--- /dev/null
+++ b/www/js/embed-src/require-css/css-builder.js
@@ -0,0 +1,242 @@
+define(['require', './normalize'], function(req, normalize) {
+  var cssAPI = {};
+
+  var isWindows = !!process.platform.match(/^win/);
+
+  function compress(css) {
+    if (config.optimizeCss == 'none') {
+      return css;
+    }
+
+    if (typeof process !== "undefined" && process.versions && !!process.versions.node && require.nodeRequire) {
+      var csso;
+      try {
+        csso = require.nodeRequire('csso');
+      }
+      catch(e) {
+        console.log('Compression module not installed. Use "npm install csso -g" to enable.');
+        return css;
+      }
+      var csslen = css.length;
+      try {
+        css =  (csso.minify || csso.justDoIt)(css);
+      }
+      catch(e) {
+        console.log('Compression failed due to a CSS syntax error.');
+        return css;
+      }
+      console.log('Compressed CSS output to ' + Math.round(css.length / csslen * 100) + '%.');
+      return css;
+    }
+    console.log('Compression not supported outside of nodejs environments.');
+    return css;
+  }
+
+  //load file code - stolen from text plugin
+  function loadFile(path) {
+    var file;
+    if (typeof process !== "undefined" && process.versions && !!process.versions.node && require.nodeRequire) {
+      var fs = require.nodeRequire('fs');
+      file = fs.readFileSync(path, 'utf8');
+      if (file.indexOf('\uFEFF') === 0)
+        return file.substring(1);
+      return file;
+    }
+    else {
+      file = new java.io.File(path);
+      var lineSeparator = java.lang.System.getProperty("line.separator"),
+        input = new java.io.BufferedReader(new java.io.InputStreamReader(new java.io.FileInputStream(file), 'utf-8')),
+        stringBuffer, line;
+      try {
+        stringBuffer = new java.lang.StringBuffer();
+        line = input.readLine();
+        if (line && line.length() && line.charAt(0) === 0xfeff)
+          line = line.substring(1);
+        stringBuffer.append(line);
+        while ((line = input.readLine()) !== null) {
+          stringBuffer.append(lineSeparator).append(line);
+        }
+        return String(stringBuffer.toString());
+      }
+      finally {
+        input.close();
+      }
+    }
+  }
+
+
+  function saveFile(path, data) {
+    if (typeof process !== "undefined" && process.versions && !!process.versions.node && require.nodeRequire) {
+      var fs = require.nodeRequire('fs');
+      fs.writeFileSync(path, data, 'utf8');
+    }
+    else {
+      var content = new java.lang.String(data);
+      var output = new java.io.BufferedWriter(new java.io.OutputStreamWriter(new java.io.FileOutputStream(path), 'utf-8'));
+
+      try {
+        output.write(content, 0, content.length());
+        output.flush();
+      }
+      finally {
+        output.close();
+      }
+    }
+  }
+
+  //when adding to the link buffer, paths are normalised to the baseUrl
+  //when removing from the link buffer, paths are normalised to the output file path
+  function escape(content) {
+    return content.replace(/(["'\\])/g, '\\$1')
+      .replace(/[\f]/g, "\\f")
+      .replace(/[\b]/g, "\\b")
+      .replace(/[\n]/g, "\\n")
+      .replace(/[\t]/g, "\\t")
+      .replace(/[\r]/g, "\\r");
+  }
+
+  // NB add @media query support for media imports
+  var importRegEx = /@import\s*(url)?\s*(('([^']*)'|"([^"]*)")|\(('([^']*)'|"([^"]*)"|([^\)]*))\))\s*;?/g;
+  var absUrlRegEx = /^([^\:\/]+:\/)?\//;
+
+  // Write Css module definition
+  var writeCSSDefinition = "define('@writecss', function() {return function writeCss(c) {var d=document,a='appendChild',i='styleSheet',s=d.createElement('style');s.type='text/css';d.getElementsByTagName('head')[0][a](s);s[i]?s[i].cssText=c:s[a](d.createTextNode(c));};});";
+
+  var siteRoot;
+
+  var baseParts = req.toUrl('base_url').split('/');
+  baseParts[baseParts.length - 1] = '';
+  var baseUrl = baseParts.join('/');
+
+  var curModule = 0;
+  var config;
+
+  var writeCSSForLayer = true;
+  var layerBuffer = [];
+  var cssBuffer = {};
+
+  cssAPI.load = function(name, req, load, _config) {
+    //store config
+    config = config || _config;
+
+    if (!siteRoot) {
+      siteRoot = (path.resolve(config.dir || path.dirname(config.out), config.siteRoot || '.') + '/').substr(1);
+      if (isWindows)
+        siteRoot = siteRoot.replace(/\\/g, '/');
+    }
+
+    //external URLS don't get added (just like JS requires)
+    if (name.match(absUrlRegEx))
+      return load();
+
+    var fileUrl = req.toUrl(name + '.css');
+    if (isWindows)
+      fileUrl = fileUrl.replace(/\\/g, '/');
+
+    // rebase to the output directory if based on the source directory;
+    // baseUrl points always to the output directory, fileUrl only if
+    // it is not prefixed by a computed path (relative too)
+    var fileSiteUrl = fileUrl;
+    if (fileSiteUrl.indexOf(baseUrl) < 0) {
+      var appRoot = req.toUrl(config.appDir);
+      if (isWindows)
+        appRoot = appRoot.replace(/\\/g, '/');
+      if (fileSiteUrl.indexOf(appRoot) === 0)
+        fileSiteUrl = siteRoot + fileSiteUrl.substring(appRoot.length);
+    } else if (config.deployRoot) {
+      siteRoot = '/';
+      fileSiteUrl = config.deployRoot + fileSiteUrl.substring(baseUrl.length);
+    } else {
+      fileSiteUrl = fileSiteUrl.substr(1);
+    }
+
+    //add to the buffer
+    cssBuffer[name] = normalize(loadFile(fileUrl), fileSiteUrl, siteRoot);
+
+    load();
+  };
+
+  cssAPI.normalize = function(name, normalize) {
+    if (name.substr(name.length - 4, 4) == '.css')
+      name = name.substr(0, name.length - 4);
+    return normalize(name);
+  };
+
+  cssAPI.write = function(pluginName, moduleName, write, parse) {
+    var cssModule;
+
+    //external URLS don't get added (just like JS requires)
+    if (moduleName.match(absUrlRegEx))
+      return;
+
+    layerBuffer.push(cssBuffer[moduleName]);
+
+    if (!global._requirejsCssData) {
+      global._requirejsCssData = {
+        usedBy: {css: true},
+        css: ''
+      };
+    } else {
+      global._requirejsCssData.usedBy.css = true;
+    }
+
+    if (config.buildCSS !== false) {
+      var style = cssBuffer[moduleName];
+
+      if (config.writeCSSModule && style) {
+ 	    if (writeCSSForLayer) {
+    	  writeCSSForLayer = false;
+          write(writeCSSDefinition);
+        }
+
+        cssModule = 'define(["@writecss"], function(writeCss){\n writeCss("'+ escape(compress(style)) +'");\n})';
+      }
+      else {
+		cssModule = 'define(function(){})';
+      }
+
+      write.asModule(pluginName + '!' + moduleName, cssModule);
+    }
+  };
+
+  cssAPI.onLayerEnd = function(write, data) {
+    if (config.separateCSS && config.IESelectorLimit)
+      throw 'RequireCSS: separateCSS option is not compatible with ensuring the IE selector limit';
+
+    if (config.separateCSS) {
+      var outPath = data.path.replace(/(\.js)?$/, '.css');
+      console.log('Writing CSS! file: ' + outPath + '\n');
+
+      var css = layerBuffer.join('');
+
+      process.nextTick(function() {
+        if (global._requirejsCssData) {
+          css = global._requirejsCssData.css = css + global._requirejsCssData.css;
+          delete global._requirejsCssData.usedBy.css;
+          if (Object.keys(global._requirejsCssData.usedBy).length === 0) {
+            delete global._requirejsCssData;
+          }
+        }
+
+        saveFile(outPath, compress(css));
+      });
+
+    }
+    else if (config.buildCSS !== false && config.writeCSSModule !== true) {
+      var styles = config.IESelectorLimit ? layerBuffer : [layerBuffer.join('')];
+      for (var i = 0; i < styles.length; i++) {
+        if (styles[i] === '')
+          return;
+        write(
+          "(function(c){var d=document,a='appendChild',i='styleSheet',s=d.createElement('style');s.type='text/css';d.getElementsByTagName('head')[0][a](s);s[i]?s[i].cssText=c:s[a](d.createTextNode(c));})\n" +
+          "('" + escape(compress(styles[i])) + "');\n"
+        );
+      }
+    }
+    //clear layer buffer for next layer
+    layerBuffer = [];
+    writeCSSForLayer = true;
+  };
+
+  return cssAPI;
+});
diff --git a/www/js/embed-src/require-css/css.js b/www/js/embed-src/require-css/css.js
new file mode 100644
index 0000000000000000000000000000000000000000..d30bf98da47677668e8ef9a24b392007b71b6233
--- /dev/null
+++ b/www/js/embed-src/require-css/css.js
@@ -0,0 +1,169 @@
+/*
+ * Require-CSS RequireJS css! loader plugin
+ * 0.1.8
+ * Guy Bedford 2014
+ * MIT
+ */
+
+/*
+ *
+ * Usage:
+ *  require(['css!./mycssFile']);
+ *
+ * Tested and working in (up to latest versions as of March 2013):
+ * Android
+ * iOS 6
+ * IE 6 - 10
+ * Chome 3 - 26
+ * Firefox 3.5 - 19
+ * Opera 10 - 12
+ * 
+ * browserling.com used for virtual testing environment
+ *
+ * Credit to B Cavalier & J Hann for the IE 6 - 9 method,
+ * refined with help from Martin Cermak
+ * 
+ * Sources that helped along the way:
+ * - https://developer.mozilla.org/en-US/docs/Browser_detection_using_the_user_agent
+ * - http://www.phpied.com/when-is-a-stylesheet-really-loaded/
+ * - https://github.com/cujojs/curl/blob/master/src/curl/plugin/css.js
+ *
+ */
+
+define(function() {
+//>>excludeStart('excludeRequireCss', pragmas.excludeRequireCss)
+  if (typeof window == 'undefined')
+    return { load: function(n, r, load){ load() } };
+
+  var head = document.getElementsByTagName('head')[0];
+
+  var engine = window.navigator.userAgent.match(/Trident\/([^ ;]*)|AppleWebKit\/([^ ;]*)|Opera\/([^ ;]*)|rv\:([^ ;]*)(.*?)Gecko\/([^ ;]*)|MSIE\s([^ ;]*)|AndroidWebKit\/([^ ;]*)/) || 0;
+
+  // use <style> @import load method (IE < 9, Firefox < 18)
+  var useImportLoad = false;
+  
+  // set to false for explicit <link> load checking when onload doesn't work perfectly (webkit)
+  var useOnload = true;
+
+  // trident / msie
+  if (engine[1] || engine[7])
+    useImportLoad = parseInt(engine[1]) < 6 || parseInt(engine[7]) <= 9;
+  // webkit
+  else if (engine[2] || engine[8])
+    useOnload = false;
+  // gecko
+  else if (engine[4])
+    useImportLoad = parseInt(engine[4]) < 18;
+
+//>>excludeEnd('excludeRequireCss')
+  //main api object
+  var cssAPI = {};
+
+//>>excludeStart('excludeRequireCss', pragmas.excludeRequireCss)
+  cssAPI.pluginBuilder = './css-builder';
+
+  // <style> @import load method
+  var curStyle, curSheet;
+  var createStyle = function () {
+    curStyle = document.createElement('style');
+    head.appendChild(curStyle);
+    curSheet = curStyle.styleSheet || curStyle.sheet;
+  }
+  var ieCnt = 0;
+  var ieLoads = [];
+  var ieCurCallback;
+  
+  var createIeLoad = function(url) {
+    curSheet.addImport(url);
+    curStyle.onload = function(){ processIeLoad() };
+    
+    ieCnt++;
+    if (ieCnt == 31) {
+      createStyle();
+      ieCnt = 0;
+    }
+  }
+  var processIeLoad = function() {
+    ieCurCallback();
+ 
+    var nextLoad = ieLoads.shift();
+ 
+    if (!nextLoad) {
+      ieCurCallback = null;
+      return;
+    }
+ 
+    ieCurCallback = nextLoad[1];
+    createIeLoad(nextLoad[0]);
+  }
+  var importLoad = function(url, callback) {
+    if (!curSheet || !curSheet.addImport)
+      createStyle();
+
+    if (curSheet && curSheet.addImport) {
+      // old IE
+      if (ieCurCallback) {
+        ieLoads.push([url, callback]);
+      }
+      else {
+        createIeLoad(url);
+        ieCurCallback = callback;
+      }
+    }
+    else {
+      // old Firefox
+      curStyle.textContent = '@import "' + url + '";';
+
+      var loadInterval = setInterval(function() {
+        try {
+          curStyle.sheet.cssRules;
+          clearInterval(loadInterval);
+          callback();
+        } catch(e) {}
+      }, 10);
+    }
+  }
+
+  // <link> load method
+  var linkLoad = function(url, callback) {
+    var link = document.createElement('link');
+    link.type = 'text/css';
+    link.rel = 'stylesheet';
+    if (useOnload)
+      link.onload = function() {
+        link.onload = function() {};
+        // for style dimensions queries, a short delay can still be necessary
+        setTimeout(callback, 7);
+      }
+    else
+      var loadInterval = setInterval(function() {
+        for (var i = 0; i < document.styleSheets.length; i++) {
+          var sheet = document.styleSheets[i];
+          if (sheet.href == link.href) {
+            clearInterval(loadInterval);
+            return callback();
+          }
+        }
+      }, 10);
+    link.href = url;
+    head.appendChild(link);
+  }
+
+//>>excludeEnd('excludeRequireCss')
+  cssAPI.normalize = function(name, normalize) {
+    if (name.substr(name.length - 4, 4) == '.css')
+      name = name.substr(0, name.length - 4);
+
+    return normalize(name);
+  }
+
+//>>excludeStart('excludeRequireCss', pragmas.excludeRequireCss)
+  cssAPI.load = function(cssId, req, load, config) {
+
+    (useImportLoad ? importLoad : linkLoad)(req.toUrl(cssId + '.css'), load);
+
+  }
+
+//>>excludeEnd('excludeRequireCss')
+  return cssAPI;
+});
diff --git a/www/js/embed-src/require-css/normalize.js b/www/js/embed-src/require-css/normalize.js
new file mode 100644
index 0000000000000000000000000000000000000000..25cc6fdb9d854f447fb702ab925df5f92648adca
--- /dev/null
+++ b/www/js/embed-src/require-css/normalize.js
@@ -0,0 +1,142 @@
+//>>excludeStart('excludeRequireCss', pragmas.excludeRequireCss)
+/*
+ * css.normalize.js
+ *
+ * CSS Normalization
+ *
+ * CSS paths are normalized based on an optional basePath and the RequireJS config
+ *
+ * Usage:
+ *   normalize(css, fromBasePath, toBasePath);
+ *
+ * css: the stylesheet content to normalize
+ * fromBasePath: the absolute base path of the css relative to any root (but without ../ backtracking)
+ * toBasePath: the absolute new base path of the css relative to the same root
+ * 
+ * Absolute dependencies are left untouched.
+ *
+ * Urls in the CSS are picked up by regular expressions.
+ * These will catch all statements of the form:
+ *
+ * url(*)
+ * url('*')
+ * url("*")
+ * 
+ * @import '*'
+ * @import "*"
+ *
+ * (and so also @import url(*) variations)
+ *
+ * For urls needing normalization
+ *
+ */
+
+define(function() {
+  
+  // regular expression for removing double slashes
+  // eg http://www.example.com//my///url/here -> http://www.example.com/my/url/here
+  var slashes = /([^:])\/+/g
+  var removeDoubleSlashes = function(uri) {
+    return uri.replace(slashes, '$1/');
+  }
+
+  // given a relative URI, and two absolute base URIs, convert it from one base to another
+  var protocolRegEx = /([^\:\/]*):\/\/([^\/]*)/;
+  var absUrlRegEx = /^(\/|data:)/;
+  function convertURIBase(uri, fromBase, toBase) {
+    if (uri.match(absUrlRegEx) || uri.match(protocolRegEx))
+      return uri;
+    uri = removeDoubleSlashes(uri);
+    // if toBase specifies a protocol path, ensure this is the same protocol as fromBase, if not
+    // use absolute path at fromBase
+    var toBaseProtocol = toBase.match(protocolRegEx);
+    var fromBaseProtocol = fromBase.match(protocolRegEx);
+    if (fromBaseProtocol && (!toBaseProtocol || toBaseProtocol[1] != fromBaseProtocol[1] || toBaseProtocol[2] != fromBaseProtocol[2]))
+      return absoluteURI(uri, fromBase);
+    else if (toBase.match(absUrlRegEx))
+      return absoluteURI(absoluteURI(uri, fromBase), toBase); 
+    else {
+      return relativeURI(absoluteURI(uri, fromBase), toBase);
+    }
+  };
+  
+  // given a relative URI, calculate the absolute URI
+  function absoluteURI(uri, base) {
+    if (uri.substr(0, 2) == './')
+      uri = uri.substr(2);
+
+    // absolute urls are left in tact
+    if (uri.match(absUrlRegEx) || uri.match(protocolRegEx))
+      return uri;
+    
+    var baseParts = base.split('/');
+    var uriParts = uri.split('/');
+    
+    baseParts.pop();
+    
+    while (curPart = uriParts.shift())
+      if (curPart == '..')
+        baseParts.pop();
+      else
+        baseParts.push(curPart);
+    
+    return baseParts.join('/');
+  };
+
+
+  // given an absolute URI, calculate the relative URI
+  function relativeURI(uri, base) {
+    
+    // reduce base and uri strings to just their difference string
+    var baseParts = base.split('/');
+    baseParts.pop();
+    base = baseParts.join('/') + '/';
+    i = 0;
+    while (base.substr(i, 1) == uri.substr(i, 1))
+      i++;
+    while (base.substr(i, 1) != '/')
+      i--;
+    base = base.substr(i + 1);
+    uri = uri.substr(i + 1);
+
+    // each base folder difference is thus a backtrack
+    baseParts = base.split('/');
+    var uriParts = uri.split('/');
+    out = '';
+    while (baseParts.shift())
+      out += '../';
+    
+    // finally add uri parts
+    while (curPart = uriParts.shift())
+      out += curPart + '/';
+    
+    return out.substr(0, out.length - 1);
+  };
+  
+  var normalizeCSS = function(source, fromBase, toBase) {
+
+    fromBase = removeDoubleSlashes(fromBase);
+    toBase = removeDoubleSlashes(toBase);
+
+    var urlRegEx = /@import\s*("([^"]*)"|'([^']*)')|url\s*\((?!#)\s*(\s*"([^"]*)"|'([^']*)'|[^\)]*\s*)\s*\)/ig;
+    var result, url, source;
+
+    while (result = urlRegEx.exec(source)) {
+      url = result[3] || result[2] || result[5] || result[6] || result[4];
+      var newUrl;
+      newUrl = convertURIBase(url, fromBase, toBase);
+      var quoteLen = result[5] || result[6] ? 1 : 0;
+      source = source.substr(0, urlRegEx.lastIndex - url.length - quoteLen - 1) + newUrl + source.substr(urlRegEx.lastIndex - quoteLen - 1);
+      urlRegEx.lastIndex = urlRegEx.lastIndex + (newUrl.length - url.length);
+    }
+    
+    return source;
+  };
+  
+  normalizeCSS.convertURIBase = convertURIBase;
+  normalizeCSS.absoluteURI = absoluteURI;
+  normalizeCSS.relativeURI = relativeURI;
+  
+  return normalizeCSS;
+});
+//>>excludeEnd('excludeRequireCss')
diff --git a/www/js/embed-src/require.js b/www/js/embed-src/require.js
new file mode 100644
index 0000000000000000000000000000000000000000..e33c7dded705d3e47d02c305cac2fc2d3ed97d06
--- /dev/null
+++ b/www/js/embed-src/require.js
@@ -0,0 +1,2129 @@
+/** vim: et:ts=4:sw=4:sts=4
+ * @license RequireJS 2.1.22 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
+ * see: http://github.com/jrburke/requirejs for details
+ */
+//Not using strict: uneven strict support in browsers, #392, and causes
+//problems with requirejs.exec()/transpiler plugins that may not be strict.
+/*jslint regexp: true, nomen: true, sloppy: true */
+/*global window, navigator, document, importScripts, setTimeout, opera */
+
+var requirejs, require, define;
+(function (global) {
+    var req, s, head, baseElement, dataMain, src,
+        interactiveScript, currentlyAddingScript, mainScript, subPath,
+        version = '2.1.22',
+        commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
+        cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
+        jsSuffixRegExp = /\.js$/,
+        currDirRegExp = /^\.\//,
+        op = Object.prototype,
+        ostring = op.toString,
+        hasOwn = op.hasOwnProperty,
+        ap = Array.prototype,
+        isBrowser = !!(typeof window !== 'undefined' && typeof navigator !== 'undefined' && window.document),
+        isWebWorker = !isBrowser && typeof importScripts !== 'undefined',
+        //PS3 indicates loaded and complete, but need to wait for complete
+        //specifically. Sequence is 'loading', 'loaded', execution,
+        // then 'complete'. The UA check is unfortunate, but not sure how
+        //to feature test w/o causing perf issues.
+        readyRegExp = isBrowser && navigator.platform === 'PLAYSTATION 3' ?
+                      /^complete$/ : /^(complete|loaded)$/,
+        defContextName = '_',
+        //Oh the tragedy, detecting opera. See the usage of isOpera for reason.
+        isOpera = typeof opera !== 'undefined' && opera.toString() === '[object Opera]',
+        contexts = {},
+        cfg = {},
+        globalDefQueue = [],
+        useInteractive = false;
+
+    function isFunction(it) {
+        return ostring.call(it) === '[object Function]';
+    }
+
+    function isArray(it) {
+        return ostring.call(it) === '[object Array]';
+    }
+
+    /**
+     * Helper function for iterating over an array. If the func returns
+     * a true value, it will break out of the loop.
+     */
+    function each(ary, func) {
+        if (ary) {
+            var i;
+            for (i = 0; i < ary.length; i += 1) {
+                if (ary[i] && func(ary[i], i, ary)) {
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Helper function for iterating over an array backwards. If the func
+     * returns a true value, it will break out of the loop.
+     */
+    function eachReverse(ary, func) {
+        if (ary) {
+            var i;
+            for (i = ary.length - 1; i > -1; i -= 1) {
+                if (ary[i] && func(ary[i], i, ary)) {
+                    break;
+                }
+            }
+        }
+    }
+
+    function hasProp(obj, prop) {
+        return hasOwn.call(obj, prop);
+    }
+
+    function getOwn(obj, prop) {
+        return hasProp(obj, prop) && obj[prop];
+    }
+
+    /**
+     * Cycles over properties in an object and calls a function for each
+     * property value. If the function returns a truthy value, then the
+     * iteration is stopped.
+     */
+    function eachProp(obj, func) {
+        var prop;
+        for (prop in obj) {
+            if (hasProp(obj, prop)) {
+                if (func(obj[prop], prop)) {
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Simple function to mix in properties from source into target,
+     * but only if target does not already have a property of the same name.
+     */
+    function mixin(target, source, force, deepStringMixin) {
+        if (source) {
+            eachProp(source, function (value, prop) {
+                if (force || !hasProp(target, prop)) {
+                    if (deepStringMixin && typeof value === 'object' && value &&
+                        !isArray(value) && !isFunction(value) &&
+                        !(value instanceof RegExp)) {
+
+                        if (!target[prop]) {
+                            target[prop] = {};
+                        }
+                        mixin(target[prop], value, force, deepStringMixin);
+                    } else {
+                        target[prop] = value;
+                    }
+                }
+            });
+        }
+        return target;
+    }
+
+    //Similar to Function.prototype.bind, but the 'this' object is specified
+    //first, since it is easier to read/figure out what 'this' will be.
+    function bind(obj, fn) {
+        return function () {
+            return fn.apply(obj, arguments);
+        };
+    }
+
+    function scripts() {
+        return document.getElementsByTagName('script');
+    }
+
+    function defaultOnError(err) {
+        throw err;
+    }
+
+    //Allow getting a global that is expressed in
+    //dot notation, like 'a.b.c'.
+    function getGlobal(value) {
+        if (!value) {
+            return value;
+        }
+        var g = global;
+        each(value.split('.'), function (part) {
+            g = g[part];
+        });
+        return g;
+    }
+
+    /**
+     * Constructs an error with a pointer to an URL with more information.
+     * @param {String} id the error ID that maps to an ID on a web page.
+     * @param {String} message human readable error.
+     * @param {Error} [err] the original error, if there is one.
+     *
+     * @returns {Error}
+     */
+    function makeError(id, msg, err, requireModules) {
+        var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id);
+        e.requireType = id;
+        e.requireModules = requireModules;
+        if (err) {
+            e.originalError = err;
+        }
+        return e;
+    }
+
+    if (typeof define !== 'undefined') {
+        //If a define is already in play via another AMD loader,
+        //do not overwrite.
+        return;
+    }
+
+    if (typeof requirejs !== 'undefined') {
+        if (isFunction(requirejs)) {
+            //Do not overwrite an existing requirejs instance.
+            return;
+        }
+        cfg = requirejs;
+        requirejs = undefined;
+    }
+
+    //Allow for a require config object
+    if (typeof require !== 'undefined' && !isFunction(require)) {
+        //assume it is a config object.
+        cfg = require;
+        require = undefined;
+    }
+
+    function newContext(contextName) {
+        var inCheckLoaded, Module, context, handlers,
+            checkLoadedTimeoutId,
+            config = {
+                //Defaults. Do not set a default for map
+                //config to speed up normalize(), which
+                //will run faster if there is no default.
+                waitSeconds: 7,
+                baseUrl: './',
+                paths: {},
+                bundles: {},
+                pkgs: {},
+                shim: {},
+                config: {}
+            },
+            registry = {},
+            //registry of just enabled modules, to speed
+            //cycle breaking code when lots of modules
+            //are registered, but not activated.
+            enabledRegistry = {},
+            undefEvents = {},
+            defQueue = [],
+            defined = {},
+            urlFetched = {},
+            bundlesMap = {},
+            requireCounter = 1,
+            unnormalizedCounter = 1;
+
+        /**
+         * Trims the . and .. from an array of path segments.
+         * It will keep a leading path segment if a .. will become
+         * the first path segment, to help with module name lookups,
+         * which act like paths, but can be remapped. But the end result,
+         * all paths that use this function should look normalized.
+         * NOTE: this method MODIFIES the input array.
+         * @param {Array} ary the array of path segments.
+         */
+        function trimDots(ary) {
+            var i, part;
+            for (i = 0; i < ary.length; i++) {
+                part = ary[i];
+                if (part === '.') {
+                    ary.splice(i, 1);
+                    i -= 1;
+                } else if (part === '..') {
+                    // If at the start, or previous value is still ..,
+                    // keep them so that when converted to a path it may
+                    // still work when converted to a path, even though
+                    // as an ID it is less than ideal. In larger point
+                    // releases, may be better to just kick out an error.
+                    if (i === 0 || (i === 1 && ary[2] === '..') || ary[i - 1] === '..') {
+                        continue;
+                    } else if (i > 0) {
+                        ary.splice(i - 1, 2);
+                        i -= 2;
+                    }
+                }
+            }
+        }
+
+        /**
+         * Given a relative module name, like ./something, normalize it to
+         * a real name that can be mapped to a path.
+         * @param {String} name the relative name
+         * @param {String} baseName a real name that the name arg is relative
+         * to.
+         * @param {Boolean} applyMap apply the map config to the value. Should
+         * only be done if this normalization is for a dependency ID.
+         * @returns {String} normalized name
+         */
+        function normalize(name, baseName, applyMap) {
+            var pkgMain, mapValue, nameParts, i, j, nameSegment, lastIndex,
+                foundMap, foundI, foundStarMap, starI, normalizedBaseParts,
+                baseParts = (baseName && baseName.split('/')),
+                map = config.map,
+                starMap = map && map['*'];
+
+            //Adjust any relative paths.
+            if (name) {
+                name = name.split('/');
+                lastIndex = name.length - 1;
+
+                // If wanting node ID compatibility, strip .js from end
+                // of IDs. Have to do this here, and not in nameToUrl
+                // because node allows either .js or non .js to map
+                // to same file.
+                if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
+                    name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
+                }
+
+                // Starts with a '.' so need the baseName
+                if (name[0].charAt(0) === '.' && baseParts) {
+                    //Convert baseName to array, and lop off the last part,
+                    //so that . matches that 'directory' and not name of the baseName's
+                    //module. For instance, baseName of 'one/two/three', maps to
+                    //'one/two/three.js', but we want the directory, 'one/two' for
+                    //this normalization.
+                    normalizedBaseParts = baseParts.slice(0, baseParts.length - 1);
+                    name = normalizedBaseParts.concat(name);
+                }
+
+                trimDots(name);
+                name = name.join('/');
+            }
+
+            //Apply map config if available.
+            if (applyMap && map && (baseParts || starMap)) {
+                nameParts = name.split('/');
+
+                outerLoop: for (i = nameParts.length; i > 0; i -= 1) {
+                    nameSegment = nameParts.slice(0, i).join('/');
+
+                    if (baseParts) {
+                        //Find the longest baseName segment match in the config.
+                        //So, do joins on the biggest to smallest lengths of baseParts.
+                        for (j = baseParts.length; j > 0; j -= 1) {
+                            mapValue = getOwn(map, baseParts.slice(0, j).join('/'));
+
+                            //baseName segment has config, find if it has one for
+                            //this name.
+                            if (mapValue) {
+                                mapValue = getOwn(mapValue, nameSegment);
+                                if (mapValue) {
+                                    //Match, update name to the new value.
+                                    foundMap = mapValue;
+                                    foundI = i;
+                                    break outerLoop;
+                                }
+                            }
+                        }
+                    }
+
+                    //Check for a star map match, but just hold on to it,
+                    //if there is a shorter segment match later in a matching
+                    //config, then favor over this star map.
+                    if (!foundStarMap && starMap && getOwn(starMap, nameSegment)) {
+                        foundStarMap = getOwn(starMap, nameSegment);
+                        starI = i;
+                    }
+                }
+
+                if (!foundMap && foundStarMap) {
+                    foundMap = foundStarMap;
+                    foundI = starI;
+                }
+
+                if (foundMap) {
+                    nameParts.splice(0, foundI, foundMap);
+                    name = nameParts.join('/');
+                }
+            }
+
+            // If the name points to a package's name, use
+            // the package main instead.
+            pkgMain = getOwn(config.pkgs, name);
+
+            return pkgMain ? pkgMain : name;
+        }
+
+        function removeScript(name) {
+            if (isBrowser) {
+                each(scripts(), function (scriptNode) {
+                    if (scriptNode.getAttribute('data-requiremodule') === name &&
+                            scriptNode.getAttribute('data-requirecontext') === context.contextName) {
+                        scriptNode.parentNode.removeChild(scriptNode);
+                        return true;
+                    }
+                });
+            }
+        }
+
+        function hasPathFallback(id) {
+            var pathConfig = getOwn(config.paths, id);
+            if (pathConfig && isArray(pathConfig) && pathConfig.length > 1) {
+                //Pop off the first array value, since it failed, and
+                //retry
+                pathConfig.shift();
+                context.require.undef(id);
+
+                //Custom require that does not do map translation, since
+                //ID is "absolute", already mapped/resolved.
+                context.makeRequire(null, {
+                    skipMap: true
+                })([id]);
+
+                return true;
+            }
+        }
+
+        //Turns a plugin!resource to [plugin, resource]
+        //with the plugin being undefined if the name
+        //did not have a plugin prefix.
+        function splitPrefix(name) {
+            var prefix,
+                index = name ? name.indexOf('!') : -1;
+            if (index > -1) {
+                prefix = name.substring(0, index);
+                name = name.substring(index + 1, name.length);
+            }
+            return [prefix, name];
+        }
+
+        /**
+         * Creates a module mapping that includes plugin prefix, module
+         * name, and path. If parentModuleMap is provided it will
+         * also normalize the name via require.normalize()
+         *
+         * @param {String} name the module name
+         * @param {String} [parentModuleMap] parent module map
+         * for the module name, used to resolve relative names.
+         * @param {Boolean} isNormalized: is the ID already normalized.
+         * This is true if this call is done for a define() module ID.
+         * @param {Boolean} applyMap: apply the map config to the ID.
+         * Should only be true if this map is for a dependency.
+         *
+         * @returns {Object}
+         */
+        function makeModuleMap(name, parentModuleMap, isNormalized, applyMap) {
+            var url, pluginModule, suffix, nameParts,
+                prefix = null,
+                parentName = parentModuleMap ? parentModuleMap.name : null,
+                originalName = name,
+                isDefine = true,
+                normalizedName = '';
+
+            //If no name, then it means it is a require call, generate an
+            //internal name.
+            if (!name) {
+                isDefine = false;
+                name = '_@r' + (requireCounter += 1);
+            }
+
+            nameParts = splitPrefix(name);
+            prefix = nameParts[0];
+            name = nameParts[1];
+
+            if (prefix) {
+                prefix = normalize(prefix, parentName, applyMap);
+                pluginModule = getOwn(defined, prefix);
+            }
+
+            //Account for relative paths if there is a base name.
+            if (name) {
+                if (prefix) {
+                    if (pluginModule && pluginModule.normalize) {
+                        //Plugin is loaded, use its normalize method.
+                        normalizedName = pluginModule.normalize(name, function (name) {
+                            return normalize(name, parentName, applyMap);
+                        });
+                    } else {
+                        // If nested plugin references, then do not try to
+                        // normalize, as it will not normalize correctly. This
+                        // places a restriction on resourceIds, and the longer
+                        // term solution is not to normalize until plugins are
+                        // loaded and all normalizations to allow for async
+                        // loading of a loader plugin. But for now, fixes the
+                        // common uses. Details in #1131
+                        normalizedName = name.indexOf('!') === -1 ?
+                                         normalize(name, parentName, applyMap) :
+                                         name;
+                    }
+                } else {
+                    //A regular module.
+                    normalizedName = normalize(name, parentName, applyMap);
+
+                    //Normalized name may be a plugin ID due to map config
+                    //application in normalize. The map config values must
+                    //already be normalized, so do not need to redo that part.
+                    nameParts = splitPrefix(normalizedName);
+                    prefix = nameParts[0];
+                    normalizedName = nameParts[1];
+                    isNormalized = true;
+
+                    url = context.nameToUrl(normalizedName);
+                }
+            }
+
+            //If the id is a plugin id that cannot be determined if it needs
+            //normalization, stamp it with a unique ID so two matching relative
+            //ids that may conflict can be separate.
+            suffix = prefix && !pluginModule && !isNormalized ?
+                     '_unnormalized' + (unnormalizedCounter += 1) :
+                     '';
+
+            return {
+                prefix: prefix,
+                name: normalizedName,
+                parentMap: parentModuleMap,
+                unnormalized: !!suffix,
+                url: url,
+                originalName: originalName,
+                isDefine: isDefine,
+                id: (prefix ?
+                        prefix + '!' + normalizedName :
+                        normalizedName) + suffix
+            };
+        }
+
+        function getModule(depMap) {
+            var id = depMap.id,
+                mod = getOwn(registry, id);
+
+            if (!mod) {
+                mod = registry[id] = new context.Module(depMap);
+            }
+
+            return mod;
+        }
+
+        function on(depMap, name, fn) {
+            var id = depMap.id,
+                mod = getOwn(registry, id);
+
+            if (hasProp(defined, id) &&
+                    (!mod || mod.defineEmitComplete)) {
+                if (name === 'defined') {
+                    fn(defined[id]);
+                }
+            } else {
+                mod = getModule(depMap);
+                if (mod.error && name === 'error') {
+                    fn(mod.error);
+                } else {
+                    mod.on(name, fn);
+                }
+            }
+        }
+
+        function onError(err, errback) {
+            var ids = err.requireModules,
+                notified = false;
+
+            if (errback) {
+                errback(err);
+            } else {
+                each(ids, function (id) {
+                    var mod = getOwn(registry, id);
+                    if (mod) {
+                        //Set error on module, so it skips timeout checks.
+                        mod.error = err;
+                        if (mod.events.error) {
+                            notified = true;
+                            mod.emit('error', err);
+                        }
+                    }
+                });
+
+                if (!notified) {
+                    req.onError(err);
+                }
+            }
+        }
+
+        /**
+         * Internal method to transfer globalQueue items to this context's
+         * defQueue.
+         */
+        function takeGlobalQueue() {
+            //Push all the globalDefQueue items into the context's defQueue
+            if (globalDefQueue.length) {
+                each(globalDefQueue, function(queueItem) {
+                    var id = queueItem[0];
+                    if (typeof id === 'string') {
+                        context.defQueueMap[id] = true;
+                    }
+                    defQueue.push(queueItem);
+                });
+                globalDefQueue = [];
+            }
+        }
+
+        handlers = {
+            'require': function (mod) {
+                if (mod.require) {
+                    return mod.require;
+                } else {
+                    return (mod.require = context.makeRequire(mod.map));
+                }
+            },
+            'exports': function (mod) {
+                mod.usingExports = true;
+                if (mod.map.isDefine) {
+                    if (mod.exports) {
+                        return (defined[mod.map.id] = mod.exports);
+                    } else {
+                        return (mod.exports = defined[mod.map.id] = {});
+                    }
+                }
+            },
+            'module': function (mod) {
+                if (mod.module) {
+                    return mod.module;
+                } else {
+                    return (mod.module = {
+                        id: mod.map.id,
+                        uri: mod.map.url,
+                        config: function () {
+                            return getOwn(config.config, mod.map.id) || {};
+                        },
+                        exports: mod.exports || (mod.exports = {})
+                    });
+                }
+            }
+        };
+
+        function cleanRegistry(id) {
+            //Clean up machinery used for waiting modules.
+            delete registry[id];
+            delete enabledRegistry[id];
+        }
+
+        function breakCycle(mod, traced, processed) {
+            var id = mod.map.id;
+
+            if (mod.error) {
+                mod.emit('error', mod.error);
+            } else {
+                traced[id] = true;
+                each(mod.depMaps, function (depMap, i) {
+                    var depId = depMap.id,
+                        dep = getOwn(registry, depId);
+
+                    //Only force things that have not completed
+                    //being defined, so still in the registry,
+                    //and only if it has not been matched up
+                    //in the module already.
+                    if (dep && !mod.depMatched[i] && !processed[depId]) {
+                        if (getOwn(traced, depId)) {
+                            mod.defineDep(i, defined[depId]);
+                            mod.check(); //pass false?
+                        } else {
+                            breakCycle(dep, traced, processed);
+                        }
+                    }
+                });
+                processed[id] = true;
+            }
+        }
+
+        function checkLoaded() {
+            var err, usingPathFallback,
+                waitInterval = config.waitSeconds * 1000,
+                //It is possible to disable the wait interval by using waitSeconds of 0.
+                expired = waitInterval && (context.startTime + waitInterval) < new Date().getTime(),
+                noLoads = [],
+                reqCalls = [],
+                stillLoading = false,
+                needCycleCheck = true;
+
+            //Do not bother if this call was a result of a cycle break.
+            if (inCheckLoaded) {
+                return;
+            }
+
+            inCheckLoaded = true;
+
+            //Figure out the state of all the modules.
+            eachProp(enabledRegistry, function (mod) {
+                var map = mod.map,
+                    modId = map.id;
+
+                //Skip things that are not enabled or in error state.
+                if (!mod.enabled) {
+                    return;
+                }
+
+                if (!map.isDefine) {
+                    reqCalls.push(mod);
+                }
+
+                if (!mod.error) {
+                    //If the module should be executed, and it has not
+                    //been inited and time is up, remember it.
+                    if (!mod.inited && expired) {
+                        if (hasPathFallback(modId)) {
+                            usingPathFallback = true;
+                            stillLoading = true;
+                        } else {
+                            noLoads.push(modId);
+                            removeScript(modId);
+                        }
+                    } else if (!mod.inited && mod.fetched && map.isDefine) {
+                        stillLoading = true;
+                        if (!map.prefix) {
+                            //No reason to keep looking for unfinished
+                            //loading. If the only stillLoading is a
+                            //plugin resource though, keep going,
+                            //because it may be that a plugin resource
+                            //is waiting on a non-plugin cycle.
+                            return (needCycleCheck = false);
+                        }
+                    }
+                }
+            });
+
+            if (expired && noLoads.length) {
+                //If wait time expired, throw error of unloaded modules.
+                err = makeError('timeout', 'Load timeout for modules: ' + noLoads, null, noLoads);
+                err.contextName = context.contextName;
+                return onError(err);
+            }
+
+            //Not expired, check for a cycle.
+            if (needCycleCheck) {
+                each(reqCalls, function (mod) {
+                    breakCycle(mod, {}, {});
+                });
+            }
+
+            //If still waiting on loads, and the waiting load is something
+            //other than a plugin resource, or there are still outstanding
+            //scripts, then just try back later.
+            if ((!expired || usingPathFallback) && stillLoading) {
+                //Something is still waiting to load. Wait for it, but only
+                //if a timeout is not already in effect.
+                if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) {
+                    checkLoadedTimeoutId = setTimeout(function () {
+                        checkLoadedTimeoutId = 0;
+                        checkLoaded();
+                    }, 50);
+                }
+            }
+
+            inCheckLoaded = false;
+        }
+
+        Module = function (map) {
+            this.events = getOwn(undefEvents, map.id) || {};
+            this.map = map;
+            this.shim = getOwn(config.shim, map.id);
+            this.depExports = [];
+            this.depMaps = [];
+            this.depMatched = [];
+            this.pluginMaps = {};
+            this.depCount = 0;
+
+            /* this.exports this.factory
+               this.depMaps = [],
+               this.enabled, this.fetched
+            */
+        };
+
+        Module.prototype = {
+            init: function (depMaps, factory, errback, options) {
+                options = options || {};
+
+                //Do not do more inits if already done. Can happen if there
+                //are multiple define calls for the same module. That is not
+                //a normal, common case, but it is also not unexpected.
+                if (this.inited) {
+                    return;
+                }
+
+                this.factory = factory;
+
+                if (errback) {
+                    //Register for errors on this module.
+                    this.on('error', errback);
+                } else if (this.events.error) {
+                    //If no errback already, but there are error listeners
+                    //on this module, set up an errback to pass to the deps.
+                    errback = bind(this, function (err) {
+                        this.emit('error', err);
+                    });
+                }
+
+                //Do a copy of the dependency array, so that
+                //source inputs are not modified. For example
+                //"shim" deps are passed in here directly, and
+                //doing a direct modification of the depMaps array
+                //would affect that config.
+                this.depMaps = depMaps && depMaps.slice(0);
+
+                this.errback = errback;
+
+                //Indicate this module has be initialized
+                this.inited = true;
+
+                this.ignore = options.ignore;
+
+                //Could have option to init this module in enabled mode,
+                //or could have been previously marked as enabled. However,
+                //the dependencies are not known until init is called. So
+                //if enabled previously, now trigger dependencies as enabled.
+                if (options.enabled || this.enabled) {
+                    //Enable this module and dependencies.
+                    //Will call this.check()
+                    this.enable();
+                } else {
+                    this.check();
+                }
+            },
+
+            defineDep: function (i, depExports) {
+                //Because of cycles, defined callback for a given
+                //export can be called more than once.
+                if (!this.depMatched[i]) {
+                    this.depMatched[i] = true;
+                    this.depCount -= 1;
+                    this.depExports[i] = depExports;
+                }
+            },
+
+            fetch: function () {
+                if (this.fetched) {
+                    return;
+                }
+                this.fetched = true;
+
+                context.startTime = (new Date()).getTime();
+
+                var map = this.map;
+
+                //If the manager is for a plugin managed resource,
+                //ask the plugin to load it now.
+                if (this.shim) {
+                    context.makeRequire(this.map, {
+                        enableBuildCallback: true
+                    })(this.shim.deps || [], bind(this, function () {
+                        return map.prefix ? this.callPlugin() : this.load();
+                    }));
+                } else {
+                    //Regular dependency.
+                    return map.prefix ? this.callPlugin() : this.load();
+                }
+            },
+
+            load: function () {
+                var url = this.map.url;
+
+                //Regular dependency.
+                if (!urlFetched[url]) {
+                    urlFetched[url] = true;
+                    context.load(this.map.id, url);
+                }
+            },
+
+            /**
+             * Checks if the module is ready to define itself, and if so,
+             * define it.
+             */
+            check: function () {
+                if (!this.enabled || this.enabling) {
+                    return;
+                }
+
+                var err, cjsModule,
+                    id = this.map.id,
+                    depExports = this.depExports,
+                    exports = this.exports,
+                    factory = this.factory;
+
+                if (!this.inited) {
+                    // Only fetch if not already in the defQueue.
+                    if (!hasProp(context.defQueueMap, id)) {
+                        this.fetch();
+                    }
+                } else if (this.error) {
+                    this.emit('error', this.error);
+                } else if (!this.defining) {
+                    //The factory could trigger another require call
+                    //that would result in checking this module to
+                    //define itself again. If already in the process
+                    //of doing that, skip this work.
+                    this.defining = true;
+
+                    if (this.depCount < 1 && !this.defined) {
+                        if (isFunction(factory)) {
+                            try {
+                                exports = context.execCb(id, factory, depExports, exports);
+                            } catch (e) {
+                                err = e;
+                            }
+
+                            // Favor return value over exports. If node/cjs in play,
+                            // then will not have a return value anyway. Favor
+                            // module.exports assignment over exports object.
+                            if (this.map.isDefine && exports === undefined) {
+                                cjsModule = this.module;
+                                if (cjsModule) {
+                                    exports = cjsModule.exports;
+                                } else if (this.usingExports) {
+                                    //exports already set the defined value.
+                                    exports = this.exports;
+                                }
+                            }
+
+                            if (err) {
+                                // If there is an error listener, favor passing
+                                // to that instead of throwing an error. However,
+                                // only do it for define()'d  modules. require
+                                // errbacks should not be called for failures in
+                                // their callbacks (#699). However if a global
+                                // onError is set, use that.
+                                if ((this.events.error && this.map.isDefine) ||
+                                    req.onError !== defaultOnError) {
+                                    err.requireMap = this.map;
+                                    err.requireModules = this.map.isDefine ? [this.map.id] : null;
+                                    err.requireType = this.map.isDefine ? 'define' : 'require';
+                                    return onError((this.error = err));
+                                } else if (typeof console !== 'undefined' &&
+                                           console.error) {
+                                    // Log the error for debugging. If promises could be
+                                    // used, this would be different, but making do.
+                                    console.error(err);
+                                } else {
+                                    // Do not want to completely lose the error. While this
+                                    // will mess up processing and lead to similar results
+                                    // as bug 1440, it at least surfaces the error.
+                                    req.onError(err);
+                                }
+                            }
+                        } else {
+                            //Just a literal value
+                            exports = factory;
+                        }
+
+                        this.exports = exports;
+
+                        if (this.map.isDefine && !this.ignore) {
+                            defined[id] = exports;
+
+                            if (req.onResourceLoad) {
+                                var resLoadMaps = [];
+                                each(this.depMaps, function (depMap) {
+                                    resLoadMaps.push(depMap.normalizedMap || depMap);
+                                });
+                                req.onResourceLoad(context, this.map, resLoadMaps);
+                            }
+                        }
+
+                        //Clean up
+                        cleanRegistry(id);
+
+                        this.defined = true;
+                    }
+
+                    //Finished the define stage. Allow calling check again
+                    //to allow define notifications below in the case of a
+                    //cycle.
+                    this.defining = false;
+
+                    if (this.defined && !this.defineEmitted) {
+                        this.defineEmitted = true;
+                        this.emit('defined', this.exports);
+                        this.defineEmitComplete = true;
+                    }
+
+                }
+            },
+
+            callPlugin: function () {
+                var map = this.map,
+                    id = map.id,
+                    //Map already normalized the prefix.
+                    pluginMap = makeModuleMap(map.prefix);
+
+                //Mark this as a dependency for this plugin, so it
+                //can be traced for cycles.
+                this.depMaps.push(pluginMap);
+
+                on(pluginMap, 'defined', bind(this, function (plugin) {
+                    var load, normalizedMap, normalizedMod,
+                        bundleId = getOwn(bundlesMap, this.map.id),
+                        name = this.map.name,
+                        parentName = this.map.parentMap ? this.map.parentMap.name : null,
+                        localRequire = context.makeRequire(map.parentMap, {
+                            enableBuildCallback: true
+                        });
+
+                    //If current map is not normalized, wait for that
+                    //normalized name to load instead of continuing.
+                    if (this.map.unnormalized) {
+                        //Normalize the ID if the plugin allows it.
+                        if (plugin.normalize) {
+                            name = plugin.normalize(name, function (name) {
+                                return normalize(name, parentName, true);
+                            }) || '';
+                        }
+
+                        //prefix and name should already be normalized, no need
+                        //for applying map config again either.
+                        normalizedMap = makeModuleMap(map.prefix + '!' + name,
+                                                      this.map.parentMap);
+                        on(normalizedMap,
+                            'defined', bind(this, function (value) {
+                                this.map.normalizedMap = normalizedMap;
+                                this.init([], function () { return value; }, null, {
+                                    enabled: true,
+                                    ignore: true
+                                });
+                            }));
+
+                        normalizedMod = getOwn(registry, normalizedMap.id);
+                        if (normalizedMod) {
+                            //Mark this as a dependency for this plugin, so it
+                            //can be traced for cycles.
+                            this.depMaps.push(normalizedMap);
+
+                            if (this.events.error) {
+                                normalizedMod.on('error', bind(this, function (err) {
+                                    this.emit('error', err);
+                                }));
+                            }
+                            normalizedMod.enable();
+                        }
+
+                        return;
+                    }
+
+                    //If a paths config, then just load that file instead to
+                    //resolve the plugin, as it is built into that paths layer.
+                    if (bundleId) {
+                        this.map.url = context.nameToUrl(bundleId);
+                        this.load();
+                        return;
+                    }
+
+                    load = bind(this, function (value) {
+                        this.init([], function () { return value; }, null, {
+                            enabled: true
+                        });
+                    });
+
+                    load.error = bind(this, function (err) {
+                        this.inited = true;
+                        this.error = err;
+                        err.requireModules = [id];
+
+                        //Remove temp unnormalized modules for this module,
+                        //since they will never be resolved otherwise now.
+                        eachProp(registry, function (mod) {
+                            if (mod.map.id.indexOf(id + '_unnormalized') === 0) {
+                                cleanRegistry(mod.map.id);
+                            }
+                        });
+
+                        onError(err);
+                    });
+
+                    //Allow plugins to load other code without having to know the
+                    //context or how to 'complete' the load.
+                    load.fromText = bind(this, function (text, textAlt) {
+                        /*jslint evil: true */
+                        var moduleName = map.name,
+                            moduleMap = makeModuleMap(moduleName),
+                            hasInteractive = useInteractive;
+
+                        //As of 2.1.0, support just passing the text, to reinforce
+                        //fromText only being called once per resource. Still
+                        //support old style of passing moduleName but discard
+                        //that moduleName in favor of the internal ref.
+                        if (textAlt) {
+                            text = textAlt;
+                        }
+
+                        //Turn off interactive script matching for IE for any define
+                        //calls in the text, then turn it back on at the end.
+                        if (hasInteractive) {
+                            useInteractive = false;
+                        }
+
+                        //Prime the system by creating a module instance for
+                        //it.
+                        getModule(moduleMap);
+
+                        //Transfer any config to this other module.
+                        if (hasProp(config.config, id)) {
+                            config.config[moduleName] = config.config[id];
+                        }
+
+                        try {
+                            req.exec(text);
+                        } catch (e) {
+                            return onError(makeError('fromtexteval',
+                                             'fromText eval for ' + id +
+                                            ' failed: ' + e,
+                                             e,
+                                             [id]));
+                        }
+
+                        if (hasInteractive) {
+                            useInteractive = true;
+                        }
+
+                        //Mark this as a dependency for the plugin
+                        //resource
+                        this.depMaps.push(moduleMap);
+
+                        //Support anonymous modules.
+                        context.completeLoad(moduleName);
+
+                        //Bind the value of that module to the value for this
+                        //resource ID.
+                        localRequire([moduleName], load);
+                    });
+
+                    //Use parentName here since the plugin's name is not reliable,
+                    //could be some weird string with no path that actually wants to
+                    //reference the parentName's path.
+                    plugin.load(map.name, localRequire, load, config);
+                }));
+
+                context.enable(pluginMap, this);
+                this.pluginMaps[pluginMap.id] = pluginMap;
+            },
+
+            enable: function () {
+                enabledRegistry[this.map.id] = this;
+                this.enabled = true;
+
+                //Set flag mentioning that the module is enabling,
+                //so that immediate calls to the defined callbacks
+                //for dependencies do not trigger inadvertent load
+                //with the depCount still being zero.
+                this.enabling = true;
+
+                //Enable each dependency
+                each(this.depMaps, bind(this, function (depMap, i) {
+                    var id, mod, handler;
+
+                    if (typeof depMap === 'string') {
+                        //Dependency needs to be converted to a depMap
+                        //and wired up to this module.
+                        depMap = makeModuleMap(depMap,
+                                               (this.map.isDefine ? this.map : this.map.parentMap),
+                                               false,
+                                               !this.skipMap);
+                        this.depMaps[i] = depMap;
+
+                        handler = getOwn(handlers, depMap.id);
+
+                        if (handler) {
+                            this.depExports[i] = handler(this);
+                            return;
+                        }
+
+                        this.depCount += 1;
+
+                        on(depMap, 'defined', bind(this, function (depExports) {
+                            if (this.undefed) {
+                                return;
+                            }
+                            this.defineDep(i, depExports);
+                            this.check();
+                        }));
+
+                        if (this.errback) {
+                            on(depMap, 'error', bind(this, this.errback));
+                        } else if (this.events.error) {
+                            // No direct errback on this module, but something
+                            // else is listening for errors, so be sure to
+                            // propagate the error correctly.
+                            on(depMap, 'error', bind(this, function(err) {
+                                this.emit('error', err);
+                            }));
+                        }
+                    }
+
+                    id = depMap.id;
+                    mod = registry[id];
+
+                    //Skip special modules like 'require', 'exports', 'module'
+                    //Also, don't call enable if it is already enabled,
+                    //important in circular dependency cases.
+                    if (!hasProp(handlers, id) && mod && !mod.enabled) {
+                        context.enable(depMap, this);
+                    }
+                }));
+
+                //Enable each plugin that is used in
+                //a dependency
+                eachProp(this.pluginMaps, bind(this, function (pluginMap) {
+                    var mod = getOwn(registry, pluginMap.id);
+                    if (mod && !mod.enabled) {
+                        context.enable(pluginMap, this);
+                    }
+                }));
+
+                this.enabling = false;
+
+                this.check();
+            },
+
+            on: function (name, cb) {
+                var cbs = this.events[name];
+                if (!cbs) {
+                    cbs = this.events[name] = [];
+                }
+                cbs.push(cb);
+            },
+
+            emit: function (name, evt) {
+                each(this.events[name], function (cb) {
+                    cb(evt);
+                });
+                if (name === 'error') {
+                    //Now that the error handler was triggered, remove
+                    //the listeners, since this broken Module instance
+                    //can stay around for a while in the registry.
+                    delete this.events[name];
+                }
+            }
+        };
+
+        function callGetModule(args) {
+            //Skip modules already defined.
+            if (!hasProp(defined, args[0])) {
+                getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]);
+            }
+        }
+
+        function removeListener(node, func, name, ieName) {
+            //Favor detachEvent because of IE9
+            //issue, see attachEvent/addEventListener comment elsewhere
+            //in this file.
+            if (node.detachEvent && !isOpera) {
+                //Probably IE. If not it will throw an error, which will be
+                //useful to know.
+                if (ieName) {
+                    node.detachEvent(ieName, func);
+                }
+            } else {
+                node.removeEventListener(name, func, false);
+            }
+        }
+
+        /**
+         * Given an event from a script node, get the requirejs info from it,
+         * and then removes the event listeners on the node.
+         * @param {Event} evt
+         * @returns {Object}
+         */
+        function getScriptData(evt) {
+            //Using currentTarget instead of target for Firefox 2.0's sake. Not
+            //all old browsers will be supported, but this one was easy enough
+            //to support and still makes sense.
+            var node = evt.currentTarget || evt.srcElement;
+
+            //Remove the listeners once here.
+            removeListener(node, context.onScriptLoad, 'load', 'onreadystatechange');
+            removeListener(node, context.onScriptError, 'error');
+
+            return {
+                node: node,
+                id: node && node.getAttribute('data-requiremodule')
+            };
+        }
+
+        function intakeDefines() {
+            var args;
+
+            //Any defined modules in the global queue, intake them now.
+            takeGlobalQueue();
+
+            //Make sure any remaining defQueue items get properly processed.
+            while (defQueue.length) {
+                args = defQueue.shift();
+                if (args[0] === null) {
+                    return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' +
+                        args[args.length - 1]));
+                } else {
+                    //args are id, deps, factory. Should be normalized by the
+                    //define() function.
+                    callGetModule(args);
+                }
+            }
+            context.defQueueMap = {};
+        }
+
+        context = {
+            config: config,
+            contextName: contextName,
+            registry: registry,
+            defined: defined,
+            urlFetched: urlFetched,
+            defQueue: defQueue,
+            defQueueMap: {},
+            Module: Module,
+            makeModuleMap: makeModuleMap,
+            nextTick: req.nextTick,
+            onError: onError,
+
+            /**
+             * Set a configuration for the context.
+             * @param {Object} cfg config object to integrate.
+             */
+            configure: function (cfg) {
+                //Make sure the baseUrl ends in a slash.
+                if (cfg.baseUrl) {
+                    if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== '/') {
+                        cfg.baseUrl += '/';
+                    }
+                }
+
+                //Save off the paths since they require special processing,
+                //they are additive.
+                var shim = config.shim,
+                    objs = {
+                        paths: true,
+                        bundles: true,
+                        config: true,
+                        map: true
+                    };
+
+                eachProp(cfg, function (value, prop) {
+                    if (objs[prop]) {
+                        if (!config[prop]) {
+                            config[prop] = {};
+                        }
+                        mixin(config[prop], value, true, true);
+                    } else {
+                        config[prop] = value;
+                    }
+                });
+
+                //Reverse map the bundles
+                if (cfg.bundles) {
+                    eachProp(cfg.bundles, function (value, prop) {
+                        each(value, function (v) {
+                            if (v !== prop) {
+                                bundlesMap[v] = prop;
+                            }
+                        });
+                    });
+                }
+
+                //Merge shim
+                if (cfg.shim) {
+                    eachProp(cfg.shim, function (value, id) {
+                        //Normalize the structure
+                        if (isArray(value)) {
+                            value = {
+                                deps: value
+                            };
+                        }
+                        if ((value.exports || value.init) && !value.exportsFn) {
+                            value.exportsFn = context.makeShimExports(value);
+                        }
+                        shim[id] = value;
+                    });
+                    config.shim = shim;
+                }
+
+                //Adjust packages if necessary.
+                if (cfg.packages) {
+                    each(cfg.packages, function (pkgObj) {
+                        var location, name;
+
+                        pkgObj = typeof pkgObj === 'string' ? {name: pkgObj} : pkgObj;
+
+                        name = pkgObj.name;
+                        location = pkgObj.location;
+                        if (location) {
+                            config.paths[name] = pkgObj.location;
+                        }
+
+                        //Save pointer to main module ID for pkg name.
+                        //Remove leading dot in main, so main paths are normalized,
+                        //and remove any trailing .js, since different package
+                        //envs have different conventions: some use a module name,
+                        //some use a file name.
+                        config.pkgs[name] = pkgObj.name + '/' + (pkgObj.main || 'main')
+                                     .replace(currDirRegExp, '')
+                                     .replace(jsSuffixRegExp, '');
+                    });
+                }
+
+                //If there are any "waiting to execute" modules in the registry,
+                //update the maps for them, since their info, like URLs to load,
+                //may have changed.
+                eachProp(registry, function (mod, id) {
+                    //If module already has init called, since it is too
+                    //late to modify them, and ignore unnormalized ones
+                    //since they are transient.
+                    if (!mod.inited && !mod.map.unnormalized) {
+                        mod.map = makeModuleMap(id, null, true);
+                    }
+                });
+
+                //If a deps array or a config callback is specified, then call
+                //require with those args. This is useful when require is defined as a
+                //config object before require.js is loaded.
+                if (cfg.deps || cfg.callback) {
+                    context.require(cfg.deps || [], cfg.callback);
+                }
+            },
+
+            makeShimExports: function (value) {
+                function fn() {
+                    var ret;
+                    if (value.init) {
+                        ret = value.init.apply(global, arguments);
+                    }
+                    return ret || (value.exports && getGlobal(value.exports));
+                }
+                return fn;
+            },
+
+            makeRequire: function (relMap, options) {
+                options = options || {};
+
+                function localRequire(deps, callback, errback) {
+                    var id, map, requireMod;
+
+                    if (options.enableBuildCallback && callback && isFunction(callback)) {
+                        callback.__requireJsBuild = true;
+                    }
+
+                    if (typeof deps === 'string') {
+                        if (isFunction(callback)) {
+                            //Invalid call
+                            return onError(makeError('requireargs', 'Invalid require call'), errback);
+                        }
+
+                        //If require|exports|module are requested, get the
+                        //value for them from the special handlers. Caveat:
+                        //this only works while module is being defined.
+                        if (relMap && hasProp(handlers, deps)) {
+                            return handlers[deps](registry[relMap.id]);
+                        }
+
+                        //Synchronous access to one module. If require.get is
+                        //available (as in the Node adapter), prefer that.
+                        if (req.get) {
+                            return req.get(context, deps, relMap, localRequire);
+                        }
+
+                        //Normalize module name, if it contains . or ..
+                        map = makeModuleMap(deps, relMap, false, true);
+                        id = map.id;
+
+                        if (!hasProp(defined, id)) {
+                            return onError(makeError('notloaded', 'Module name "' +
+                                        id +
+                                        '" has not been loaded yet for context: ' +
+                                        contextName +
+                                        (relMap ? '' : '. Use require([])')));
+                        }
+                        return defined[id];
+                    }
+
+                    //Grab defines waiting in the global queue.
+                    intakeDefines();
+
+                    //Mark all the dependencies as needing to be loaded.
+                    context.nextTick(function () {
+                        //Some defines could have been added since the
+                        //require call, collect them.
+                        intakeDefines();
+
+                        requireMod = getModule(makeModuleMap(null, relMap));
+
+                        //Store if map config should be applied to this require
+                        //call for dependencies.
+                        requireMod.skipMap = options.skipMap;
+
+                        requireMod.init(deps, callback, errback, {
+                            enabled: true
+                        });
+
+                        checkLoaded();
+                    });
+
+                    return localRequire;
+                }
+
+                mixin(localRequire, {
+                    isBrowser: isBrowser,
+
+                    /**
+                     * Converts a module name + .extension into an URL path.
+                     * *Requires* the use of a module name. It does not support using
+                     * plain URLs like nameToUrl.
+                     */
+                    toUrl: function (moduleNamePlusExt) {
+                        var ext,
+                            index = moduleNamePlusExt.lastIndexOf('.'),
+                            segment = moduleNamePlusExt.split('/')[0],
+                            isRelative = segment === '.' || segment === '..';
+
+                        //Have a file extension alias, and it is not the
+                        //dots from a relative path.
+                        if (index !== -1 && (!isRelative || index > 1)) {
+                            ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length);
+                            moduleNamePlusExt = moduleNamePlusExt.substring(0, index);
+                        }
+
+                        return context.nameToUrl(normalize(moduleNamePlusExt,
+                                                relMap && relMap.id, true), ext,  true);
+                    },
+
+                    defined: function (id) {
+                        return hasProp(defined, makeModuleMap(id, relMap, false, true).id);
+                    },
+
+                    specified: function (id) {
+                        id = makeModuleMap(id, relMap, false, true).id;
+                        return hasProp(defined, id) || hasProp(registry, id);
+                    }
+                });
+
+                //Only allow undef on top level require calls
+                if (!relMap) {
+                    localRequire.undef = function (id) {
+                        //Bind any waiting define() calls to this context,
+                        //fix for #408
+                        takeGlobalQueue();
+
+                        var map = makeModuleMap(id, relMap, true),
+                            mod = getOwn(registry, id);
+
+                        mod.undefed = true;
+                        removeScript(id);
+
+                        delete defined[id];
+                        delete urlFetched[map.url];
+                        delete undefEvents[id];
+
+                        //Clean queued defines too. Go backwards
+                        //in array so that the splices do not
+                        //mess up the iteration.
+                        eachReverse(defQueue, function(args, i) {
+                            if (args[0] === id) {
+                                defQueue.splice(i, 1);
+                            }
+                        });
+                        delete context.defQueueMap[id];
+
+                        if (mod) {
+                            //Hold on to listeners in case the
+                            //module will be attempted to be reloaded
+                            //using a different config.
+                            if (mod.events.defined) {
+                                undefEvents[id] = mod.events;
+                            }
+
+                            cleanRegistry(id);
+                        }
+                    };
+                }
+
+                return localRequire;
+            },
+
+            /**
+             * Called to enable a module if it is still in the registry
+             * awaiting enablement. A second arg, parent, the parent module,
+             * is passed in for context, when this method is overridden by
+             * the optimizer. Not shown here to keep code compact.
+             */
+            enable: function (depMap) {
+                var mod = getOwn(registry, depMap.id);
+                if (mod) {
+                    getModule(depMap).enable();
+                }
+            },
+
+            /**
+             * Internal method used by environment adapters to complete a load event.
+             * A load event could be a script load or just a load pass from a synchronous
+             * load call.
+             * @param {String} moduleName the name of the module to potentially complete.
+             */
+            completeLoad: function (moduleName) {
+                var found, args, mod,
+                    shim = getOwn(config.shim, moduleName) || {},
+                    shExports = shim.exports;
+
+                takeGlobalQueue();
+
+                while (defQueue.length) {
+                    args = defQueue.shift();
+                    if (args[0] === null) {
+                        args[0] = moduleName;
+                        //If already found an anonymous module and bound it
+                        //to this name, then this is some other anon module
+                        //waiting for its completeLoad to fire.
+                        if (found) {
+                            break;
+                        }
+                        found = true;
+                    } else if (args[0] === moduleName) {
+                        //Found matching define call for this script!
+                        found = true;
+                    }
+
+                    callGetModule(args);
+                }
+                context.defQueueMap = {};
+
+                //Do this after the cycle of callGetModule in case the result
+                //of those calls/init calls changes the registry.
+                mod = getOwn(registry, moduleName);
+
+                if (!found && !hasProp(defined, moduleName) && mod && !mod.inited) {
+                    if (config.enforceDefine && (!shExports || !getGlobal(shExports))) {
+                        if (hasPathFallback(moduleName)) {
+                            return;
+                        } else {
+                            return onError(makeError('nodefine',
+                                             'No define call for ' + moduleName,
+                                             null,
+                                             [moduleName]));
+                        }
+                    } else {
+                        //A script that does not call define(), so just simulate
+                        //the call for it.
+                        callGetModule([moduleName, (shim.deps || []), shim.exportsFn]);
+                    }
+                }
+
+                checkLoaded();
+            },
+
+            /**
+             * Converts a module name to a file path. Supports cases where
+             * moduleName may actually be just an URL.
+             * Note that it **does not** call normalize on the moduleName,
+             * it is assumed to have already been normalized. This is an
+             * internal API, not a public one. Use toUrl for the public API.
+             */
+            nameToUrl: function (moduleName, ext, skipExt) {
+                var paths, syms, i, parentModule, url,
+                    parentPath, bundleId,
+                    pkgMain = getOwn(config.pkgs, moduleName);
+
+                if (pkgMain) {
+                    moduleName = pkgMain;
+                }
+
+                bundleId = getOwn(bundlesMap, moduleName);
+
+                if (bundleId) {
+                    return context.nameToUrl(bundleId, ext, skipExt);
+                }
+
+                //If a colon is in the URL, it indicates a protocol is used and it is just
+                //an URL to a file, or if it starts with a slash, contains a query arg (i.e. ?)
+                //or ends with .js, then assume the user meant to use an url and not a module id.
+                //The slash is important for protocol-less URLs as well as full paths.
+                if (req.jsExtRegExp.test(moduleName)) {
+                    //Just a plain path, not module name lookup, so just return it.
+                    //Add extension if it is included. This is a bit wonky, only non-.js things pass
+                    //an extension, this method probably needs to be reworked.
+                    url = moduleName + (ext || '');
+                } else {
+                    //A module that needs to be converted to a path.
+                    paths = config.paths;
+
+                    syms = moduleName.split('/');
+                    //For each module name segment, see if there is a path
+                    //registered for it. Start with most specific name
+                    //and work up from it.
+                    for (i = syms.length; i > 0; i -= 1) {
+                        parentModule = syms.slice(0, i).join('/');
+
+                        parentPath = getOwn(paths, parentModule);
+                        if (parentPath) {
+                            //If an array, it means there are a few choices,
+                            //Choose the one that is desired
+                            if (isArray(parentPath)) {
+                                parentPath = parentPath[0];
+                            }
+                            syms.splice(0, i, parentPath);
+                            break;
+                        }
+                    }
+
+                    //Join the path parts together, then figure out if baseUrl is needed.
+                    url = syms.join('/');
+                    url += (ext || (/^data\:|\?/.test(url) || skipExt ? '' : '.js'));
+                    url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url;
+                }
+
+                return config.urlArgs ? url +
+                                        ((url.indexOf('?') === -1 ? '?' : '&') +
+                                         config.urlArgs) : url;
+            },
+
+            //Delegates to req.load. Broken out as a separate function to
+            //allow overriding in the optimizer.
+            load: function (id, url) {
+                req.load(context, id, url);
+            },
+
+            /**
+             * Executes a module callback function. Broken out as a separate function
+             * solely to allow the build system to sequence the files in the built
+             * layer in the right sequence.
+             *
+             * @private
+             */
+            execCb: function (name, callback, args, exports) {
+                return callback.apply(exports, args);
+            },
+
+            /**
+             * callback for script loads, used to check status of loading.
+             *
+             * @param {Event} evt the event from the browser for the script
+             * that was loaded.
+             */
+            onScriptLoad: function (evt) {
+                //Using currentTarget instead of target for Firefox 2.0's sake. Not
+                //all old browsers will be supported, but this one was easy enough
+                //to support and still makes sense.
+                if (evt.type === 'load' ||
+                        (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) {
+                    //Reset interactive script so a script node is not held onto for
+                    //to long.
+                    interactiveScript = null;
+
+                    //Pull out the name of the module and the context.
+                    var data = getScriptData(evt);
+                    context.completeLoad(data.id);
+                }
+            },
+
+            /**
+             * Callback for script errors.
+             */
+            onScriptError: function (evt) {
+                var data = getScriptData(evt);
+                if (!hasPathFallback(data.id)) {
+                    var parents = [];
+                    eachProp(registry, function(value, key) {
+                        if (key.indexOf('_@r') !== 0) {
+                            each(value.depMaps, function(depMap) {
+                                if (depMap.id === data.id) {
+                                    parents.push(key);
+                                }
+                                return true;
+                            });
+                        }
+                    });
+                    return onError(makeError('scripterror', 'Script error for "' + data.id +
+                                             (parents.length ?
+                                             '", needed by: ' + parents.join(', ') :
+                                             '"'), evt, [data.id]));
+                }
+            }
+        };
+
+        context.require = context.makeRequire();
+        return context;
+    }
+
+    /**
+     * Main entry point.
+     *
+     * If the only argument to require is a string, then the module that
+     * is represented by that string is fetched for the appropriate context.
+     *
+     * If the first argument is an array, then it will be treated as an array
+     * of dependency string names to fetch. An optional function callback can
+     * be specified to execute when all of those dependencies are available.
+     *
+     * Make a local req variable to help Caja compliance (it assumes things
+     * on a require that are not standardized), and to give a short
+     * name for minification/local scope use.
+     */
+    req = requirejs = function (deps, callback, errback, optional) {
+
+        //Find the right context, use default
+        var context, config,
+            contextName = defContextName;
+
+        // Determine if have config object in the call.
+        if (!isArray(deps) && typeof deps !== 'string') {
+            // deps is a config object
+            config = deps;
+            if (isArray(callback)) {
+                // Adjust args if there are dependencies
+                deps = callback;
+                callback = errback;
+                errback = optional;
+            } else {
+                deps = [];
+            }
+        }
+
+        if (config && config.context) {
+            contextName = config.context;
+        }
+
+        context = getOwn(contexts, contextName);
+        if (!context) {
+            context = contexts[contextName] = req.s.newContext(contextName);
+        }
+
+        if (config) {
+            context.configure(config);
+        }
+
+        return context.require(deps, callback, errback);
+    };
+
+    /**
+     * Support require.config() to make it easier to cooperate with other
+     * AMD loaders on globally agreed names.
+     */
+    req.config = function (config) {
+        return req(config);
+    };
+
+    /**
+     * Execute something after the current tick
+     * of the event loop. Override for other envs
+     * that have a better solution than setTimeout.
+     * @param  {Function} fn function to execute later.
+     */
+    req.nextTick = typeof setTimeout !== 'undefined' ? function (fn) {
+        setTimeout(fn, 4);
+    } : function (fn) { fn(); };
+
+    /**
+     * Export require as a global, but only if it does not already exist.
+     */
+    if (!require) {
+        require = req;
+    }
+
+    req.version = version;
+
+    //Used to filter out dependencies that are already paths.
+    req.jsExtRegExp = /^\/|:|\?|\.js$/;
+    req.isBrowser = isBrowser;
+    s = req.s = {
+        contexts: contexts,
+        newContext: newContext
+    };
+
+    //Create default context.
+    req({});
+
+    //Exports some context-sensitive methods on global require.
+    each([
+        'toUrl',
+        'undef',
+        'defined',
+        'specified'
+    ], function (prop) {
+        //Reference from contexts instead of early binding to default context,
+        //so that during builds, the latest instance of the default context
+        //with its config gets used.
+        req[prop] = function () {
+            var ctx = contexts[defContextName];
+            return ctx.require[prop].apply(ctx, arguments);
+        };
+    });
+
+    if (isBrowser) {
+        head = s.head = document.getElementsByTagName('head')[0];
+        //If BASE tag is in play, using appendChild is a problem for IE6.
+        //When that browser dies, this can be removed. Details in this jQuery bug:
+        //http://dev.jquery.com/ticket/2709
+        baseElement = document.getElementsByTagName('base')[0];
+        if (baseElement) {
+            head = s.head = baseElement.parentNode;
+        }
+    }
+
+    /**
+     * Any errors that require explicitly generates will be passed to this
+     * function. Intercept/override it if you want custom error handling.
+     * @param {Error} err the error object.
+     */
+    req.onError = defaultOnError;
+
+    /**
+     * Creates the node for the load command. Only used in browser envs.
+     */
+    req.createNode = function (config, moduleName, url) {
+        var node = config.xhtml ?
+                document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') :
+                document.createElement('script');
+        node.type = config.scriptType || 'text/javascript';
+        node.charset = 'utf-8';
+        node.async = true;
+        return node;
+    };
+
+    /**
+     * Does the request to load a module for the browser case.
+     * Make this a separate function to allow other environments
+     * to override it.
+     *
+     * @param {Object} context the require context to find state.
+     * @param {String} moduleName the name of the module.
+     * @param {Object} url the URL to the module.
+     */
+    req.load = function (context, moduleName, url) {
+        var config = (context && context.config) || {},
+            node;
+        if (isBrowser) {
+            //In the browser so use a script tag
+            node = req.createNode(config, moduleName, url);
+            if (config.onNodeCreated) {
+                config.onNodeCreated(node, config, moduleName, url);
+            }
+
+            node.setAttribute('data-requirecontext', context.contextName);
+            node.setAttribute('data-requiremodule', moduleName);
+
+            //Set up load listener. Test attachEvent first because IE9 has
+            //a subtle issue in its addEventListener and script onload firings
+            //that do not match the behavior of all other browsers with
+            //addEventListener support, which fire the onload event for a
+            //script right after the script execution. See:
+            //https://connect.microsoft.com/IE/feedback/details/648057/script-onload-event-is-not-fired-immediately-after-script-execution
+            //UNFORTUNATELY Opera implements attachEvent but does not follow the script
+            //script execution mode.
+            if (node.attachEvent &&
+                    //Check if node.attachEvent is artificially added by custom script or
+                    //natively supported by browser
+                    //read https://github.com/jrburke/requirejs/issues/187
+                    //if we can NOT find [native code] then it must NOT natively supported.
+                    //in IE8, node.attachEvent does not have toString()
+                    //Note the test for "[native code" with no closing brace, see:
+                    //https://github.com/jrburke/requirejs/issues/273
+                    !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) &&
+                    !isOpera) {
+                //Probably IE. IE (at least 6-8) do not fire
+                //script onload right after executing the script, so
+                //we cannot tie the anonymous define call to a name.
+                //However, IE reports the script as being in 'interactive'
+                //readyState at the time of the define call.
+                useInteractive = true;
+
+                node.attachEvent('onreadystatechange', context.onScriptLoad);
+                //It would be great to add an error handler here to catch
+                //404s in IE9+. However, onreadystatechange will fire before
+                //the error handler, so that does not help. If addEventListener
+                //is used, then IE will fire error before load, but we cannot
+                //use that pathway given the connect.microsoft.com issue
+                //mentioned above about not doing the 'script execute,
+                //then fire the script load event listener before execute
+                //next script' that other browsers do.
+                //Best hope: IE10 fixes the issues,
+                //and then destroys all installs of IE 6-9.
+                //node.attachEvent('onerror', context.onScriptError);
+            } else {
+                node.addEventListener('load', context.onScriptLoad, false);
+                node.addEventListener('error', context.onScriptError, false);
+            }
+            node.src = url;
+
+            //For some cache cases in IE 6-8, the script executes before the end
+            //of the appendChild execution, so to tie an anonymous define
+            //call to the module name (which is stored on the node), hold on
+            //to a reference to this node, but clear after the DOM insertion.
+            currentlyAddingScript = node;
+            if (baseElement) {
+                head.insertBefore(node, baseElement);
+            } else {
+                head.appendChild(node);
+            }
+            currentlyAddingScript = null;
+
+            return node;
+        } else if (isWebWorker) {
+            try {
+                //In a web worker, use importScripts. This is not a very
+                //efficient use of importScripts, importScripts will block until
+                //its script is downloaded and evaluated. However, if web workers
+                //are in play, the expectation is that a build has been done so
+                //that only one script needs to be loaded anyway. This may need
+                //to be reevaluated if other use cases become common.
+                importScripts(url);
+
+                //Account for anonymous modules
+                context.completeLoad(moduleName);
+            } catch (e) {
+                context.onError(makeError('importscripts',
+                                'importScripts failed for ' +
+                                    moduleName + ' at ' + url,
+                                e,
+                                [moduleName]));
+            }
+        }
+    };
+
+    function getInteractiveScript() {
+        if (interactiveScript && interactiveScript.readyState === 'interactive') {
+            return interactiveScript;
+        }
+
+        eachReverse(scripts(), function (script) {
+            if (script.readyState === 'interactive') {
+                return (interactiveScript = script);
+            }
+        });
+        return interactiveScript;
+    }
+
+    //Look for a data-main script attribute, which could also adjust the baseUrl.
+    if (isBrowser && !cfg.skipDataMain) {
+        //Figure out baseUrl. Get it from the script tag with require.js in it.
+        eachReverse(scripts(), function (script) {
+            //Set the 'head' where we can append children by
+            //using the script's parent.
+            if (!head) {
+                head = script.parentNode;
+            }
+
+            //Look for a data-main attribute to set main script for the page
+            //to load. If it is there, the path to data main becomes the
+            //baseUrl, if it is not already set.
+            dataMain = script.getAttribute('data-main');
+            if (dataMain) {
+                //Preserve dataMain in case it is a path (i.e. contains '?')
+                mainScript = dataMain;
+
+                //Set final baseUrl if there is not already an explicit one.
+                if (!cfg.baseUrl) {
+                    //Pull off the directory of data-main for use as the
+                    //baseUrl.
+                    src = mainScript.split('/');
+                    mainScript = src.pop();
+                    subPath = src.length ? src.join('/')  + '/' : './';
+
+                    cfg.baseUrl = subPath;
+                }
+
+                //Strip off any trailing .js since mainScript is now
+                //like a module name.
+                mainScript = mainScript.replace(jsSuffixRegExp, '');
+
+                //If mainScript is still a path, fall back to dataMain
+                if (req.jsExtRegExp.test(mainScript)) {
+                    mainScript = dataMain;
+                }
+
+                //Put the data-main script in the files to load.
+                cfg.deps = cfg.deps ? cfg.deps.concat(mainScript) : [mainScript];
+
+                return true;
+            }
+        });
+    }
+
+    /**
+     * The function that handles definitions of modules. Differs from
+     * require() in that a string for the module should be the first argument,
+     * and the function to execute after dependencies are loaded should
+     * return a value to define the module corresponding to the first argument's
+     * name.
+     */
+    define = function (name, deps, callback) {
+        var node, context;
+
+        //Allow for anonymous modules
+        if (typeof name !== 'string') {
+            //Adjust args appropriately
+            callback = deps;
+            deps = name;
+            name = null;
+        }
+
+        //This module may not have dependencies
+        if (!isArray(deps)) {
+            callback = deps;
+            deps = null;
+        }
+
+        //If no name, and callback is a function, then figure out if it a
+        //CommonJS thing with dependencies.
+        if (!deps && isFunction(callback)) {
+            deps = [];
+            //Remove comments from the callback string,
+            //look for require calls, and pull them into the dependencies,
+            //but only if there are function args.
+            if (callback.length) {
+                callback
+                    .toString()
+                    .replace(commentRegExp, '')
+                    .replace(cjsRequireRegExp, function (match, dep) {
+                        deps.push(dep);
+                    });
+
+                //May be a CommonJS thing even without require calls, but still
+                //could use exports, and module. Avoid doing exports and module
+                //work though if it just needs require.
+                //REQUIRES the function to expect the CommonJS variables in the
+                //order listed below.
+                deps = (callback.length === 1 ? ['require'] : ['require', 'exports', 'module']).concat(deps);
+            }
+        }
+
+        //If in IE 6-8 and hit an anonymous define() call, do the interactive
+        //work.
+        if (useInteractive) {
+            node = currentlyAddingScript || getInteractiveScript();
+            if (node) {
+                if (!name) {
+                    name = node.getAttribute('data-requiremodule');
+                }
+                context = contexts[node.getAttribute('data-requirecontext')];
+            }
+        }
+
+        //Always save off evaluating the def call until the script onload handler.
+        //This allows multiple modules to be in a file without prematurely
+        //tracing dependencies, and allows for anonymous module support,
+        //where the module name is not known until the script onload event
+        //occurs. If no context, use the global queue, and get it processed
+        //in the onscript load callback.
+        if (context) {
+            context.defQueue.push([name, deps, callback]);
+            context.defQueueMap[name] = true;
+        } else {
+            globalDefQueue.push([name, deps, callback]);
+        }
+    };
+
+    define.amd = {
+        jQuery: true
+    };
+
+    /**
+     * Executes the text. Normally just uses eval, but can be modified
+     * to use a better, environment-specific call. Only used for transpiling
+     * loader plugins, not for plain JS modules.
+     * @param {String} text the text to execute/evaluate.
+     */
+    req.exec = function (text) {
+        /*jslint evil: true */
+        return eval(text);
+    };
+
+    //Set up with config info.
+    req(cfg);
+}(this));
diff --git a/www/js/search.js b/www/js/search.js
index bc3ca7a5c6e96b042b8281810840a9ab72efc3a0..dabf7b3feec3a7a6e49cbfb4a4a8d8649e9d180a 100644
--- a/www/js/search.js
+++ b/www/js/search.js
@@ -1,157 +1,152 @@
-(function(window) {
+define(['jquery', 'analytics'], function ($, analytics) {
 	"use strict";
-	
-	var
-		initCallback = 'searchInit',
-	
+
 		// Service server (defaults to //directory.unl.edu)
-		directoryServer = null,
-		
-		unlContext = '015236299699564929946:nk1siew10ie',
-		
-		transitionDelay = 400,
-		
-		inputSel = '#search_q',
-		formSel = '#searchform form',
-		resultSel = '.search-results',
-		googleSel = '.google-results',
-		
-		evtStateChange = 'statechange',
-		wrapperMain = '#search_wrapper',
-		wrapperWeb = '#search_results',
-		wrapperDir = '#directory_results',
-		
-		dirResults = 'ppl_results',
-		unlResults = 'unl_results',
-		localResults = 'local_results';
-	
-	window[initCallback] = function() {
-		window[initCallback] = null;
-		
-		require(['jquery', 'analytics'], function($, analytics) {
-			// Caching Class
-			var Cache = function() {
-				this.storage = {};
-			};
-			Cache.prototype.get = function(key) {
-				return this.storage[key] || undefined;
-			};
-			Cache.prototype.save = function(key, value) {
-				this.storage[key] = value;
-				return this;
-			};
-			
-			// Directory Controller Class
-			var Directory = function(server, containerId) {
-				var cntSel = '#' + containerId;
-				
-				this._server = server || '//directory.unl.edu';
-				this._cache = new Cache();
-				this._searchCanceled = false;
-				this._viewState = 0;
-				this._renderTo = cntSel;
-				
-				$(function() {
-					$(cntSel).on('click', '.fn a', function() {
-						if (this.target !== '_blank') {
-							this.target = '_blank';
-						}
-					});
-				});
-			};
-			Directory.prototype._render = function(data) {
-				if (this._searchCanceled) {
-					return;
-				}
-				
-				$(this._renderTo)
-					.html(data)
-					.addClass('active');
-				
-				this._renderState(0);
-			};
-			Directory.prototype._renderState = function(duration) {
-				var $innerRes = $('.results', $(this._renderTo)),
-					$showRes, failState,
-					depFilter = '.departments';
-				
-				if (!$innerRes.length) {
-					return;
-				}
-			
-				$innerRes.slideUp(duration);
-				if (this._viewState === 0) {
-					$showRes = $innerRes.not(depFilter);
-					failState = 1;
-				} else {
-					$showRes = $innerRes.filter(depFilter);
-					failState = 0;
-				}
-				
-				if (!$showRes.length && typeof duration !== "undefined") {
-					this.changeViewState(failState);
-					return;
-				}
-				
-				$showRes.slideDown();
-			};
-			Directory.prototype.cancelSearch = function() {
-				this._searchCanceled = true;
-				if (this._xhr) {
-					this._xhr.abort();
-				}
-			};
-			Directory.prototype.execute = function(q) {
-				var cacheData = this._cache.get(q),
-					self = this;
-				
-				this._searchCanceled = false;
-				if (this._xhr) {
-					this._xhr.abort();
-				}
-				
-				if (cacheData) {
-					this._render(cacheData);
-				} else {
-					this._xhr = $.get(this._server + '/service.php?q=' + encodeURIComponent(q), function(data) {
-						self._cache.save(q, data);
-						self._render(data);
-					});
-				}
-			};
-			Directory.prototype.changeViewState = function(state) {
-				if (this._viewState == state) {
-					return;
+	var directoryServer = null;
+
+	var unlContext = '015236299699564929946:nk1siew10ie';
+
+	var transitionDelay = 400;
+
+	var inputSel = '#search_q';
+	var formSel = '#searchform form';
+	var resultSel = '.search-results';
+	var googleSel = '.google-results';
+
+	var evtStateChange = 'statechange';
+	var wrapperMain = '#search_wrapper';
+	var wrapperWeb = '#search_results';
+	var wrapperDir = '#directory_results';
+
+	var dirResults = 'ppl_results';
+	var unlResults = 'unl_results';
+	var localResults = 'local_results';
+
+	window.pf_getUID = function() {
+		return true;
+	};
+
+	// Caching Class
+	var Cache = function() {
+		this.storage = {};
+	};
+	Cache.prototype.get = function(key) {
+		return this.storage[key] || undefined;
+	};
+	Cache.prototype.save = function(key, value) {
+		this.storage[key] = value;
+		return this;
+	};
+
+	// Directory Controller Class
+	var Directory = function(server, containerId) {
+		var cntSel = '#' + containerId;
+
+		this._server = server || '//directory.unl.edu';
+		this._cache = new Cache();
+		this._searchCanceled = false;
+		this._viewState = 0;
+		this._renderTo = cntSel;
+
+		$(function() {
+			$(cntSel).on('click', '.fn a', function() {
+				if (this.target !== '_blank') {
+					this.target = '_blank';
 				}
-				
-				var prevState = this._viewState;
-				
-				this._viewState = state;
-				this._renderState();
-				
-				$(this._renderTo).trigger(evtStateChange, [state, prevState]);
-			};
-			Directory.prototype.clearAllResults = function() {
-				$(this._renderTo).empty();
-			};
-			
-			var
-				// query related
-				query = '',
-				firstQ = window['INITIAL_QUERY'],
-				
-				actCls = 'active',
-				
+			});
+		});
+	};
+	Directory.prototype._render = function(data) {
+		if (this._searchCanceled) {
+			return;
+		}
+
+		$(this._renderTo)
+			.html(data)
+			.addClass('active');
+
+		this._renderState(0);
+	};
+	Directory.prototype._renderState = function(duration) {
+		var $innerRes = $('.results', $(this._renderTo)),
+			$showRes, failState,
+			depFilter = '.departments';
+
+		if (!$innerRes.length) {
+			return;
+		}
+
+		$innerRes.slideUp(duration);
+		if (this._viewState === 0) {
+			$showRes = $innerRes.not(depFilter);
+			failState = 1;
+		} else {
+			$showRes = $innerRes.filter(depFilter);
+			failState = 0;
+		}
+
+		if (!$showRes.length && typeof duration !== "undefined") {
+			this.changeViewState(failState);
+			return;
+		}
+
+		$showRes.slideDown();
+	};
+	Directory.prototype.cancelSearch = function() {
+		this._searchCanceled = true;
+		if (this._xhr) {
+			this._xhr.abort();
+		}
+	};
+	Directory.prototype.execute = function(q) {
+		var cacheData = this._cache.get(q),
+			self = this;
+
+		this._searchCanceled = false;
+		if (this._xhr) {
+			this._xhr.abort();
+		}
+
+		if (cacheData) {
+			this._render(cacheData);
+		} else {
+			this._xhr = $.get(this._server + '/service.php?q=' + encodeURIComponent(q), function(data) {
+				self._cache.save(q, data);
+				self._render(data);
+			});
+		}
+	};
+	Directory.prototype.changeViewState = function(state) {
+		if (this._viewState == state) {
+			return;
+		}
+
+		var prevState = this._viewState;
+
+		this._viewState = state;
+		this._renderState();
+
+		$(this._renderTo).trigger(evtStateChange, [state, prevState]);
+	};
+	Directory.prototype.clearAllResults = function() {
+		$(this._renderTo).empty();
+	};
+
+	return {
+		initialize: function(firstQ, localContext) {
+			// query related
+			var query = '';
+			var actCls = 'active';
+
 				// CustomSearchControl instances and config
-				unlSearch,
-				localSearch,
-				activeSearch,
-				directorySearch,
-				localContext = window['LOCAL_SEARCH_CONTEXT'],
-				drawOp = new google.search.DrawOptions(),
-				searchToggleLock = false,
-				
-				trackQuery = function(q) {
+			var unlSearch;
+			var localSearch;
+			var activeSearch;
+			var directorySearch;
+			var drawOp = new google.search.DrawOptions();
+			var searchToggleLock = false;
+
+			var trackQuery = function(q) {
 					var loc = window.location,
 						qs = loc.search.replace(/(?:(\?)|&)q=[^&]*(?:&|$)/, '$1'),
 						page = [
@@ -161,16 +156,17 @@
 						    'q=',
 						    encodeURIComponent(q)
 				        ].join('');
-					
+
 					analytics.callTrackPageview(page);
-					
+
 					if (window.history.pushState) {
 						window.history.pushState({query: q}, '', page);
 					}
-				},
-				queryComplete = function(control) {
+			};
+
+			var queryComplete = function(control) {
 					var $root = $(control.root);
-					
+
 					// a11y patching
 					$('img.gs-image', $root).each(function() {
 						if (!this.alt) {
@@ -178,31 +174,32 @@
 						}
 					});
 					$('img.gcsc-branding-img-noclear', $root).attr('alt', 'Google™');
-					
+
 					if (!searchToggleLock && control == localSearch && $('.gs-no-results-result', $root).length) {
 						$root.closest('.results-group').find('.result-tab li:last-child').click();
 						return;
 					}
-					
+
 					$root.closest(resultSel).addClass(actCls);
 					$root.closest(googleSel).slideDown();
-					
+
 					searchToggleLock = false;
-				},
-				fullQuery = function(q, track) {
+			};
+
+			var fullQuery = function(q, track) {
 					if (track !== false) {
 						trackQuery(q);
 					}
 					try {
 						activeSearch.execute(q, undefined, {});
 					} catch (e) {
-						console && console.log(e);
 						queryComplete(activeSearch);
 					}
 					directorySearch.execute(q);
 					$(wrapperMain).fadeIn();
-				},
-				fullStop = function() {
+			};
+
+			var fullStop = function() {
 					activeSearch.cancelSearch();
 					directorySearch.cancelSearch();
 					$(resultSel).removeClass(actCls);
@@ -211,104 +208,105 @@
 						activeSearch.clearAllResults();
 						directorySearch.clearAllResults();
 					}, transitionDelay);
-				},
-				queryStart = function(control, searcher, q) {
+			};
+
+			var queryStart = function(control, searcher, q) {
 					$(control.root).closest(googleSel).slideUp(0);
 					if (q !== query) {
 						trackQuery(q);
 						directorySearch.execute(q);
 					}
-				};
-			
+			};
+
 			drawOp.enableSearchResultsOnly();
-			
+
 			unlSearch = activeSearch = new google.search.CustomSearchControl(unlContext);
 			unlSearch.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
 			unlSearch.setSearchCompleteCallback(window, queryComplete);
 			unlSearch.setSearchStartingCallback(window, queryStart);
-			
+
 			if (localContext) {
 				localSearch = activeSearch = new google.search.CustomSearchControl(localContext);
 				localSearch.setResultSetSize('small');
 				localSearch.setSearchCompleteCallback(window, queryComplete);
 				localSearch.setSearchStartingCallback(window, queryStart);
 			}
-			
+
 			directorySearch = new Directory(directoryServer, dirResults);
-			
+
 			// Setup DOM on ready
 			$(function() {
 				var $q = $(inputSel),
-					
+
 					resSel = '.results-group',
 					tabsSel = '.result-tab',
 					selCls = 'selected',
 					stateClsPfx = 'state-',
-					
+
 					$resTabs = $('.result-tab'),
 					tabStateChange = function(e, state, prevState) {
 						var $tab = $(this).find(tabsSel);
-						
+
 						e.stopPropagation();
-						
+
 						$tab.removeClass(stateClsPfx + prevState);
 						$tab.addClass(stateClsPfx + state);
-						
+
 						$tab.children().removeClass(selCls).eq(state).addClass(selCls);
 					},
-					
+
 					googleOrigin = /^https?:\/\/.*\.google\.com$/,
-					
+
 					isValidOrigin = function(origin) {
 						if (googleOrigin.test(origin)) {
 							return false;
 						}
-						
+
 						// don't allow self origin or browser extension origins
 						if (origin == location.origin || /^chrome:/.test(origin)) {
 							return false;
 						}
-						
+
 						return true;
 					},
-					
+
 					passiveQuery = function(q, track) {
 						if (query === q) {
 							return;
 						}
-						
+
 						query = q;
 						$q.val(q);
-						
+
 						if (q) {
 							fullQuery(q, track);
 						} else {
 							fullStop();
 						}
 					};
-				
+
 				// draw the Google search controls
 				unlSearch.draw(unlResults, drawOp);
-				
+
 				if (localContext) {
 					localSearch.draw(localResults, drawOp);
 				}
-				
+
 				// a11y patch Google search box
 				$('form.gsc-search-box').remove();
-				
+
 				// setup the tab-like result filters
 				$('li:first-child', $resTabs).addClass(selCls);
 				$($resTabs).on('click', 'li', function(e) {
-					e.preventDefault(); 
-					
+					e.preventDefault();
+
 					if ($(this).hasClass(selCls)) {
 						return;
 					}
-						
+
 					var i = $(this).index(),
 						$par = $(this).parents(resSel);
-					
+
 					if ($par.is(wrapperDir)) {
 						directorySearch.changeViewState(i);
 					} else if ($par.is(wrapperWeb)) {
@@ -319,49 +317,49 @@
 						} else {
 							activeSearch = unlSearch;
 						}
-						
+
 						activeSearch.execute(query);
 					}
 				});
-				
+
 				$(resSel).on(evtStateChange, tabStateChange);
-				
+
 				// listen for the submit event
 				$(formSel).submit(function(e) {
 					e.preventDefault();
-					
+
 					var q = $.trim($q.val());
 					passiveQuery(q);
 				});
-				
+
 				// issue an inital query
 				if (firstQ) {
 					passiveQuery(firstQ, false);
 				}
-				
+
 				// listen for message from parent frames
 				$(window).on('message', function(e) {
 					var oEvent = e.originalEvent, q;
-					
+
 					if (!isValidOrigin(oEvent.origin)) {
 						return;
 					}
-					
+
 					q = $.trim(oEvent.data);
 					passiveQuery(q);
 				});
-				
+
 				$(window).on('popstate', function(e) {
 					var oEvent = e.originalEvent,
 						q = firstQ || '';
-					
+
 					if (oEvent.state) {
 						q = oEvent.state.query || '';
 					}
 					passiveQuery(q, false);
 				});
-				
-				if (window.parent != undefined) {
+
+				if (window.parent) {
 					$(document).on('keydown', function(e) {
 						if (e.keyCode === 27) {
 							window.parent.postMessage('wdn.search.close', "*");
@@ -369,11 +367,6 @@
 					});
 				}
 			});
-			
-		});
-	};
-	
-	window['pf_getUID'] = function() {
-		return true;
+		}
 	};
-}(window));
+});
diff --git a/www/less/search-google.less b/www/less/search-google.less
new file mode 100644
index 0000000000000000000000000000000000000000..1c4e7eb19ffcd49aa6bdd2b721499be844663998
--- /dev/null
+++ b/www/less/search-google.less
@@ -0,0 +1,91 @@
+@charset "UTF-8";
+
+@import "lib/breakpoints.less";
+@import "lib/colors.less";
+@import "lib/fonts.less";
+
+// Google Styles
+.gsc-control-cse,
+.gsc-control-cse .gsc-table-result {
+	font-family: inherit;
+	font-size: inherit;
+}
+
+.gsc-result {
+
+	.gsc-webResult & {
+		border: 0;
+		padding: 0.75em 0;
+	}
+
+	.gs-title {
+		height: 1.662em;
+	}
+}
+
+.gs-result {
+	.gs-title, .gs-title * {
+		color: @brand;
+		text-decoration: none;
+	}
+
+	a.gs-visibleUrl, .gs-visibleUrl {
+		color: @light-neutral;
+	}
+}
+
+.gsc-result-info {
+	font-style: italic;
+	margin: 0 0 10px;
+	color: @ui08;
+}
+
+.gsc-results {
+
+	.gsc-cursor-box {
+		border-top: 1px solid @ui03;
+		padding: 1em 0 0;
+		margin-top: 1em;
+		.sans-serif-font();
+
+		.gsc-cursor-page {
+			border: 1px solid @ui03;
+			padding: 2px 8px;
+			margin-bottom: 1em;
+			min-width: 2.2em;
+			display: inline-block;
+			text-align: center;
+			text-decoration: none;
+			color: @brand;
+		}
+
+		.gsc-cursor-current-page {
+			font-weight: normal;
+			color: @ui08;
+			border: 0;
+		}
+	}
+}
+
+.gcsc-branding {
+	margin-bottom: 1.3333em;
+}
+
+td.gcsc-branding-text {
+	font-style: italic;
+	width: auto;
+
+	div.gcsc-branding-text {
+		text-align: left;
+		color: @ui08;
+	}
+}
+
+td.gcsc-branding-text-name {
+	width: 100%;
+}
+
+.gs-web-image-box img.gs-image, .gs-promotion-image-box img.gs-promotion-image {
+	max-width: 100%;
+	max-height: none;
+}
diff --git a/www/less/search.less b/www/less/search.less
index 5fcff42d139e7256b089f9bd1e650816ce63aca6..e71d58fad12085625f44cb5f207ed6a9c7c60767 100644
--- a/www/less/search.less
+++ b/www/less/search.less
@@ -1,73 +1,27 @@
 @charset "UTF-8";
 
-@import "lib/lesshat.less";
-
 @import "lib/breakpoints.less";
 @import "lib/colors.less";
 @import "lib/fonts.less";
 
 // Template overrides
 .embed #visitorChat,
-#wdn_search { 
+#wdn_search {
 	display: none !important;
 }
 
-#wdn_navigation_bar {
-	padding: 0;
-}
-
 #search_results table,
 #search_results td {
 	border: 0;
 	padding: 0;
 }
 
-// Input Groups
-form .input-group {
-	display: table;
-	
-	> * {
-		display: table-cell;
-		.border-radius(0);
-	}
-	
-	.input-group-btn {
-		width: 1%;
-		vertical-align: middle;
-		
-		button {
-			font-size: 18px;
-			line-height: normal;
-			padding: 0.8em 1em;
-			margin: 0;
-		}
-	}
-	
-	input {
-		margin: 0;
-	}
-	
-	:first-child {
-		.border-radius(4px 0 0 4px);
-	}
-	
-	:last-child {
-		.border-bottom-right-radius(4px);
-		.border-top-right-radius(4px);
-		
-		button {
-			.border-bottom-left-radius(0);
-			.border-top-left-radius(0);
-		}
-	}
-}
-
 #searchform {
 	text-align: center;
 	background: #38431b url(../images/050419.jpg) 50% 50% no-repeat;
-	.background-size(cover);
-	
-	.input-group {
+	background-size: cover;
+
+	.wdn-input-group {
 		margin: 0 auto;
 		max-width: 30em;
 	}
@@ -78,20 +32,20 @@ form .input-group {
 }
 
 .results-group {
-	
+
 	&:hover {
 		background-color: #fff;
-		
+
 		.result-head {
 			background-color: @ui09;
 		}
 	}
-	
+
 	.result-head {
 		background-color: mix(@ui09, @page-background, 95%);
 		color: #fff;
 		position: relative;
-		
+
 		h2 {
 			color: inherit;
 			margin: 0;
@@ -104,77 +58,62 @@ form .input-group {
 	margin: 0;
 	padding: 0;
 	list-style: none;
-	
+	position: relative;
+
 	li {
 		display: inline;
-		
+
 		&.selected {
 			color: #fff;
 		}
-		
+
 		a {
 			color: inherit;
 			border: 0;
 		}
-		
+
 		&:before {
 			content: '\b7\a0'; // middle-dot + space
 		}
-		
+
 		&:first-child:before {
 			content: none;
 		}
 	}
-	
+
 	&:after {
 		content: '';
 		position: absolute;
 		border-style: solid;
 		border-width: 0 6px 6px;
 		border-color: transparent transparent #fff;
-		bottom: 0;
+		bottom: -1.425em;
 		left: 0;
-		.transition(transform 400ms);
-		
-		.no-csstransforms & {
-			.transition(left 400ms);
-		}
-		
+		transition: transform 400ms;
+
 		#directory_results & {
-			.translateX(2.95em);
-			
-			.no-csstransforms & {
-				left: 2.95em;
-			}
+			transform: translateX(1.3125em);
 		}
-		
+
 		#search_results & {
-			.translateX(4.95em);
-			
-			.no-csstransforms & {
-				left: 4.95em;
+			&.no-local {
+				transform: translateX(2.2812em);
 			}
+
+			transform: translateX(1.875em);
 		}
 	}
-	
+
 	&.state-1:after {
 		#directory_results & {
-			.translateX(8.95em);
-			
-			.no-csstransforms & {
-				left: 8.95em;
-			}
+			transform: translateX(7em);
 		}
-		
+
 		#search_results & {
-			.translateX(10.35em);
-			
-			.no-csstransforms & {
-				left: 10.35em;
-			}
+			transform: translateX(7.5312em);
 		}
 	}
-	
+
 }
 
 .search-set, .embed {
@@ -183,13 +122,13 @@ form .input-group {
 }
 
 .search-results {
-	.transition(opacity 400ms);
+	transition: opacity 400ms;
 	opacity: 0;
-	
+
 	&.active {
 		opacity: 1;
 	}
-	
+
 	h3 {
 		display: none;
 	}
@@ -204,41 +143,41 @@ form .input-group {
 	> * {
 		padding: 1.425em 9.375%;
 	}
-	
+
 	@media @bp2 {
 		width: 33.3333%;
 	}
-	
+
 	.embed & {
 		width: 40%;
 	}
-	
+
 }
 
 #search_results {
 	> * {
 		padding: 1.425em 7.812%;
 	}
-	
+
 	@media @bp2 {
 		width: 66.6667%;
-		
+
 		.result-head {
 			border-right: 1px solid @ui09;
 		}
-		
+
 		.search-results {
 			border-right: 1px solid @ui02;
 		}
 	}
-	
+
 	.embed & {
 		width: 60%;
-		
+
 		.result-head {
 			border-right: 1px solid @ui09;
 		}
-		
+
 		.search-results {
 			border-right: 1px solid @ui02;
 		}
@@ -254,47 +193,47 @@ form .input-group {
 	h3, h4, .result_head {
 		display: none;
 	}
-	
+
 	.pfResult {
 		padding: 0;
 		list-style: none;
 	}
-	
+
 	.ppl_Sresult, .dep_result {
 		margin: 1em 0;
 	}
-	
+
 	.cInfo {
 		display: none;
 	}
-	
+
 	.overflow {
 		overflow: auto;
 	}
-	
-	.planetred_profile {
+
+	.profile_pic {
 		float: left;
 		border: 0;
 		max-width: 40px;
 		overflow: hidden;
 	}
-	
+
 	.recordDetails {
 		margin-left: 50px;
 		font-size: 0.75em;
 		line-height: 1.425;
 		.sans-serif-font();
 	}
-	
+
 	.fn {
 		font-size: 2.3333em;
 		.brand-font();
 		line-height: 1;
-		
+
 		* {
 			border: 0;
 		}
-		
+
 		.givenName {
 			margin-left: 0.254em;
 			font-size: 10px;
@@ -302,111 +241,25 @@ form .input-group {
 			.sans-serif-font;
 		}
 	}
-	
+
 	.fn, .eppa, .organization-unit, .title, .tel {
 		margin-bottom: 0.178em;
 	}
-	
-	.eppa {
+
+	.eppa, .roles {
 		display: none;
 	}
-	
+
 	.student .eppa {
 		display: block;
 	}
-	
+
 	.tel > a {
 		display: block;
 		border: 0;
 	}
-	
-	.on-campus-dialing {
-		color: @light-neutral;
-	}
-}
 
-// Google Styles
-.gsc-control-cse,
-.gsc-control-cse .gsc-table-result {
-	font-family: inherit;
-	font-size: inherit;
-}
-
-.gsc-result {
-	
-	.gsc-webResult & {
-		border: 0;
-		padding: 0.75em 0;
-	}
-	
-	.gs-title {
-		height: 1.662em;
-	}
-}
-
-.gs-result {
-	.gs-title, .gs-title * {
-		color: @brand;
-		text-decoration: none;
-	}
-	
-	a.gs-visibleUrl, .gs-visibleUrl {
+	.on-campus-dialing {
 		color: @light-neutral;
 	}
 }
-
-.gsc-result-info {
-	font-style: italic;
-	margin: 0 0 10px;
-	color: @ui08;
-}
-
-.gsc-results {
-	
-	.gsc-cursor-box {
-		border-top: 1px solid @ui03;
-		padding: 1em 0 0;
-		margin-top: 1em;
-		.sans-serif-font();
-		
-		.gsc-cursor-page {
-			border: 1px solid @ui03;
-			padding: 2px 8px;
-			margin-bottom: 1em;
-			min-width: 2.2em;
-			display: inline-block;
-			text-align: center;
-			text-decoration: none;
-			color: @brand;
-		}
-		
-		.gsc-cursor-current-page {
-			font-weight: normal;
-			color: @ui08;
-			border: 0;
-		}
-	}
-}
-
-.gcsc-branding {
-	margin-bottom: 1.3333em;
-}
-
-td.gcsc-branding-text {
-	font-style: italic;
-	width: auto;
-	
-	div.gcsc-branding-text {
-		text-align: left;
-		color: @ui08;
-	}
-}
-
-td.gcsc-branding-text-name {
-	width: 100%;
-}
-
-.gs-web-image-box img.gs-image, .gs-promotion-image-box img.gs-promotion-image {
-	max-width: 100%;
-	max-height: none;
-}
\ No newline at end of file
diff --git a/www/templates/embed-debug.tpl.php b/www/templates/embed-debug.tpl.php
index 38a9a07bc1ca15d0ebedb4d16b6db700e70cf8e4..9cb60873e13cd3a567b493d3cad6180b49cc73bb 100644
--- a/www/templates/embed-debug.tpl.php
+++ b/www/templates/embed-debug.tpl.php
@@ -1,41 +1,17 @@
 <!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7 embed"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6 embed" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7 embed" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8 embed" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie embed" lang="en"><![endif]-->
-<!--[if !(IEMobile) | !(IE)]><!--><html class="embed" lang="en"><!--<![endif]-->
+<html class="no-js embed" lang="en">
 <head>
     <meta charset="utf-8" />
+    <meta http-equiv="x-ua-compatible" content="ie=edge" />
     <title>UNL Search | University of Nebraska&ndash;Lincoln</title>
-<!-- Load Cloud.typography fonts -->
-	<link rel="stylesheet" type="text/css" href="//cloud.typography.com/7717652/616662/css/fonts.css" />
-<!-- Load our base CSS file -->
-<!--[if gte IE 9]><!-->    
-    <link rel="stylesheet" type="text/css" media="all" href="/wdn/templates_4.0/css/all.css" />
-<!--<![endif]-->
-
-<!-- Load the template JS file -->
-    <script type="text/javascript" src="/wdn/templates_4.0/scripts/compressed/all.js" id="wdn_dependents"></script>
-    
-<!--[if lt IE 9]>
-    <link rel="stylesheet" type="text/css" media="all" href="/wdn/templates_4.0/css/all_oldie.css" />
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-
-<!-- For all IE versions, bring in the tweaks -->
-<!--[if IE]>
-    <link rel="stylesheet" type="text/css" media="all" href="/wdn/templates_4.0/css/ie.css" />
-<![endif]-->
+	<link rel="stylesheet" href="https://cloud.typography.com/7717652/616662/css/fonts.css" />
+    <link rel="stylesheet" href="/wdn/templates_4.1/css/all.css" />
+    <script data-main="js/embed-src/main.js" src="js/embed-src/require.js"></script>
     <?php echo $head ?>
 </head>
 <body>
-    <div id="wdn_wrapper">
-        <div id="wdn_content_wrapper">
-            <div id="maincontent" class="wdn-main">
-            <?php echo $maincontent ?>
-            </div>
-        </div>
-    </div>
+    <main>
+        <?php echo $maincontent ?>
+    </main>
 </body>
 </html>
diff --git a/www/templates/embed.tpl.php b/www/templates/embed.tpl.php
index 03da953268d63366afc321966bd156eba1f3daeb..ddf2f77fe9f681cb2de98cfc43b1c5016180bb0c 100644
--- a/www/templates/embed.tpl.php
+++ b/www/templates/embed.tpl.php
@@ -1,41 +1,17 @@
 <!DOCTYPE html>
-<!--[if IEMobile 7 ]><html class="ie iem7 embed"><![endif]-->
-<!--[if lt IE 7 ]><html class="ie ie6 embed" lang="en"><![endif]-->
-<!--[if IE 7 ]><html class="ie ie7 embed" lang="en"><![endif]-->
-<!--[if IE 8 ]><html class="ie ie8 embed" lang="en"><![endif]-->
-<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie embed" lang="en"><![endif]-->
-<!--[if !(IEMobile) | !(IE)]><!--><html class="embed" lang="en"><!--<![endif]-->
+<html class="no-js embed" lang="en">
 <head>
     <meta charset="utf-8" />
+    <meta http-equiv="x-ua-compatible" content="ie=edge" />
     <title>UNL Search | University of Nebraska&ndash;Lincoln</title>
-<!-- Load Cloud.typography fonts -->
-	<link rel="stylesheet" type="text/css" href="//cloud.typography.com/7717652/616662/css/fonts.css" />
-<!-- Load our base CSS file -->
-<!--[if gte IE 9]><!-->    
-    <link rel="stylesheet" type="text/css" media="all" href="//unlcms.unl.edu/wdn/templates_4.0/css/all.css" />
-<!--<![endif]-->
-
-<!-- Load the template JS file -->
-    <script type="text/javascript" src="//unlcms.unl.edu/wdn/templates_4.0/scripts/compressed/all.js?dep=$DEP_VERSION$" id="wdn_dependents"></script>
-    
-<!--[if lt IE 9]>
-    <link rel="stylesheet" type="text/css" media="all" href="//unlcms.unl.edu/wdn/templates_4.0/css/all_oldie.css" />
-    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-
-<!-- For all IE versions, bring in the tweaks -->
-<!--[if IE]>
-    <link rel="stylesheet" type="text/css" media="all" href="//unlcms.unl.edu/wdn/templates_4.0/css/ie.css" />
-<![endif]-->
+    <link rel="stylesheet" href="https://cloud.typography.com/7717652/616662/css/fonts.css" />
+    <link rel="stylesheet" href="https://unlcms.unl.edu/wdn/templates_4.1/css/all.css" />
+    <script src="js/embed/all.js"></script>
     <?php echo $head ?>
 </head>
 <body>
-    <div id="wdn_wrapper">
-        <div id="wdn_content_wrapper">
-            <div id="maincontent" class="wdn-main">
-            <?php echo $maincontent ?>
-            </div>
-        </div>
-    </div>
+    <main>
+        <?php echo $maincontent ?>
+    </main>
 </body>
 </html>
diff --git a/www/templates/end-scripts.tpl.php b/www/templates/end-scripts.tpl.php
new file mode 100644
index 0000000000000000000000000000000000000000..63c71e694c97fbc837b477a70a5a0e411a61bafb
--- /dev/null
+++ b/www/templates/end-scripts.tpl.php
@@ -0,0 +1,26 @@
+<script>
+require(['jquery', '<?php echo $localScriptUrl ?>'], function($, UNLSearch) {
+	var gSearchDefer = $.Deferred();
+	window.searchInit = function() {
+        window.searchInit = $.noop;
+        gSearchDefer.resolve(google);
+    };
+
+    $('<script>', {
+        src: '<?php echo $googleLoaderUrl ?>',
+        asycn: 'async',
+        defer: 'defer'
+    }).appendTo($('body'));
+
+    var $localCss = $('<link>', {
+        'href': './css/search-google.css'
+    });
+
+    gSearchDefer.done(function(google) {
+        // ensure this CSS is loaded AFTER google
+        require(['css!' + $localCss[0].href], function() {
+    	   UNLSearch.initialize(<?php echo $initialQuery ?>, <?php echo $localContext ?>)
+        });
+    });
+});
+</script>
diff --git a/www/templates/local-footer.tpl.php b/www/templates/local-footer.tpl.php
new file mode 100644
index 0000000000000000000000000000000000000000..d85fa26704340ab1f64d603101039170a6476d0d
--- /dev/null
+++ b/www/templates/local-footer.tpl.php
@@ -0,0 +1,30 @@
+<div class="wdn-grid-set wdn-footer-links-local">
+    <div class="bp960-wdn-col-one-fourth">
+        <div class="wdn-footer-module">
+            <span role="heading" class="wdn-footer-heading">Contact Us</span>
+            <?php echo file_get_contents('http://www.unl.edu/ucomm/sharedcode/footerContactInfo.html'); ?>
+        </div>
+    </div>
+    <div class="bp960-wdn-col-one-half">
+        <div class="wdn-footer-module">
+            <span role="heading" class="wdn-footer-heading">About UNL Search</span>
+            <?php
+            if ($file = @file_get_contents(UNL_Search::getProjectRoot() . '/tmp/iim-app-footer.html')) {
+                echo $file;
+            } else {
+                echo file_get_contents('http://iim.unl.edu/iim-app-footer?format=partial');
+            }
+            ?>
+        </div>
+    </div>
+    <div class="bp960-wdn-col-one-fourth">
+        <div class="wdn-footer-module">
+            <?php
+            $relatedLinks = file_get_contents('http://www.unl.edu/sharedcode/relatedLinks.html');
+            $relatedLinks = preg_replace('#<h3>.*</h3>#', '<span role="heading" class="wdn-footer-heading">Related Links</span>', $relatedLinks);
+            $relatedLinks = preg_replace('#<ul>#', '<ul class="wdn-related-links-v1">', $relatedLinks);
+            echo $relatedLinks;
+            ?>
+        </div>
+    </div>
+</div>
diff --git a/www/templates/search-form.tpl.php b/www/templates/search-form.tpl.php
index 1302a3a1487da5852b0246eb2c954c464b4c7efa..4d128ef6a704e3dfacfb8afdfca5583ecc80a430 100644
--- a/www/templates/search-form.tpl.php
+++ b/www/templates/search-form.tpl.php
@@ -1,8 +1,8 @@
 <div id="searchform" class="wdn-band">
   <form action="./" method="get" class="wdn-inner-wrapper">
-      <div class="input-group">
-        <input type="text" value=""  name="q" id="search_q" title="Search Query" placeholder="e.g., Herbert Husker, Ph.D." />
-        <span class="input-group-btn"><button class="button wdn-icon-search" title="Search" type="submit"></button></span>
+      <div class="wdn-input-group">
+        <input type="text" name="q" id="search_q" aria-label="Search Query" placeholder="e.g., Herbert Husker, Ph.D." />
+        <span class="wdn-input-group-btn"><button class="button wdn-icon-search" type="submit"><span class="wdn-text-hidden">Search</span></button></span>
     </div>
       <?php if (!empty($local_results)): ?>
       <input type="hidden" name="u" value="<?php echo htmlentities($_GET['u'], ENT_QUOTES) ?>" />
diff --git a/www/templates/search-results.tpl.php b/www/templates/search-results.tpl.php
index b0deffb74bed504a0d12e769e49b562d4b03ce79..d4658272b5bdabfcd5585617032cf8d8296a2e2f 100644
--- a/www/templates/search-results.tpl.php
+++ b/www/templates/search-results.tpl.php
@@ -1,12 +1,14 @@
-<section class="wdn-band" id="search_wrapper">
-    <div class="<?php if (!$isEmbed): ?>wdn-inner-wrapper wdn-inner-padding-sm<?php endif; ?>">
-    
+<section<?php if (!$isEmbed): ?> class="wdn-band"<?php endif ?> id="search_wrapper">
+    <?php if (!$isEmbed): ?>
+    <div class="wdn-inner-wrapper wdn-inner-padding-sm">
+    <?php endif; ?>
+
         <div class="wdn-grid-set search-set">
-        
+
             <div id="search_results" class="results-group">
                 <div class="result-head">
                     <h2>UNL Web</h2>
-                    <ul class="result-tab">
+                    <ul class="result-tab<?php if (empty($local_results)): ?> no-local<?php endif; ?>">
                         <?php if (!empty($local_results)): ?>
                         <li><a href="#">This unit</a></li>
                         <?php endif; ?>
@@ -15,13 +17,13 @@
                 </div>
                 <div class="search-results">
                 <?php echo $local_results ?>
-                <?php renderTemplate('templates/google-results.tpl.php', array(
+                <?php echo renderTemplate('templates/google-results.tpl.php', array(
                     'title' => 'All of UNL',
                     'id' => 'unl_results',
                 )) ?>
                 </div>
             </div>
-            
+
             <div id="directory_results" class="results-group">
                 <div class="result-head">
                     <h2>UNL Directory</h2>
@@ -32,8 +34,10 @@
                 </div>
                 <div id="ppl_results" class="search-results"></div>
             </div>
-            
+
         </div>
-    
+
+    <?php if (!$isEmbed): ?>
     </div>
-</section>
\ No newline at end of file
+    <?php endif; ?>
+</section>